From svn at tinysofa.org  Tue Feb  1 07:31:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 02:31:52 -0500 (EST)
Subject: [tinysofa-svn] 
	r5779 - in tinysofa/releases/1.2/squid/current: sources specs
Message-ID: <20050201073152.02749344315@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 02:31:43 -0500 (Tue, 01 Feb 2005)
New Revision: 5779

Added:
   tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_buffer_overflow.patch
Modified:
   tinysofa/releases/1.2/squid/current/specs/squid.spec
Log:
- fix WCCP recvfrom() buffer overflow

Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_buffer_overflow.patch
===================================================================
--- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_buffer_overflow.patch	2005-01-31 20:28:50 UTC (rev 5778)
+++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-wccp_buffer_overflow.patch	2005-02-01 07:31:43 UTC (rev 5779)
@@ -0,0 +1,21 @@
+Index: squid/src/wccp.c
+diff -c squid/src/wccp.c:1.19.2.6 squid/src/wccp.c:1.19.2.7
+*** squid/src/wccp.c:1.19.2.6	Tue Jan 11 23:07:12 2005
+--- squid/src/wccp.c	Fri Jan 28 15:50:19 2005
+***************
+*** 225,231 ****
+  
+      len = recvfrom(sock,
+  	(void *) &wccp_i_see_you,
+! 	WCCP_RESPONSE_SIZE,
+  	0,
+  	(struct sockaddr *) &from,
+  	&from_len);
+--- 225,231 ----
+  
+      len = recvfrom(sock,
+  	(void *) &wccp_i_see_you,
+! 	sizeof(wccp_i_see_you),
+  	0,
+  	(struct sockaddr *) &from,
+  	&from_len);

Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec
===================================================================
--- tinysofa/releases/1.2/squid/current/specs/squid.spec	2005-01-31 20:28:50 UTC (rev 5778)
+++ tinysofa/releases/1.2/squid/current/specs/squid.spec	2005-02-01 07:31:43 UTC (rev 5779)
@@ -4,7 +4,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE7
-Release: 4jh
+Release: 5jh
 Epoch: 0
 License: GPL
 Group: extra
@@ -25,6 +25,7 @@
 Patch8: squid-2.5.STABLE7-wccp_denial_of_service.patch
 Patch9: squid-2.5.STABLE7-gopher_html_parsing.patch
 Patch10: squid-2.5.STABLE7-ldap_spaces.patch
+Patch11: squid-2.5.STABLE7-wccp_buffer_overflow.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: logrotate coreutils /usr/bin/find
@@ -58,6 +59,7 @@
 %patch8 -p1 -b .wccp_denial_of_service
 %patch9 -p1 -b .gopher_html_parsing
 %patch10 -p1 -b .ldap_spaces
+%patch11 -p1 -b .wccp_buffer_overflow
 
 
 %build
@@ -283,6 +285,9 @@
 
 
 %changelog
+* Tue Feb  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE7-5jh
+- fix WCCP recvfrom() buffer overflow
+
 * Thu Jan 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE7-4jh
 - fix a LDAP implementation username vulnerability
 


From svn at tinysofa.org  Tue Feb  1 09:40:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 04:40:46 -0500 (EST)
Subject: [tinysofa-svn] r5780 - contrib/1.1/clamav/current/specs
Message-ID: <20050201094046.69D38344200@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 04:40:37 -0500 (Tue, 01 Feb 2005)
New Revision: 5780

Modified:
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
- fix installation


Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2005-02-01 07:31:43 UTC (rev 5779)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2005-02-01 09:40:37 UTC (rev 5780)
@@ -89,7 +89,7 @@
 install -d %buildroot%{_localstatedir}/log/clamav/
 install -d %buildroot%{_localstatedir}/run/clamav/
 
-%makeinstall
+%makeinstall_std
 
 rm -f %buildroot%{_mandir}/man8/clamav-milter.8*
 install %{SOURCE1} %buildroot%{_initrddir}/clamd


From svn at tinysofa.org  Tue Feb  1 17:37:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 12:37:07 -0500 (EST)
Subject: [tinysofa-svn] 
	r5781 - in tinysofa/releases/1.2/squid/current: sources specs
Message-ID: <20050201173707.4138334428E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 12:36:57 -0500 (Tue, 01 Feb 2005)
New Revision: 5781

Added:
   tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-oversize_reply_headers.patch
Modified:
   tinysofa/releases/1.2/squid/current/specs/squid.spec
Log:
- fix oversized reply header handling security issue

Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-oversize_reply_headers.patch
===================================================================
--- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-oversize_reply_headers.patch	2005-02-01 09:40:37 UTC (rev 5780)
+++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE7-oversize_reply_headers.patch	2005-02-01 17:36:57 UTC (rev 5781)
@@ -0,0 +1,89 @@
+Index: squid/src/http.c
+diff -c squid/src/http.c:1.384.2.25 squid/src/http.c:1.384.2.26
+*** squid/src/http.c:1.384.2.25	Fri Jan 21 05:39:37 2005
+--- squid/src/http.c	Mon Jan 31 15:44:18 2005
+***************
+*** 401,407 ****
+      size_t hdr_len;
+      size_t hdr_size = headersEnd(buf, size);
+      HttpReply *reply = entry->mem_obj->reply;
+!     Ctx ctx;
+      debug(11, 3) ("httpProcessReplyHeader: key '%s'\n",
+  	storeKeyText(entry->hash.key));
+      if (memBufIsNull(&httpState->reply_hdr))
+--- 401,407 ----
+      size_t hdr_len;
+      size_t hdr_size = headersEnd(buf, size);
+      HttpReply *reply = entry->mem_obj->reply;
+!     Ctx ctx = ctx_enter(entry->mem_obj->url);
+      debug(11, 3) ("httpProcessReplyHeader: key '%s'\n",
+  	storeKeyText(entry->hash.key));
+      if (memBufIsNull(&httpState->reply_hdr))
+***************
+*** 418,423 ****
+--- 418,424 ----
+  	memBufClean(&httpState->reply_hdr);
+  	httpBuildVersion(&reply->sline.version, 0, 9);
+  	reply->sline.status = HTTP_INVALID_HEADER;
++ 	ctx_exit(ctx);
+  	return;
+      }
+      if (hdr_size != hdr_len)
+***************
+*** 429,449 ****
+  	if (!memBufIsNull(&httpState->reply_hdr))
+  	    memBufClean(&httpState->reply_hdr);
+  	reply->sline.status = HTTP_HEADER_TOO_LARGE;
+  	return;
+      }
+      /* headers can be incomplete only if object still arriving */
+      if (!hdr_size) {
+  	if (httpState->eof)
+  	    hdr_size = hdr_len;
+! 	else
+  	    return;		/* headers not complete */
+      }
+      /* Cut away any excess body data (only needed for debug?) */
+      memBufAppend(&httpState->reply_hdr, "\0", 1);
+      httpState->reply_hdr.buf[hdr_size] = '\0';
+      httpState->reply_hdr_state++;
+      assert(httpState->reply_hdr_state == 1);
+-     ctx = ctx_enter(entry->mem_obj->url);
+      httpState->reply_hdr_state++;
+      debug(11, 9) ("GOT HTTP REPLY HDR:\n---------\n%s\n----------\n",
+  	httpState->reply_hdr.buf);
+--- 430,453 ----
+  	if (!memBufIsNull(&httpState->reply_hdr))
+  	    memBufClean(&httpState->reply_hdr);
+  	reply->sline.status = HTTP_HEADER_TOO_LARGE;
++ 	httpState->reply_hdr_state += 2;
++ 	ctx_exit(ctx);
+  	return;
+      }
+      /* headers can be incomplete only if object still arriving */
+      if (!hdr_size) {
+  	if (httpState->eof)
+  	    hdr_size = hdr_len;
+! 	else {
+! 	    ctx_exit(ctx);
+  	    return;		/* headers not complete */
++ 	}
+      }
+      /* Cut away any excess body data (only needed for debug?) */
+      memBufAppend(&httpState->reply_hdr, "\0", 1);
+      httpState->reply_hdr.buf[hdr_size] = '\0';
+      httpState->reply_hdr_state++;
+      assert(httpState->reply_hdr_state == 1);
+      httpState->reply_hdr_state++;
+      debug(11, 9) ("GOT HTTP REPLY HDR:\n---------\n%s\n----------\n",
+  	httpState->reply_hdr.buf);
+***************
+*** 453,458 ****
+--- 457,463 ----
+      if (reply->sline.status >= HTTP_INVALID_HEADER) {
+  	debug(11, 3) ("httpProcessReplyHeader: Non-HTTP-compliant header: '%s'\n", httpState->reply_hdr.buf);
+  	memBufClean(&httpState->reply_hdr);
++ 	ctx_exit(ctx);
+  	return;
+      }
+      storeTimestampsSet(entry);

Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec
===================================================================
--- tinysofa/releases/1.2/squid/current/specs/squid.spec	2005-02-01 09:40:37 UTC (rev 5780)
+++ tinysofa/releases/1.2/squid/current/specs/squid.spec	2005-02-01 17:36:57 UTC (rev 5781)
@@ -4,7 +4,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE7
-Release: 5jh
+Release: 6jh
 Epoch: 0
 License: GPL
 Group: extra
@@ -26,6 +26,7 @@
 Patch9: squid-2.5.STABLE7-gopher_html_parsing.patch
 Patch10: squid-2.5.STABLE7-ldap_spaces.patch
 Patch11: squid-2.5.STABLE7-wccp_buffer_overflow.patch
+Patch12: squid-2.5.STABLE7-oversize_reply_headers.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: logrotate coreutils /usr/bin/find
@@ -60,6 +61,7 @@
 %patch9 -p1 -b .gopher_html_parsing
 %patch10 -p1 -b .ldap_spaces
 %patch11 -p1 -b .wccp_buffer_overflow
+%patch12 -p1 -b .oversize_reply_headers
 
 
 %build
@@ -285,6 +287,9 @@
 
 
 %changelog
+* Tue Feb  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE7-6jh
+- fix oversized reply header handling security issue
+
 * Tue Feb  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE7-5jh
 - fix WCCP recvfrom() buffer overflow
 


From svn at tinysofa.org  Tue Feb  1 17:59:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 12:59:19 -0500 (EST)
Subject: [tinysofa-svn] 
	r5782 - in tinysofa/releases/1.2/postgresql/current: sources specs
Message-ID: <20050201175919.2D63E34428E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 12:56:24 -0500 (Tue, 01 Feb 2005)
New Revision: 5782

Added:
   tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.7.tar.bz2
   tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.7.patch
Removed:
   tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.6.tar.bz2
   tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch
Modified:
   tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec
Log:
- 7.4.7, which fixes several security issues

Deleted: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.6.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.7.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/postgresql/current/sources/postgresql-7.4.7.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch
===================================================================
--- tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch	2005-02-01 17:36:57 UTC (rev 5781)
+++ tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch	2005-02-01 17:56:24 UTC (rev 5782)
@@ -1,128 +0,0 @@
-diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4
---- postgresql-7.4.1.orig/config/python.m4	2003-09-02 02:01:48.000000000 +0300
-+++ postgresql-7.4.1/config/python.m4	2003-11-18 21:29:47.000000000 +0200
-@@ -25,7 +25,11 @@
- python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
- python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
- python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
--python_configdir="${python_execprefix}/lib/python${python_version}/config"
-+python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"`
-+python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"`
-+python_configdir="${python_path}/config"
-+python_moduledir="${python_path}/site-packages"
-+python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages"
- python_includespec="-I${python_prefix}/include/python${python_version}"
- if test "$python_prefix" != "$python_execprefix"; then
-   python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
-@@ -37,9 +41,9 @@
- AC_SUBST(python_includespec)[]dnl
- # This should be enough of a message.
- if test "$python_prefix" != "$python_execprefix"; then
--  AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}])
-+	AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}])
- else
--  AC_MSG_RESULT([$python_prefix/lib/python${python_version}])
-+	AC_MSG_RESULT([$python_prefix/${python_libpath}])
- fi
- ])# _PGAC_CHECK_PYTHON_DIRS
- 
-diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in
---- postgresql-7.4.1.orig/configure.in	2003-11-16 23:33:50.000000000 +0200
-+++ postgresql-7.4.1/configure.in	2003-11-18 21:31:09.000000000 +0200
-@@ -19,12 +19,11 @@
- dnl
- dnl The GNU folks apparently haven't heard that some people don't use
- dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
--m4_define([info], [doc])
--m4_define([infodir], [docdir])
-+dnl
-+dnl Now use both docdir and infodir to work properly with RPM macros
-+dnl (courtesy, Elliott Lee <sopwith at redhat.com>)
-+dnl - Andrew Overholt <overholt at redhat.com> 10 December 2002
- AC_INIT([PostgreSQL], [7.4.6], [pgsql-bugs at postgresql.org])
--m4_undefine([infodir])
--m4_undefine([info])
--AC_SUBST(docdir)
- 
- AC_PREREQ(2.53)
- AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group])
-@@ -40,6 +39,10 @@
- template=
- AC_MSG_CHECKING([which template to use])
- 
-+AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc)
-+docdir="$with_docdir"
-+AC_SUBST(docdir)
-+
- PGAC_ARG_REQ(with, template, [],
- [
-   case $withval in
-@@ -442,8 +445,8 @@
-   if test -d "$krb4_prefix/include"; then
-     INCLUDES="$INCLUDES -I$krb4_prefix/include"
-   fi
--  if test -d "$krb4_prefix/lib"; then
--    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
-+  if test -d "$krb4_prefix/$LIBNAME"; then
-+    LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME"
-   fi
- 
-   krb_srvtab="/etc/srvtab"
-@@ -452,7 +455,7 @@
- 
- AC_SUBST(with_krb4)
- 
--
-+test -z "$LIBNAME" && LIBNAME=lib
- #
- # Kerberos 5
- #
-@@ -467,8 +470,8 @@
-   if test -d "$krb5_prefix/include"; then
-     INCLUDES="$INCLUDES -I$krb5_prefix/include"
-   fi
--  if test -d "$krb5_prefix/lib"; then
--    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
-+  if test -d "$krb5_prefix/$LIBNAME"; then
-+    LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME"
-   fi
- 
-   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
-@@ -485,7 +488,7 @@
- 
- AC_SUBST(krb_srvtab)
- 
--
-+test -z "$LIBNAME" && LIBNAME=lib
- #
- # Kerberos configuration parameters
- #
-@@ -496,7 +499,7 @@
- AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
-                    [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)])
- 
--
-+test -z "$LIBNAME" && LIBNAME=lib
- #
- # PAM
- #
-@@ -533,8 +536,8 @@
-   if test -d "${openssl_prefix}/include" ; then
-     INCLUDES="$INCLUDES -I${openssl_prefix}/include"
-   fi
--  if test -d "${openssl_prefix}/lib" ; then
--    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
-+  if test -d "${openssl_prefix}/$LIBNAME" ; then
-+    LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME"
-   fi
- ])
- 
-@@ -597,7 +600,7 @@
- case $host_os in sysv5*)
-   AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R],
-   [
--    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
-+    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME"
-     AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no])
-     LDFLAGS=$pgac_save_LDFLAGS
-   ])

Copied: tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.7.patch (from rev 5761, tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch)
===================================================================
--- tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.6.patch	2005-01-26 20:26:10 UTC (rev 5761)
+++ tinysofa/releases/1.2/postgresql/current/sources/rpm-multilib-7.4.7.patch	2005-02-01 17:56:24 UTC (rev 5782)
@@ -0,0 +1,128 @@
+diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4
+--- postgresql-7.4.1.orig/config/python.m4	2003-09-02 02:01:48.000000000 +0300
++++ postgresql-7.4.1/config/python.m4	2003-11-18 21:29:47.000000000 +0200
+@@ -25,7 +25,11 @@
+ python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
+ python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
+ python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
+-python_configdir="${python_execprefix}/lib/python${python_version}/config"
++python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"`
++python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"`
++python_configdir="${python_path}/config"
++python_moduledir="${python_path}/site-packages"
++python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages"
+ python_includespec="-I${python_prefix}/include/python${python_version}"
+ if test "$python_prefix" != "$python_execprefix"; then
+   python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
+@@ -37,9 +41,9 @@
+ AC_SUBST(python_includespec)[]dnl
+ # This should be enough of a message.
+ if test "$python_prefix" != "$python_execprefix"; then
+-  AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}])
++	AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}])
+ else
+-  AC_MSG_RESULT([$python_prefix/lib/python${python_version}])
++	AC_MSG_RESULT([$python_prefix/${python_libpath}])
+ fi
+ ])# _PGAC_CHECK_PYTHON_DIRS
+ 
+diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in
+--- postgresql-7.4.1.orig/configure.in	2003-11-16 23:33:50.000000000 +0200
++++ postgresql-7.4.1/configure.in	2003-11-18 21:31:09.000000000 +0200
+@@ -19,12 +19,11 @@
+ dnl
+ dnl The GNU folks apparently haven't heard that some people don't use
+ dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
+-m4_define([info], [doc])
+-m4_define([infodir], [docdir])
++dnl
++dnl Now use both docdir and infodir to work properly with RPM macros
++dnl (courtesy, Elliott Lee <sopwith at redhat.com>)
++dnl - Andrew Overholt <overholt at redhat.com> 10 December 2002
+ AC_INIT([PostgreSQL], [7.4.7], [pgsql-bugs at postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group])
+@@ -40,6 +39,10 @@
+ template=
+ AC_MSG_CHECKING([which template to use])
+ 
++AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc)
++docdir="$with_docdir"
++AC_SUBST(docdir)
++
+ PGAC_ARG_REQ(with, template, [],
+ [
+   case $withval in
+@@ -442,8 +445,8 @@
+   if test -d "$krb4_prefix/include"; then
+     INCLUDES="$INCLUDES -I$krb4_prefix/include"
+   fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test -d "$krb4_prefix/$LIBNAME"; then
++    LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME"
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -452,7 +455,7 @@
+ 
+ AC_SUBST(with_krb4)
+ 
+-
++test -z "$LIBNAME" && LIBNAME=lib
+ #
+ # Kerberos 5
+ #
+@@ -467,8 +470,8 @@
+   if test -d "$krb5_prefix/include"; then
+     INCLUDES="$INCLUDES -I$krb5_prefix/include"
+   fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test -d "$krb5_prefix/$LIBNAME"; then
++    LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME"
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -485,7 +488,7 @@
+ 
+ AC_SUBST(krb_srvtab)
+ 
+-
++test -z "$LIBNAME" && LIBNAME=lib
+ #
+ # Kerberos configuration parameters
+ #
+@@ -496,7 +499,7 @@
+ AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
+                    [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)])
+ 
+-
++test -z "$LIBNAME" && LIBNAME=lib
+ #
+ # PAM
+ #
+@@ -533,8 +536,8 @@
+   if test -d "${openssl_prefix}/include" ; then
+     INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+   fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test -d "${openssl_prefix}/$LIBNAME" ; then
++    LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME"
+   fi
+ ])
+ 
+@@ -597,7 +600,7 @@
+ case $host_os in sysv5*)
+   AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R],
+   [
+-    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
++    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME"
+     AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no])
+     LDFLAGS=$pgac_save_LDFLAGS
+   ])

Modified: tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec
===================================================================
--- tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec	2005-02-01 17:36:57 UTC (rev 5781)
+++ tinysofa/releases/1.2/postgresql/current/specs/postgresql.spec	2005-02-01 17:56:24 UTC (rev 5782)
@@ -7,7 +7,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.4.6
+Version: 7.4.7
 Release: 1jh
 License: BSD
 Group: main
@@ -33,7 +33,7 @@
 # Cleanup
 # Not in use
 Patch4: postgresql-7.3.2-rpm.patch
-Patch5: rpm-multilib-7.4.6.patch
+Patch5: rpm-multilib-7.4.7.patch
 Requires: glibc shadow-utils initscripts zlib >= 1.1.4
 Requires: %{name}-libs = %{version}-%{release}
 BuildRequires: perl gcc sed readline-devel ncurses-devel zlib-devel openssl-devel pam-devel
@@ -651,6 +651,9 @@
 
 
 %changelog
+* Tue Feb  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.4.7-1jh
+- 7.4.7, which fixes several security issues
+
 * Wed Jan 26 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.4.6-1jh
 - 7.4.6
 


From svn at tinysofa.org  Tue Feb  1 18:44:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 13:44:16 -0500 (EST)
Subject: [tinysofa-svn] r5784 - contrib/1.1/clearsilver/current/specs
Message-ID: <20050201184416.E930734428E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-01 13:44:10 -0500 (Tue, 01 Feb 2005)
New Revision: 5784

Modified:
   contrib/1.1/clearsilver/current/specs/clearsilver.spec
Log:
applied %defattr

Modified: contrib/1.1/clearsilver/current/specs/clearsilver.spec
===================================================================
--- contrib/1.1/clearsilver/current/specs/clearsilver.spec	2005-02-01 18:11:34 UTC (rev 5783)
+++ contrib/1.1/clearsilver/current/specs/clearsilver.spec	2005-02-01 18:44:10 UTC (rev 5784)
@@ -1,7 +1,7 @@
 Summary: Neotonic ClearSilver
 Name: clearsilver
 Version: 0.9.13
-Release: 1gd
+Release: 2gd
 Copyright: Open Source - Neotonic ClearSilver License (Apache 1.1 based)
 Group: contrib
 Source: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
@@ -70,6 +70,7 @@
 done
 
 %files 
+%defattr(-,root,root)
 %{_prefix}/include/ClearSilver
 %{_prefix}/lib/libneo_cgi.a
 %{_prefix}/lib/libneo_cs.a
@@ -79,14 +80,19 @@
 %{_mandir}/man3
 
 %files python
+%defattr(-,root,root)
 %{py_libdir}/neo_cgi.so
 
 %files perl
+%defattr(-,root,root)
 %{perl_vendorarch}/ClearSilver.pm
 %{perl_vendorarch}/auto/ClearSilver/ClearSilver.so
 %{perl_vendorarch}/auto/ClearSilver/ClearSilver.bs
 
 %Changelog
+* Tue Feb  1 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.13-2gd
+- applied %defattr
+
 * Sat Jan 29 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.13-1gd
 - new upstream version
 


From svn at tinysofa.org  Tue Feb  1 19:34:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 14:34:58 -0500 (EST)
Subject: [tinysofa-svn] r5785 - in tinysofa/releases: 1.1 1.2
Message-ID: <20050201193458.C9F62344387@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 14:34:46 -0500 (Tue, 01 Feb 2005)
New Revision: 5785

Added:
   tinysofa/releases/1.1/courier-imap/
Removed:
   tinysofa/releases/1.2/courier-imap/
Log:
- move to 1.1


Copied: tinysofa/releases/1.1/courier-imap (from rev 5784, tinysofa/releases/1.2/courier-imap)


From svn at tinysofa.org  Tue Feb  1 19:44:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 14:44:49 -0500 (EST)
Subject: [tinysofa-svn] 
	r5786 - tinysofa/releases/1.2/iptables/current/sources
Message-ID: <20050201194449.3FCE5344388@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 14:44:41 -0500 (Tue, 01 Feb 2005)
New Revision: 5786

Modified:
   tinysofa/releases/1.2/iptables/current/sources/iptables.init
   tinysofa/releases/1.2/iptables/current/sources/iptables6.init
Log:
- initscripts update n+1


Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init
===================================================================
--- tinysofa/releases/1.2/iptables/current/sources/iptables.init	2005-02-01 19:34:46 UTC (rev 5785)
+++ tinysofa/releases/1.2/iptables/current/sources/iptables.init	2005-02-01 19:44:41 UTC (rev 5786)
@@ -72,12 +72,12 @@
 	# nat table
 	for chain in PREROUTING POSTROUTING OUTPUT; do
 		$iptables -t nat -P $chain $target || failed="true"
-	    done
+	done
 	    
-	    # mangle table
-	    for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do
+	# mangle table
+	for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do
 		$iptables -t mangle -P $chain $target || failed="true"
-	    done
+	done
 
 	[ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE"
 	echo
@@ -104,6 +104,9 @@
 
 test_config()
 {
+	# kludge to makge kernel message appear before
+	/sbin/modprobe ip_tables 2>/dev/null >/dev/null
+
 	NOTE="Testing $SYSCONFFILE"
 	echo -n "$NOTE"
 	output=`iptables-restore --test "$SYSCONFFILE" 2>&1`
@@ -120,42 +123,57 @@
 	return $ret
 }
 
+load_modules()
+{
+	echo -n "Loading iptables modules: "
+	/sbin/modprobe ip_tables 2>/dev/null >/dev/null
+	echo -n "."
+	for i in `grep -v '^#'  $MODCONFFILE`; do
+		/sbin/modprobe $i 2>/dev/null >/dev/null
+		echo -n "."
+	done
+	echo
+}
+
+unload_modules()
+{
+	echo -n "Unloading iptables modules: "
+	for i in `grep -v '^#'  $MODCONFFILE`; do
+		/sbin/rmmod $i 2>/dev/null >/dev/null
+		echo -n "."
+	done
+	/sbin/rmmod ip_tables 2>/dev/null >/dev/null
+	echo -n "."
+	echo
+}
+
 case "$1" in
 	start)
 		test_config || exit $?
-		echo -n "Loading iptables modules: "
-		/sbin/modprobe ip_tables 2>/dev/null >/dev/null
-		echo -n "."
-		for i in `grep -v '^#'  $MODCONFFILE`; do
-			/sbin/modprobe $i 2>/dev/null >/dev/null
-			echo -n "."
-		done
-		echo
-
+		load_modules
 		flush
 		load_rules
 	;;
 
 	stop)
 		flush ACCEPT
+		unload_modules
+	;;
 
-		#      Unload modules
-		echo -n "Unloading iptables modules: "
-		for i in `grep -v '^#'  $MODCONFFILE`; do
-			/sbin/rmmod $i 2>/dev/null >/dev/null
-			echo -n "."
-		done
-		/sbin/rmmod ip_tables 2>/dev/null >/dev/null
-		echo -n "."
-		echo
+	restart)
+		test_config || exit $?
+		unload_modules
+		flush DROP
+		load_modules
+		load_rules
 	;;
-	
-	restart|reload)
+
+	reload)
 		test_config || exit $?
 		flush DROP
 		load_rules
 	;;
-	
+
 	save)
 		NOTE="Saving rules to $SYSCONFFILE"
 		echo -n "$NOTE"
@@ -163,7 +181,7 @@
 		[ "$?" = "0" ] && success "$NOTE" || failure "$NOTE"
 		echo
 	;;
-	
+
 	*)
 		echo "Usage: $0 {start|stop|restart|reload|save}"
 		exit 1

Modified: tinysofa/releases/1.2/iptables/current/sources/iptables6.init
===================================================================
--- tinysofa/releases/1.2/iptables/current/sources/iptables6.init	2005-02-01 19:34:46 UTC (rev 5785)
+++ tinysofa/releases/1.2/iptables/current/sources/iptables6.init	2005-02-01 19:44:41 UTC (rev 5786)
@@ -69,22 +69,17 @@
 		$ip6tables -t filter -P $chain $target || failed="true"
 	done
 	    
-	# nat table
-	for chain in PREROUTING POSTROUTING OUTPUT; do
-		$ip6tables -t nat -P $chain $target || failed="true"
-	    done
-	    
-	    # mangle table
-	    for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do
+	# mangle table
+	for chain in PREROUTING INPUT FORWARD OUTPUT POSTROUTING; do
 		$ip6tables -t mangle -P $chain $target || failed="true"
-	    done
+	done
 
 	[ "$failed" == "true" ] && failure "$NOTE" || success "$NOTE"
 	echo
 
 	NOTE="Flushing current rules and chains"
 	echo -n $NOTE
-	for table in filter nat mangle; do
+	for table in filter mangle; do
 		$ip6tables -t $table -F || failed="true"
 		$ip6tables -t $table -X || failed="true"
 	done
@@ -120,40 +115,57 @@
 	return $ret
 }
 
+load_modules()
+{
+	echo -n "Loading iptables modules: "
+	/sbin/modprobe ip6_tables 2>/dev/null >/dev/null
+	echo -n "."
+	for i in `grep -v '^#'  $MODCONFFILE`; do
+		/sbin/modprobe $i 2>/dev/null >/dev/null
+		echo -n "."
+	done
+	echo
+}
+
+unload_modules()
+{
+	echo -n "Unloading iptables modules: "
+	for i in `grep -v '^#'  $MODCONFFILE`; do
+		/sbin/rmmod $i 2>/dev/null >/dev/null
+		echo -n "."
+	done
+	/sbin/rmmod ip6_tables 2>/dev/null >/dev/null
+	echo -n "."
+	echo
+}
+
 case "$1" in
 	start)
 		test_config || exit $?
-		echo -n "Loading iptables modules: "
-		/sbin/modprobe ip_tables 2>/dev/null >/dev/null
-		echo -n "."
-		for i in `grep -v '^#'  $MODCONFFILE`; do
-			/sbin/modprobe $i 2>/dev/null >/dev/null
-			echo -n "."
-		done
-		echo
-
+		load_modules
 		flush
 		load_rules
 	;;
 
 	stop)
 		flush ACCEPT
+		unload_modules
+	;;
 
-		#      Unload modules
-		echo -n "Unloading iptables modules: "
-		for i in `grep -v '^#'  $MODCONFFILE`; do
-			/sbin/rmmod $i 2>/dev/null >/dev/null
-			echo -n "."
-		done
-		/sbin/rmmod ip6_tables 2>/dev/null >/dev/null
-		echo -n "."
-		echo
+	restart)
+		test_config || exit $?
+		unload_modules
+		flush DROP
+		load_modules
+		load_rules
 	;;
-	restart|reload)
+
+	reload)
 		test_config || exit $?
 		flush DROP
 		load_rules
 	;;
+
 	save)
 		NOTE="Saving rules to $SYSCONFFILE"
 		echo -n "$NOTE"
@@ -169,3 +181,4 @@
 esac
 
 exit $?
+


From svn at tinysofa.org  Tue Feb  1 19:46:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 14:46:58 -0500 (EST)
Subject: [tinysofa-svn] 
	r5787 - tinysofa/releases/1.2/iptables/current/sources
Message-ID: <20050201194658.5EEE0344388@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 14:46:51 -0500 (Tue, 01 Feb 2005)
New Revision: 5787

Modified:
   tinysofa/releases/1.2/iptables/current/sources/iptables.init
   tinysofa/releases/1.2/iptables/current/sources/iptables6.init
Log:
- n+2


Modified: tinysofa/releases/1.2/iptables/current/sources/iptables.init
===================================================================
--- tinysofa/releases/1.2/iptables/current/sources/iptables.init	2005-02-01 19:44:41 UTC (rev 5786)
+++ tinysofa/releases/1.2/iptables/current/sources/iptables.init	2005-02-01 19:46:51 UTC (rev 5787)
@@ -162,8 +162,8 @@
 
 	restart)
 		test_config || exit $?
+		flush DROP
 		unload_modules
-		flush DROP
 		load_modules
 		load_rules
 	;;

Modified: tinysofa/releases/1.2/iptables/current/sources/iptables6.init
===================================================================
--- tinysofa/releases/1.2/iptables/current/sources/iptables6.init	2005-02-01 19:44:41 UTC (rev 5786)
+++ tinysofa/releases/1.2/iptables/current/sources/iptables6.init	2005-02-01 19:46:51 UTC (rev 5787)
@@ -154,8 +154,8 @@
 
 	restart)
 		test_config || exit $?
+		flush DROP
 		unload_modules
-		flush DROP
 		load_modules
 		load_rules
 	;;


From svn at tinysofa.org  Tue Feb  1 20:25:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 15:25:52 -0500 (EST)
Subject: [tinysofa-svn] r5788 - in tinysofa/releases: 1.1 1.2
Message-ID: <20050201202552.3097D344388@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 15:25:39 -0500 (Tue, 01 Feb 2005)
New Revision: 5788

Added:
   tinysofa/releases/1.1/imapd-pam/
Removed:
   tinysofa/releases/1.2/imapd-pam/
Log:
- move to 1.1


Copied: tinysofa/releases/1.1/imapd-pam (from rev 5787, tinysofa/releases/1.2/imapd-pam)


From svn at tinysofa.org  Tue Feb  1 20:27:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 15:27:09 -0500 (EST)
Subject: [tinysofa-svn] 
	r5789 - tinysofa/releases/1.2/cyrus-imapd/current/specs
Message-ID: <20050201202709.B7C8D344388@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 15:27:03 -0500 (Tue, 01 Feb 2005)
New Revision: 5789

Modified:
   tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- include pam files


Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-01 20:25:39 UTC (rev 5788)
+++ tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-01 20:27:03 UTC (rev 5789)
@@ -16,6 +16,8 @@
 Source14: cyrus-imapd-rc
 Source15: imapcreate.pl
 
+Source100: imap.pamd
+
 Patch1: cyrus-imapd-2.0.5-pollute.patch
 Patch2: cyrus-imapd-2.2.9-imap_err.patch
 Patch3: cyrus-imapd-perl-path2.patch
@@ -28,7 +30,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # for sasldb group
 PreReq: cyrus-sasl
-Requires: db4, imapd-pam, libcom_err
+Requires: db4, libcom_err
+Obsoletes: imapd-pam
 BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers-devel
 BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel
 BuildRequires: autoconf, byacc, bison, flex
@@ -144,6 +147,11 @@
 # Install imapcreate.pl
 install -m 755 %{SOURCE15} %{buildroot}%{_libdir}/%{name}/bin/imapcreate.pl
 ln -s ../%{_lib}/%{name}/bin/imapcreate.pl %{buildroot}/usr/bin/imapcreate
+# Install pam files
+mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/imap
+install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/pop
+install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/pop3
 # fix libdir
 perl -pi -e 's|/usr/lib|%{_libdir}|g' \
 	%{buildroot}%{_initrddir}/cyrus \
@@ -255,6 +263,9 @@
 %config %{_sysconfdir}/%{name}/user-procmailrc
 %config(noreplace) %{_sysconfdir}/%{name}/cyrus.conf
 %config(noreplace) %{_sysconfdir}/%{name}/imapd.conf
+%config(noreplace) %{_sysconfdir}/pam.d/imap
+%config(noreplace) %{_sysconfdir}/pam.d/pop
+%config(noreplace) %{_sysconfdir}/pam.d/pop3
 %attr(0755,root,root) %{_initrddir}/cyrus
 %attr(0750,cyrus,mail) %dir /var/spool/cyrus-imap
 %attr(0640,cyrus,cyrus) /var/spool/cyrus-imap/mailboxes


From svn at tinysofa.org  Tue Feb  1 20:47:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 15:47:31 -0500 (EST)
Subject: [tinysofa-svn] 
	r5790 - tinysofa/releases/1.2/anaconda/current/sources
Message-ID: <20050201204731.38E99344385@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 15:47:21 -0500 (Tue, 01 Feb 2005)
New Revision: 5790

Modified:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch
Log:
- typo


Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-02-01 20:27:03 UTC (rev 5789)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-02-01 20:47:21 UTC (rev 5790)
@@ -367,7 +367,7 @@
  splash.lss
  
 - -  To install or upgrade 02Red Hat07 Enterprise Linux in graphical mode, 
-+ -  To install or upgrade 0tinysofa07 classic server, 
++ -  To install or upgrade 0ftinysofa07 classic server, 
      press the 0f<ENTER>07 key.
  
 - -  To install or upgrade 02Red Hat07 Enterprise Linux in text mode, type: 


From svn at tinysofa.org  Tue Feb  1 21:42:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 16:42:00 -0500 (EST)
Subject: [tinysofa-svn] 
	r5791 - in tinysofa/releases/1.2: cyrus-imapd/current/sources
	grsecurity/current/sources
Message-ID: <20050201214200.C6C1434438A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 16:41:46 -0500 (Tue, 01 Feb 2005)
New Revision: 5791

Added:
   tinysofa/releases/1.2/cyrus-imapd/current/sources/imap.pamd
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050127.tar
Removed:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050126.tar
Log:
grsecurity:
- update policy file
cyrus-imapd:
- commit pam file


Added: tinysofa/releases/1.2/cyrus-imapd/current/sources/imap.pamd
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/sources/imap.pamd	2005-02-01 20:47:21 UTC (rev 5790)
+++ tinysofa/releases/1.2/cyrus-imapd/current/sources/imap.pamd	2005-02-01 21:41:46 UTC (rev 5791)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       required     pam_stack.so service=system-auth
+account    required     pam_stack.so service=system-auth
+session    required     pam_mkhomedir.so skel=/etc/skel/ umask=0076
+

Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050126.tar
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050127.tar
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050127.tar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Tue Feb  1 21:42:20 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 16:42:20 -0500 (EST)
Subject: [tinysofa-svn] 
	r5792 - tinysofa/releases/1.2/nfs-utils/current/specs
Message-ID: <20050201214220.8B89E34438A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 16:42:14 -0500 (Tue, 01 Feb 2005)
New Revision: 5792

Modified:
   tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec
Log:
nfs-utils:
- BR: cyrus-sasl-devel


Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec
===================================================================
--- tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec	2005-02-01 21:41:46 UTC (rev 5791)
+++ tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec	2005-02-01 21:42:14 UTC (rev 5792)
@@ -86,7 +86,7 @@
 PreReq: coreutils, grep
 Requires: modutils >= 2.4.26-9
 BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57
-BuildRequires: tcp_wrappers-devel gcc-c++ openldap-devel
+BuildRequires: tcp_wrappers-devel gcc-c++ openldap-devel cyrus-sasl-devel
 %service_requires
 %accountman_requires
 Requires: /sbin/nologin


From svn at tinysofa.org  Tue Feb  1 21:43:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  1 Feb 2005 16:43:18 -0500 (EST)
Subject: [tinysofa-svn] 
	r5793 - tinysofa/releases/1.2/initscripts/current/sources
Message-ID: <20050201214318.8933434438A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-01 16:43:12 -0500 (Tue, 01 Feb 2005)
New Revision: 5793

Modified:
   tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec
Log:
initscripts:
- set kernel.grsecurity.chroot_deny_pivot = 1 as default


Modified: tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec
===================================================================
--- tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec	2005-02-01 21:42:14 UTC (rev 5792)
+++ tinysofa/releases/1.2/initscripts/current/sources/sysctl.grsec	2005-02-01 21:43:12 UTC (rev 5793)
@@ -39,7 +39,7 @@
 kernel.grsecurity.chroot_enforce_chdir = 0
 
 # deny pivot_root in chroot
-kernel.grsecurity.chroot_deny_pivot = 0
+kernel.grsecurity.chroot_deny_pivot = 1
 
 # deny double-chroots
 kernel.grsecurity.chroot_deny_chroot = 0


From svn at tinysofa.org  Wed Feb  2 05:29:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 00:29:07 -0500 (EST)
Subject: [tinysofa-svn] 
	r5794 - tinysofa/releases/1.2/anaconda/current/sources
Message-ID: <20050202052907.C777034440E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 00:28:57 -0500 (Wed, 02 Feb 2005)
New Revision: 5794

Added:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs-lvm.patch
Removed:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs.patch
Modified:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch
Log:
- fix texts in boot screen
- lvm update


Copied: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs-lvm.patch (from rev 5753, tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs.patch)
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs.patch	2005-01-26 07:38:20 UTC (rev 5753)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs-lvm.patch	2005-02-02 05:28:57 UTC (rev 5794)
@@ -0,0 +1,33 @@
+--- anaconda-9.1/fsset.py.reiserfs-lvm~	2005-02-02 07:22:27.000000000 +0200
++++ anaconda-9.1/fsset.py	2005-02-02 07:27:27.000000000 +0200
+@@ -350,20 +350,7 @@
+         self.formattable = 1
+         self.checked = 1
+         self.linuxnativefs = 1
+-        # this is totally, 100% unsupported.  Boot with "linux reiserfs"
+-        # at the boot: prompt will let you make new reiserfs filesystems
+-        # in the installer.  Bugs filed when you use this will be closed
+-        # WONTFIX.
+-        try:
+-            f = open("/proc/cmdline")
+-            line = f.readline()
+-            if string.find(line, " reiserfs") != -1:
+-                self.supported = -1
+-            else:
+-                self.supported = 0
+-            del f
+-        except:
+-            self.supported = 0
++        self.supported = 1
+         self.name = "reiserfs"
+ 
+         self.maxSizeMB = 1024 * 1024
+@@ -615,7 +602,7 @@
+         self.linuxnativefs = 1
+         self.name = "physical volume (LVM)"
+         self.maxSizeMB = 1024 * 1024
+-        self.supported = 1
++        self.supported = 0
+ 
+     def isMountable(self):
+         return 0

Deleted: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs.patch	2005-02-01 21:43:12 UTC (rev 5793)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-reiserfs.patch	2005-02-02 05:28:57 UTC (rev 5794)
@@ -1,24 +0,0 @@
---- anaconda-9.1/fsset.py.reiserfs	2004-12-13 09:53:51.166352499 +0200
-+++ anaconda-9.1/fsset.py	2004-12-13 09:58:07.051506054 +0200
-@@ -350,20 +350,7 @@
-         self.formattable = 1
-         self.checked = 1
-         self.linuxnativefs = 1
--        # this is totally, 100% unsupported.  Boot with "linux reiserfs"
--        # at the boot: prompt will let you make new reiserfs filesystems
--        # in the installer.  Bugs filed when you use this will be closed
--        # WONTFIX.
--        try:
--            f = open("/proc/cmdline")
--            line = f.readline()
--            if string.find(line, " reiserfs") != -1:
--                self.supported = -1
--            else:
--                self.supported = 0
--            del f
--        except:
--            self.supported = 0
-+        self.supported = 1
-         self.name = "reiserfs"
- 
-         self.maxSizeMB = 1024 * 1024

Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-02-01 21:43:12 UTC (rev 5793)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-02-02 05:28:57 UTC (rev 5794)
@@ -344,8 +344,8 @@
  
  02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
 --- anaconda-9.1/bootdisk/i386/rescue.msg.tinysofa~	2003-09-27 00:38:12.000000000 +0300
-+++ anaconda-9.1/bootdisk/i386/rescue.msg	2005-01-26 21:08:12.000000000 +0200
-@@ -3,12 +3,12 @@
++++ anaconda-9.1/bootdisk/i386/rescue.msg	2005-02-02 07:14:42.000000000 +0200
+@@ -3,14 +3,13 @@
  
                          09Rescue Mode Help07
  
@@ -356,10 +356,13 @@
  which will allow one to restore a system to a working state.
  
 -To enter the rescue mode, boot your system from the 02Red Hat07 
-+To enter the rescue mode, boot your system from the 0fx07 
- Enterprise Linux CDROM or installation floppy and type 0flinux 
- rescue <ENTER>07.
+-Enterprise Linux CDROM or installation floppy and type 0flinux 
+-rescue <ENTER>07.
++To enter the rescue mode, boot your system from the CD-ROM or
++or installation floppy and type 0flinux rescue <ENTER>07.
  
+ 
+ 
 --- anaconda-9.1/bootdisk/i386/boot.msg.tinysofa~	2003-09-27 00:38:12.000000000 +0300
 +++ anaconda-9.1/bootdisk/i386/boot.msg	2005-01-26 21:08:12.000000000 +0200
 @@ -1,12 +1,9 @@


From svn at tinysofa.org  Wed Feb  2 05:30:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 00:30:32 -0500 (EST)
Subject: [tinysofa-svn] r5795 - tinysofa/releases/1.2/anaconda/current/specs
Message-ID: <20050202053032.A03FB34440E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 00:30:27 -0500 (Wed, 02 Feb 2005)
New Revision: 5795

Modified:
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- replace python version with one perl command
- rename reiserfs patch


Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-02 05:28:57 UTC (rev 5794)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-02 05:30:27 UTC (rev 5795)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 0.11jh
+Release: 0.12jh
 License: GPL
 Summary: installation program
 Group: development
@@ -22,7 +22,7 @@
 Patch5: anaconda-9.1-nox.patch
 Patch6: anaconda-9.1-sshd.patch
 Patch7: anaconda-9.1-utc.patch
-Patch8: anaconda-9.1-reiserfs.patch
+Patch8: anaconda-9.1-reiserfs-lvm.patch
 Patch9: anaconda-9.1-loader2-kernel26.patch
 Patch10: anaconda-9.1-utils-kernel26.patch
 Patch11: anaconda-9.1-scripts-kernel26.patch
@@ -82,7 +82,7 @@
 %patch5 -p1 -b .nox~
 %patch6 -p1
 %patch7 -p1 -b .utc~
-%patch8 -p1 -b .reiserfs~
+%patch8 -p1 -b .reiserfs-lvm~
 %patch9 -p1 -b .loader2-kernel26~
 %patch10 -p1 -b .utils-kernel26~
 %patch11 -p1 -b .scripts-kernel26~
@@ -93,10 +93,12 @@
 %patch16 -p1 -b .modprobe.conf~
 %patch17 -p1 -b .mdadm~
 
-find rhpl* booty* -type f|xargs perl -pi -e 's/python2.3/python%{py_version}/g'
-find . -type f|xargs perl -pi -e 's/python2.2/python%{py_version}/g'
-find . -type f|xargs perl -pi -e 's/RedHat\/base/tinysofa\/base/g'
-find . -type f|xargs perl -pi -e 's/RedHat\/RPMS/tinysofa\/rpms.os/g'
+# rhpl and booty use originally python 2.3
+# anaconda uses orginally python 2.2
+find . -type f|xargs perl -pi \
+	-e 's|python2.[23]|python%{py_version}|g;' \
+	-e 's|RedHat/base|tinysofa/base|g;' \
+	-e 's|RedHat/RPMS|tinysofa/rpms.os|g;'
 
 ln -s mk-images.i386 scripts/mk-images.i586
 


From svn at tinysofa.org  Wed Feb  2 05:36:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 00:36:01 -0500 (EST)
Subject: [tinysofa-svn] 
	r5796 - in tinysofa/releases/1.2/file/current: sources specs
Message-ID: <20050202053601.5F94A344411@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 00:35:46 -0500 (Wed, 02 Feb 2005)
New Revision: 5796

Added:
   tinysofa/releases/1.2/file/current/sources/file-4.10-debian.patch
   tinysofa/releases/1.2/file/current/sources/file-4.10-rh.patch
   tinysofa/releases/1.2/file/current/sources/file-4.12-compress.patch
   tinysofa/releases/1.2/file/current/sources/file-4.12-core64.patch
   tinysofa/releases/1.2/file/current/sources/file-4.12-magic.patch
Modified:
   tinysofa/releases/1.2/file/current/specs/file.spec
Log:
- add patches from Fedora

Added: tinysofa/releases/1.2/file/current/sources/file-4.10-debian.patch
===================================================================
--- tinysofa/releases/1.2/file/current/sources/file-4.10-debian.patch	2005-02-02 05:30:27 UTC (rev 5795)
+++ tinysofa/releases/1.2/file/current/sources/file-4.10-debian.patch	2005-02-02 05:35:46 UTC (rev 5796)
@@ -0,0 +1,19 @@
+--- 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:
+ 

Added: tinysofa/releases/1.2/file/current/sources/file-4.10-rh.patch
===================================================================
--- tinysofa/releases/1.2/file/current/sources/file-4.10-rh.patch	2005-02-02 05:30:27 UTC (rev 5795)
+++ tinysofa/releases/1.2/file/current/sources/file-4.10-rh.patch	2005-02-02 05:35:46 UTC (rev 5796)
@@ -0,0 +1,35 @@
+--- 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)

Added: tinysofa/releases/1.2/file/current/sources/file-4.12-compress.patch
===================================================================
--- tinysofa/releases/1.2/file/current/sources/file-4.12-compress.patch	2005-02-02 05:30:27 UTC (rev 5795)
+++ tinysofa/releases/1.2/file/current/sources/file-4.12-compress.patch	2005-02-02 05:35:46 UTC (rev 5796)
@@ -0,0 +1,45 @@
+--- file-4.12/src/compress.c.compres	2004-09-27 17:23:07.000000000 +0200
++++ file-4.12/src/compress.c	2005-01-03 11:23:53.263747144 +0100
+@@ -313,7 +313,8 @@
+ {
+ 	int fdin[2], fdout[2];
+ 	int r;
+-
++	pid_t pid1, pid2;
++	
+ 	/* The buffer is NUL terminated, and we don't need that. */
+ 	n--;
+ 	 
+@@ -326,7 +327,7 @@
+ 		file_error(ms, errno, "cannot create pipe");	
+ 		return 0;
+ 	}
+-	switch (fork()) {
++	switch ((pid1=fork())) {
+ 	case 0:	/* child */
+ 		(void) close(0);
+ 		(void) dup(fdin[0]);
+@@ -352,7 +353,7 @@
+ 		(void) close(fdin[0]);
+ 		(void) close(fdout[1]);
+ 		/* fork again, to avoid blocking because both pipes filled */
+-		switch (fork()) {
++		switch ((pid2=fork())) {
+ 		case 0: /* child */
+ 			(void)close(fdout[0]);
+ 			if (swrite(fdin[1], old, n) != n)
+@@ -387,12 +388,8 @@
+ 		if (fdin[1] != -1)
+ 			(void) close(fdin[1]);
+ 		(void) close(fdout[0]);
+-#ifdef WNOHANG
+-		while (waitpid(-1, NULL, WNOHANG) != -1)
+-			continue;
+-#else
+-		(void)wait(NULL);
+-#endif
++		waitpid(pid1, NULL, 0);
++		waitpid(pid2, NULL, 0);
+ 		return n;
+ 	}
+ }

Added: tinysofa/releases/1.2/file/current/sources/file-4.12-core64.patch
===================================================================
--- tinysofa/releases/1.2/file/current/sources/file-4.12-core64.patch	2005-02-02 05:30:27 UTC (rev 5795)
+++ tinysofa/releases/1.2/file/current/sources/file-4.12-core64.patch	2005-02-02 05:35:46 UTC (rev 5796)
@@ -0,0 +1,10 @@
+--- file-4.12/src/readelf.c.core64	2004-11-24 18:38:24.000000000 +0100
++++ file-4.12/src/readelf.c	2005-01-21 16:46:19.972269176 +0100
+@@ -176,6 +176,7 @@
+ };
+ 
+ size_t	prpsoffsets64[] = {
++       40,		/* Linux (tested on core from 2.4.x) */
+        120,		/* SunOS 5.x, 64-bit */
+ };
+ 

Added: tinysofa/releases/1.2/file/current/sources/file-4.12-magic.patch
===================================================================
--- tinysofa/releases/1.2/file/current/sources/file-4.12-magic.patch	2005-02-02 05:30:27 UTC (rev 5795)
+++ tinysofa/releases/1.2/file/current/sources/file-4.12-magic.patch	2005-02-02 05:35:46 UTC (rev 5796)
@@ -0,0 +1,132 @@
+--- file-4.12/magic/magic.mime.magic	2004-11-24 18:31:59.000000000 +0100
++++ file-4.12/magic/magic.mime	2004-12-02 12:16:11.398144072 +0100
+@@ -190,7 +190,7 @@
+ 
+ 
+ # MPEG Layer 3 sound files
+-0       beshort		&0xffe0		audio/mpeg
++0       beshort&0xfffe  =0xfffa         audio/mpeg
+ #MP3 with ID3 tag
+ 0	string		ID3		audio/mpeg
+ # Ogg/Vorbis
+@@ -393,19 +393,14 @@
+ #
+ # from Daniel Quinlan <quinlan at yggdrasil.com>
+ #
+-0	string		\<HEAD	text/html
+-0	string		\<head	text/html
+-0	string		\<TITLE	text/html
+-0	string		\<title	text/html
+-0       string          \<html	text/html
+-0       string          \<HTML	text/html
++0	string/cB	\<!DOCTYPE\ html	text/html
++0	string/cb	\<head	text/html
++0	string/cb	\<title	text/html
++0       string/bc	\<html	text/html
+ 0	string		\<!--	text/html
+-0	string		\<h1	text/html
+-0	string		\<H1	text/html
+-0	string		\<!doctype\ HTML	text/html
+-0	string		\<!DOCTYPE\ HTML	text/html
+-0	string		\<!doctype\ html	text/html
+-0	string		\<!doctype\ HTML	text/html
++0	string/c	\<h1	text/html
++
++0	string		\<?xml			text/xml
+ 
+ #------------------------------------------------------------------------------
+ # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
+@@ -468,7 +463,7 @@
+ 0	beshort		0xffd8		image/jpeg
+ 
+ # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt at uchicago.edu)
+-0	string		BM		image/bmp
++0	string		BM		image/x-ms-bmp
+ #>14	byte		12		(OS/2 1.x format)
+ #>14	byte		64		(OS/2 2.x format)
+ #>14	byte		40		(Windows 3.x format)
+@@ -906,3 +901,7 @@
+ # (made the mimetype up) 
+ 0	string	\0\0MMXPR3\0	application/x-quark-xpress-3
+ 
++# Gnumeric spreadsheet
++# This entry is only semi-helpful, as Gnumeric compresses its files, so
++# they will ordinarily reported as "compressed", but at least -z helps
++39      string          =<gmr:Workbook           application/x-gnumeric
+--- file-4.12/magic/Magdir/revision.magic	2003-05-26 01:04:55.000000000 +0200
++++ file-4.12/magic/Magdir/revision	2004-12-02 12:07:48.900535320 +0100
+@@ -3,3 +3,9 @@
+ # file(1) magic for revision control files
+ # From Hendrik Scholz <hendrik at scholz.net>
+ 0   string /1\ :pserver:    cvs password text file
++
++
++# Subversion (SVN) dumps
++# Uwe Zeisberger <zeisberg at informatik.uni-freiburg.de>
++0       string  SVN-fs-dump-format-version:     Subversion dumpfile
++>28     string  >\0                             (version: %s)
+--- file-4.12/magic/Magdir/apple.magic	2004-09-27 17:23:03.000000000 +0200
++++ file-4.12/magic/Magdir/apple	2004-12-02 12:07:48.901535168 +0100
+@@ -10,6 +10,23 @@
+ 0	belong		0x00051600		AppleSingle encoded Macintosh file
+ 0	belong		0x00051607		AppleDouble encoded Macintosh file
+ 
++# Apple Emulator 2IMG format
++#
++0	string		2IMG		Apple ][ 2IMG Disk Image
++>4	string		XGS!		\b, XGS
++>4	string		CTKG		\b, Catakig
++>4	string		ShIm		\b, Sheppy's ImageMaker
++>4	string		WOOF		\b, Sweet 16
++>4	string		B2TR		\b, Bernie ][ the Rescue
++>4	string		!nfc		\b, ASIMOV2
++>4	string		x		\b, Unknown Format
++>0xc	byte		00		\b, DOS 3.3 sector order
++>>0x10	byte		00		\b, Volume 254
++>>0x10	byte&0x7f	x		\b, Volume %u
++>0xc	byte		01		\b, ProDOS sector order
++>>0x14	short		x		\b, %u Blocks
++>0xc	byte		02		\b, NIB data
++
+ # magic for Newton PDA package formats
+ # from Ruda Moura <ruda at helllabs.org>
+ 0	string	package0	Newton package, NOS 1.x,
+--- file-4.12/magic/Magdir/images.magic	2004-09-27 17:23:06.000000000 +0200
++++ file-4.12/magic/Magdir/images	2004-12-02 12:07:48.900535320 +0100
+@@ -519,3 +519,12 @@
+ # From: Tom Hilinski <tom.hilinski at comcast.net>
+ # http://www.unidata.ucar.edu/packages/netcdf/
+ 0	string	CDF\001			netcdf file
++
++
++# The boot loaders syslinux and isolinux use a RLE based image format
++# called SLL16 to store splash screens.
++0	lelong		0x1413f33d	Syslinux SLL16 image data,
++>4	leshort		>0		%hd x
++>6	leshort		>0		%hd
++
++
+--- file-4.12/src/file.c.magic	2004-09-27 17:28:37.000000000 +0200
++++ file-4.12/src/file.c	2004-12-02 12:07:48.924531672 +0100
+@@ -362,7 +362,8 @@
+ 	}
+ 
+ 	while (fgets(buf, MAXPATHLEN, f) != NULL) {
+-		buf[file_mbswidth(buf)-1] = '\0';
++	        // cut off CR, we _need_ bytes here, not characters
++		buf[strlen(buf)-1] = '\0';
+ 		process(buf, wid);
+ 		if(nobuffer)
+ 			(void) fflush(stdout);
+--- file-4.12/src/fsmagic.c.magic	2004-11-21 17:34:11.000000000 +0100
++++ file-4.12/src/fsmagic.c	2004-12-02 12:07:48.924531672 +0100
+@@ -92,7 +92,8 @@
+ 		if (file_printf(ms, "cannot open `%s' (%s)",
+ 		    fn, strerror(errno)) == -1)
+ 			return -1;
+-		return 1;
++		ms->haderr++;
++		return -1;
+ 	}
+ 
+ 	if ((ms->flags & MAGIC_MIME) != 0) {

Modified: tinysofa/releases/1.2/file/current/specs/file.spec
===================================================================
--- tinysofa/releases/1.2/file/current/specs/file.spec	2005-02-02 05:30:27 UTC (rev 5795)
+++ tinysofa/releases/1.2/file/current/specs/file.spec	2005-02-02 05:35:46 UTC (rev 5796)
@@ -3,12 +3,19 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.12
-Release: 1ts
+Release: 2jh
 License: distributable
 Group: main
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
-Patch0: file-selinux.patch
+Patch0: file-4.10-rh.patch
+Patch1: file-4.10-debian.patch
+Patch2: file-selinux.patch
+#Patch3: file-stringop.patch
+Patch4: file-4.12-magic.patch
+Patch5: file-4.12-compress.patch
+Patch6: file-4.12-core64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: zlib-devel
 
 %description
 The file command is used to identify a particular file according to the
@@ -31,10 +38,17 @@
 
 %prep
 %setup -q
-%if %{with_selinux}
-%patch0 -p1 -b .selinux
-%endif
+%patch0 -p1 -b .rh
+%patch1 -p1 -b .debian
+%patch2 -p1 -b .selinux
+#%patch3 -p1 -b .stringop
+%patch4 -p1 -b .magic
+%patch5 -p1 -b .compress
+%patch6 -p1 -b .core64
 
+iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
+mv doc/libmagic.man_ doc/libmagic.man
+
 %build
 CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
 %configure --enable-fsect-man5
@@ -82,6 +96,9 @@
 
 
 %changelog
+* Wed Feb  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.12-2jh
+- add patches from Fedora
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 4.12-1ts
 - current (4.12-1jh) integrated as 4.12-1ts for release 1.1-U3
 


From svn at tinysofa.org  Wed Feb  2 16:26:20 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 11:26:20 -0500 (EST)
Subject: [tinysofa-svn] 
	r5797 - in tinysofa/releases/1.2/cups/current: sources specs
Message-ID: <20050202162620.181553443B6@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 11:26:10 -0500 (Wed, 02 Feb 2005)
New Revision: 5797

Added:
   tinysofa/releases/1.2/cups/current/sources/cups-CAN-2005-0064.patch
Modified:
   tinysofa/releases/1.2/cups/current/specs/cups.spec
Log:
- fix CAN-2005-0064

Added: tinysofa/releases/1.2/cups/current/sources/cups-CAN-2005-0064.patch
===================================================================
--- tinysofa/releases/1.2/cups/current/sources/cups-CAN-2005-0064.patch	2005-02-02 05:35:46 UTC (rev 5796)
+++ tinysofa/releases/1.2/cups/current/sources/cups-CAN-2005-0064.patch	2005-02-02 16:26:10 UTC (rev 5797)
@@ -0,0 +1,31 @@
+--- cups-1.1.17/pdftops/Decrypt.cxx	2005-01-14 14:26:55.679891237 +0000
++++ cups-1.1.17/pdftops/Decrypt.cxx	2005-01-17 14:21:58.917198715 +0000
+@@ -116,13 +116,19 @@
+   Guchar *buf;
+   Guchar test[32];
+   Guchar fState[256];
+-  Guchar tmpKey[16];
++  Guchar *tmpKey;
+   Guchar fx, fy;
+   int len, i, j;
+   GBool ok;
+ 
++  // check whether we have non-zero keyLength
++  if ( !keyLength || keyLength > 16 ) {
++    return gFalse;
++  }
++  
+   // generate file key
+   buf = (Guchar *)gmalloc(68 + fileID->getLength());
++  tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
+   if (userPassword) {
+     len = userPassword->getLength();
+     if (len < 32) {
+@@ -175,6 +181,7 @@
+     ok = gFalse;
+   }
+ 
++  gfree(tmpKey);
+   gfree(buf);
+   return ok;
+ }

Modified: tinysofa/releases/1.2/cups/current/specs/cups.spec
===================================================================
--- tinysofa/releases/1.2/cups/current/specs/cups.spec	2005-02-02 05:35:46 UTC (rev 5796)
+++ tinysofa/releases/1.2/cups/current/specs/cups.spec	2005-02-02 16:26:10 UTC (rev 5797)
@@ -1,7 +1,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 1gd
+Release: 2jh
 License: GPL
 Group: main
 Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2
@@ -17,6 +17,7 @@
 Patch6: cups-1.1.17-pdftops.patch
 Patch9: cups-1.1.19-ppdsdat.patch
 Patch10: cups-pie.patch
+Patch11: cups-CAN-2005-0064.patch
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
 %service_requires
@@ -69,6 +70,7 @@
 %patch6 -p1 -b .pdftops
 %patch9 -p1 -b .ppdsdat
 %patch10 -p1 -b .pie
+%patch11 -p1 -b .CAN-2005-0064
 
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 autoconf
@@ -212,6 +214,9 @@
 
 
 %changelog
+* Wed Feb  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.23-2jh
+- fix CAN-2005-0064
+
 * Mon Jan 10 2005 Gerald Dachs <gda at tinysofa dot org> 1.1.23-1gd
 - 1.1.23 with 'STR866 fix introduces DoS' fix
 


From svn at tinysofa.org  Wed Feb  2 19:49:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 14:49:11 -0500 (EST)
Subject: [tinysofa-svn] r5803 - tinysofa/releases/1.2/php/current/specs
Message-ID: <20050202194911.6371334428A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 14:49:05 -0500 (Wed, 02 Feb 2005)
New Revision: 5803

Modified:
   tinysofa/releases/1.2/php/current/specs/php.spec
Log:
- remove reference to freetds patches

Modified: tinysofa/releases/1.2/php/current/specs/php.spec
===================================================================
--- tinysofa/releases/1.2/php/current/specs/php.spec	2005-02-02 19:33:52 UTC (rev 5802)
+++ tinysofa/releases/1.2/php/current/specs/php.spec	2005-02-02 19:49:05 UTC (rev 5803)
@@ -38,10 +38,6 @@
 Patch30: php-4.3.1-dlopen.patch
 Patch31: php-5.0.0-easter.patch
 
-# tinysofa
-Patch100: php-4.3.7-freetds.patch
-Patch101: php-4.3.7-freetds-multilib.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: autoconf automake gcc-c++ bison flex pkgconfig


From svn at tinysofa.org  Wed Feb  2 19:51:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 14:51:38 -0500 (EST)
Subject: [tinysofa-svn] r5804 - tinysofa/releases/1.2/postfix/current/specs
Message-ID: <20050202195138.63D86344386@minbar.tinysofa.org>

Author: gda
Date: 2005-02-02 14:51:31 -0500 (Wed, 02 Feb 2005)
New Revision: 5804

Modified:
   tinysofa/releases/1.2/postfix/current/specs/postfix.spec
Log:
included README

Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-02 19:49:05 UTC (rev 5803)
+++ tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-02 19:51:31 UTC (rev 5804)
@@ -260,6 +260,7 @@
 find $RPM_BUILD_ROOT/%{_sysconfdir} -type f -name '*.cf'| \
 	xargs perl -pi -e 's|/usr/lib|%{_libdir}|g'
 
+install -m 644 %{SOURCE10} .
 
 %pre
 if [ -z "`getent group postfix`" ]; then
@@ -343,7 +344,7 @@
 %doc RELEASE_NOTES-* README_FILES/*
 %doc postfix-contrib
 %doc tls
-%doc %{SOURCE10}
+%doc README.sender_auth+sender_relay
 
 %dir %attr(755,root,root) %{_sysconfdir}/postfix
 %config(noreplace) %verify(not mtime size md5) %attr(644,root,root) %{_sysconfdir}/postfix/access


From svn at tinysofa.org  Wed Feb  2 17:49:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 12:49:44 -0500 (EST)
Subject: [tinysofa-svn] 
	r5799 - in contrib/1.1/spamassassin/current: sources specs
Message-ID: <20050202174944.0FAEA34425D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-02 12:48:41 -0500 (Wed, 02 Feb 2005)
New Revision: 5799

Added:
   contrib/1.1/spamassassin/current/sources/Mail-SpamAssassin-3.0.2.tar.bz2
Removed:
   contrib/1.1/spamassassin/current/sources/Mail-SpamAssassin-3.0.0.tar.bz2
Modified:
   contrib/1.1/spamassassin/current/specs/spamassassin.spec
Log:
new upstream

Deleted: contrib/1.1/spamassassin/current/sources/Mail-SpamAssassin-3.0.0.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/1.1/spamassassin/current/sources/Mail-SpamAssassin-3.0.2.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/spamassassin/current/sources/Mail-SpamAssassin-3.0.2.tar.bz2
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/1.1/spamassassin/current/specs/spamassassin.spec	2005-02-02 17:48:12 UTC (rev 5798)
+++ contrib/1.1/spamassassin/current/specs/spamassassin.spec	2005-02-02 17:48:41 UTC (rev 5799)
@@ -1,9 +1,9 @@
 %define real_name Mail-SpamAssassin
 
 Summary:        a spam filter for email which can be invoked from mail delivery agents
-Group: contrib
+Group:          contrib
 Name: spamassassin
-Version: 3.0.0
+Version: 3.0.2
 Release: 1gd
 License: Apache License 2.0
 URL: http://spamassassin.apache.org/
@@ -15,6 +15,7 @@
 Buildroot: %{_tmppath}/%{name}-root
 Requires: perl-mail-spamassassin = %{version}-%{release}
 Requires: perl(Pod::Usage)
+%service_requires
 BuildRequires: perl >= 5.6.1 perl(Digest::SHA1)
 
 %description
@@ -29,7 +30,7 @@
 
 %package tools
 Summary:        Miscellaneous tools and documentation for SpamAssassin
-Group: contrib
+Group:          contrib
 Requires: perl-mail-spamassassin = %{version}-%{release}
 
 %description tools
@@ -40,7 +41,7 @@
 Summary:        %{real_name} -- SpamAssassin e-mail filter Perl modules
 Requires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1)
 BuildRequires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1)
-Group: contrib
+Group:          Contrib
 
 %description -n perl-mail-spamassassin
 Mail::SpamAssassin is a module to identify spam using text analysis and
@@ -121,6 +122,9 @@
 %service_postun spamassassin
 
 %changelog
+* Wed Feb  2 2005 Gerald Dachs <gda at tinysofa dot de> 3.0.2-1gd
+- New upstream version
+
 * Thu Sep 23 2004 Gerald Dachs <gda at tinysofa dot de> 3.0.0-1gd
 - New upstream version
 


From svn at tinysofa.org  Wed Feb  2 17:57:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 12:57:19 -0500 (EST)
Subject: [tinysofa-svn] 
	r5800 - in contrib/1.1/amavisd-new/current: sources specs
Message-ID: <20050202175719.92DCC344262@minbar.tinysofa.org>

Author: gda
Date: 2005-02-02 12:56:21 -0500 (Wed, 02 Feb 2005)
New Revision: 5800

Added:
   contrib/1.1/amavisd-new/current/sources/amavisd-new-2.2.1.tar.gz
Removed:
   contrib/1.1/amavisd-new/current/sources/amavisd-new-20040701-dspam-3.0.0.patch
   contrib/1.1/amavisd-new/current/sources/amavisd-new-20040701.tar.gz
Modified:
   contrib/1.1/amavisd-new/current/specs/amavisd-new.spec
Log:
new upstream

Added: contrib/1.1/amavisd-new/current/sources/amavisd-new-2.2.1.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/amavisd-new/current/sources/amavisd-new-2.2.1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: contrib/1.1/amavisd-new/current/sources/amavisd-new-20040701-dspam-3.0.0.patch
===================================================================
--- contrib/1.1/amavisd-new/current/sources/amavisd-new-20040701-dspam-3.0.0.patch	2005-02-02 17:48:41 UTC (rev 5799)
+++ contrib/1.1/amavisd-new/current/sources/amavisd-new-20040701-dspam-3.0.0.patch	2005-02-02 17:56:21 UTC (rev 5800)
@@ -1,23 +0,0 @@
---- amavisd-new-20040701/amavisd.orig	2004-08-02 21:14:35.000000000 +0200
-+++ amavisd-new-20040701/amavisd	2004-08-02 21:20:37.000000000 +0200
-@@ -9859,7 +9859,7 @@
-         or die "Can't create file $dspam_fname: $!";
-       $fh->seek(0,0) or die "Can't rewind mail file: $!";
-       my($proc_fh,$pid) = run_command('&'.fileno($fh), "&1", $dspam,
--                                      qw(--stdout --deliver-spam) );
-+                                      qw(--stdout --user amavisd --mode=tum --deliver=spam,innocent) );
-       # keep X-DSPAM-*, ignore other changes e.g. Content-Transfer-Encoding
-       while (defined($_ = $proc_fh->getline)) {  # scan mail header from DSPAM
-         $dspam_fh->print($_) or die "Can't write to $dspam_fname: $!";
-@@ -9951,9 +9951,9 @@
-     if ($dspam ne '' && defined $spam_level) {  # DSPAM auto-learn
-       my($eat, at options);
-       if (   $spam_level >  5.0 && $dspam_result eq 'Innocent')
--        { $eat = 'SPAM'; @options = qw(--stdout --addspam) }
-+        { $eat = 'SPAM'; @options = qw(--stdout --source=error --class=spam --user amavisd --mode=tum) }
-       elsif ($spam_level <  1.0 && $dspam_result eq 'Spam')
--        { $eat = 'HAM';  @options = qw(--stdout --falsepositive) }
-+        { $eat = 'HAM';  @options = qw(--stdout --source=error --class=innocent --user amavisd --mode=tum) }
-       if (defined $eat && $dspam_signature ne '') {
-         do_log(2, "DSPAM learn $eat ($spam_level), $dspam_signature");
-         my($proc_fh,$pid) = run_command($dspam_fname, "&1", $dspam, @options);

Deleted: contrib/1.1/amavisd-new/current/sources/amavisd-new-20040701.tar.gz
===================================================================
(Binary files differ)

Modified: contrib/1.1/amavisd-new/current/specs/amavisd-new.spec
===================================================================
--- contrib/1.1/amavisd-new/current/specs/amavisd-new.spec	2005-02-02 17:48:41 UTC (rev 5799)
+++ contrib/1.1/amavisd-new/current/specs/amavisd-new.spec	2005-02-02 17:56:21 UTC (rev 5800)
@@ -1,17 +1,15 @@
-%define realversion 20040701
 Name:      amavisd-new
-Version:   0.0.%{realversion}
-Release: 2gd
+Version:   2.2.1
+Release:   1gd
 Summary:   AMaViSd-new - A Mail Virus Scanner
 URL:       http://www.ijs.si/software/amavisd/
 License:   GPL
 Group: contrib
-Source0:   %{name}-%{realversion}.tar.gz
+Source0:   %{name}-%{version}.tar.gz
 Source1:   amavisd.init
 Source2:   amavisd.conf
-Patch:     amavisd-new-20040701-dspam-3.0.0.patch
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{realversion}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: smtpdaemon
 Requires: spamassassin
@@ -52,8 +50,7 @@
 further includes an interface to SpamAssassin.
 
 %prep
-%setup -q -n %{name}-%{realversion}
-%patch -p1 -b .dspam
+%setup -q 
 
 perl -pi -e 's|/var/amavis|/var/spool/amavis|' amavisd
 
@@ -123,6 +120,9 @@
 
 
 %changelog
+* Wed Feb 02 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.1-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.0.20040701-2gd
 - current (0.0.20040701-2gd) integrated as 0.0.20040701-2gd
 


From svn at tinysofa.org  Wed Feb  2 17:48:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 12:48:30 -0500 (EST)
Subject: [tinysofa-svn] 
	r5798 - in tinysofa/releases/1.2/postfix/current: sources specs
Message-ID: <20050202174830.7D0A4344262@minbar.tinysofa.org>

Author: gda
Date: 2005-02-02 12:48:12 -0500 (Wed, 02 Feb 2005)
New Revision: 5798

Added:
   tinysofa/releases/1.2/postfix/current/sources/README.sender_auth+sender_relay
   tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.15-sender_auth.patch
   tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.18-sender_relay.patch
Modified:
   tinysofa/releases/1.2/postfix/current/specs/postfix.spec
Log:
applied smart_auth and smart_relay patches

Added: tinysofa/releases/1.2/postfix/current/sources/README.sender_auth+sender_relay
===================================================================
--- tinysofa/releases/1.2/postfix/current/sources/README.sender_auth+sender_relay	2005-02-02 16:26:10 UTC (rev 5797)
+++ tinysofa/releases/1.2/postfix/current/sources/README.sender_auth+sender_relay	2005-02-02 17:48:12 UTC (rev 5798)
@@ -0,0 +1,33 @@
+The following two patches add some features important for dial-in users
+(having greedy a greedy ISP, who doesn't offer a free SMTP relay).
+
+The first patch teaches Postfix to select the SMTP-AUTH credentials
+passed to the smart host on basis of the sender address. This is very
+important, if the smart host requires authentification and multiple
+different users are sharing one Postfix instance. I was using it for
+several month together with Postfix 1.1.11 now, and it worked reliable.
+
+The second patch allows usage of multiple smart hosts (aka. "relayhost"
+in Postfix speak). Selection also is done on basis of the sender's
+address. For the second patch there already exists an undocumented
+option (something "sender_based_transport"). But that option disables
+recipient based transport selection and should cause problems on bounce
+messages. My patch achives it's goal by introducing a new flag in
+trival-rewrite/resolve.c: If it's obvious, that a relayhost would have
+to be choosen the new flag RESOLVE_CLASS_SMARTHOST is set. The queue
+manager interprets this flag later. To configure sender-based smart host
+selection you have to create a postfix map, assigned smart host names to
+sender addresses. You tell postfix about that map, by adding something
+like ?relayhost_map = "pcre:/etc/postfix/relayhosts"? to your
+configuration. The file would contain lines like this:
+
+	/@gmx.de$/ mail.gmx.de
+
+It's a fresh patch, so I had not much chance for testing yet. But it
+appears to work. Waiting for feedback.
+
+Ciao,
+Mathias Hasselmann
+-- 
+Mathias Hasselmann <mathias.hasselmann at gmx.de>
+http://www.taschenorakel.de/mathias/

Added: tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.15-sender_auth.patch
===================================================================
--- tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.15-sender_auth.patch	2005-02-02 16:26:10 UTC (rev 5797)
+++ tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.15-sender_auth.patch	2005-02-02 17:48:12 UTC (rev 5798)
@@ -0,0 +1,29 @@
+diff -ru postfix-2.0.15/src/smtp/smtp_sasl_glue.c postfix-2.0.15-smtp_sasl_sender_auth/src/smtp/smtp_sasl_glue.c
+--- postfix-2.0.15/src/smtp/smtp_sasl_glue.c	2002-03-29 23:24:22.000000000 +0100
++++ postfix-2.0.15-smtp_sasl_sender_auth/src/smtp/smtp_sasl_glue.c	2003-09-11 21:52:29.000000000 +0200
+@@ -270,8 +270,12 @@
+      * Look up the per-server password information. Try the hostname first,
+      * then try the destination.
+      */
+-    if ((value = maps_find(smtp_sasl_passwd_map, state->session->host, 0)) != 0
+-	|| (value = maps_find(smtp_sasl_passwd_map, state->request->nexthop, 0)) != 0) {
++    if (0 != (value = maps_find(smtp_sasl_passwd_map, 
++				state->request->sender, 0)) ||
++        0 != (value = maps_find(smtp_sasl_passwd_map,
++				state->session->host, 0)) ||
++	0 != (value = maps_find(smtp_sasl_passwd_map,
++				state->request->nexthop, 0))) {
+ 	state->sasl_username = mystrdup(value);
+ 	passwd = split_at(state->sasl_username, ':');
+ 	state->sasl_passwd = mystrdup(passwd ? passwd : "");
+@@ -282,8 +286,8 @@
+ 	return (1);
+     } else {
+ 	if (msg_verbose)
+-	    msg_info("%s: host `%s' no auth info found",
+-		     myname, state->session->host);
++	    msg_info("%s: no auth info found (sender=`%s', host=`%s')",
++		     myname, state->request->sender, state->session->host);
+ 	return (0);
+     }
+ }


Property changes on: tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.15-sender_auth.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.18-sender_relay.patch
===================================================================
--- tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.18-sender_relay.patch	2005-02-02 16:26:10 UTC (rev 5797)
+++ tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.18-sender_relay.patch	2005-02-02 17:48:12 UTC (rev 5798)
@@ -0,0 +1,151 @@
+diff -bru postfix-2.0.18/src/global/mail_params.c postfix-2.0.18-sender_relay/src/global/mail_params.c
+--- postfix-2.0.18/src/global/mail_params.c	2002-12-13 23:04:31.000000000 +0100
++++ postfix-2.0.18-sender_relay/src/global/mail_params.c	2004-02-01 00:49:27.000000000 +0100
+@@ -165,6 +165,7 @@
+ char   *var_myorigin;
+ char   *var_mydest;
+ char   *var_relayhost;
++char   *var_relayhost_map;
+ char   *var_transit_origin;
+ char   *var_transit_dest;
+ char   *var_mail_name;
+@@ -433,6 +434,7 @@
+ 	VAR_MYDEST, DEF_MYDEST, &var_mydest, 0, 0,
+ 	VAR_MYORIGIN, DEF_MYORIGIN, &var_myorigin, 1, 0,
+ 	VAR_RELAYHOST, DEF_RELAYHOST, &var_relayhost, 0, 0,
++	VAR_RELAYHOST_MAP, DEF_RELAYHOST_MAP, &var_relayhost_map, 0, 0,
+ 	VAR_PROGRAM_DIR, DEF_PROGRAM_DIR, &var_program_dir, 1, 0,
+ 	VAR_DAEMON_DIR, DEF_DAEMON_DIR, &var_daemon_dir, 1, 0,
+ 	VAR_COMMAND_DIR, DEF_COMMAND_DIR, &var_command_dir, 1, 0,
+diff -bru postfix-2.0.18/src/global/mail_params.h postfix-2.0.18-sender_relay/src/global/mail_params.h
+--- postfix-2.0.18/src/global/mail_params.h	2003-03-03 23:07:03.000000000 +0100
++++ postfix-2.0.18-sender_relay/src/global/mail_params.h	2004-02-01 01:03:34.000000000 +0100
+@@ -165,6 +165,10 @@
+ #define DEF_RELAYHOST		""
+ extern char *var_relayhost;
+ 
++#define VAR_RELAYHOST_MAP	"relayhost_map"
++#define DEF_RELAYHOST_MAP	""
++extern char *var_relayhost_map;
++
+ #define VAR_FALLBACK_RELAY	"fallback_relay"
+ #define DEF_FALLBACK_RELAY	""
+ extern char *var_fallback_relay;
+diff -bru postfix-2.0.18/src/global/resolve_clnt.h postfix-2.0.18-sender_relay/src/global/resolve_clnt.h
+--- postfix-2.0.18/src/global/resolve_clnt.h	2002-12-08 17:45:58.000000000 +0100
++++ postfix-2.0.18-sender_relay/src/global/resolve_clnt.h	2004-02-04 17:33:10.000000000 +0100
+@@ -31,6 +31,7 @@
+ #define RESOLVE_CLASS_VIRTUAL	(1<<10)	/* virtual_mailbox_domains */
+ #define RESOLVE_CLASS_RELAY	(1<<11)	/* relay_domains */
+ #define RESOLVE_CLASS_DEFAULT	(1<<12)	/* raise reject_unauth_destination */
++#define RESOLVE_CLASS_SMARTHOST (1<<13) /* delivery via smarthost choosen */
+ 
+ #define RESOLVE_CLASS_FINAL \
+ 	(RESOLVE_CLASS_LOCAL | RESOLVE_CLASS_ALIAS | RESOLVE_CLASS_VIRTUAL)
+diff -bru postfix-2.0.18/src/qmgr/qmgr.c postfix-2.0.18-sender_relay/src/qmgr/qmgr.c
+--- postfix-2.0.18/src/qmgr/qmgr.c	2002-12-22 20:31:18.000000000 +0100
++++ postfix-2.0.18-sender_relay/src/qmgr/qmgr.c	2004-02-04 18:10:36.000000000 +0100
+@@ -288,6 +288,8 @@
+ static QMGR_SCAN *qmgr_incoming;
+ static QMGR_SCAN *qmgr_deferred;
+ 
++MAPS   *relayhost_map;
++
+ /* qmgr_deferred_run_event - queue manager heartbeat */
+ 
+ static void qmgr_deferred_run_event(int unused_event, char *dummy)
+@@ -431,6 +433,15 @@
+     }
+ }
+ 
++/* qmgr_pre_init - pre-jail initialization */
++
++static void qmgr_pre_init(char *unused_name, char **unused_argv)
++{
++    relayhost_map = *var_relayhost_map ?
++	maps_create("relayhosts", var_relayhost_map, DICT_FLAG_LOCK) :
++	0;
++}
++
+ /* qmgr_post_init - post-jail initialization */
+ 
+ static void qmgr_post_init(char *unused_name, char **unused_argv)
+@@ -511,6 +522,7 @@
+ 			MAIL_SERVER_STR_TABLE, str_table,
+ 			MAIL_SERVER_BOOL_TABLE, bool_table,
+ 			MAIL_SERVER_TIME_TABLE, time_table,
++			MAIL_SERVER_PRE_INIT, qmgr_pre_init,
+ 			MAIL_SERVER_POST_INIT, qmgr_post_init,
+ 			MAIL_SERVER_LOOP, qmgr_loop,
+ 			MAIL_SERVER_PRE_ACCEPT, pre_accept,
+diff -bru postfix-2.0.18/src/qmgr/qmgr.h postfix-2.0.18-sender_relay/src/qmgr/qmgr.h
+--- postfix-2.0.18/src/qmgr/qmgr.h	2002-12-08 02:19:01.000000000 +0100
++++ postfix-2.0.18-sender_relay/src/qmgr/qmgr.h	2004-02-04 18:13:33.000000000 +0100
+@@ -15,6 +15,11 @@
+ #include <scan_dir.h>
+ 
+  /*
++  * Global library.
++  */
++#include <maps.h>
++
++ /*
+   * The queue manager is built around lots of mutually-referring structures.
+   * These typedefs save some typing.
+   */
+@@ -307,6 +312,11 @@
+ extern void qmgr_scan_request(QMGR_SCAN *, int);
+ extern char *qmgr_scan_next(QMGR_SCAN *);
+ 
++ /*
++  * qmgr.c
++  */
++extern MAPS *relayhost_map;
++
+ /* LICENSE
+ /* .ad
+ /* .fi
+diff -bru postfix-2.0.18/src/qmgr/qmgr_message.c postfix-2.0.18-sender_relay/src/qmgr/qmgr_message.c
+--- postfix-2.0.18/src/qmgr/qmgr_message.c	2003-04-11 15:19:51.000000000 +0200
++++ postfix-2.0.18-sender_relay/src/qmgr/qmgr_message.c	2004-02-05 00:20:01.000000000 +0100
+@@ -569,6 +569,20 @@
+ 	}
+ 
+ 	/*
++	 * Selected the proper server on basis of the sender's adress,
++	 * if a smarthost was resolved as next hop.
++	 */
++	if (relayhost_map && (reply.flags & RESOLVE_CLASS_SMARTHOST)) {
++	    const char * smarthost;
++
++	    if (smarthost = maps_find(relayhost_map, message->sender, 0)) {
++		msg_info("using smart host %s for sender %s",
++			 smarthost, message->sender);
++		vstring_strcpy(reply.nexthop, smarthost);
++	    }
++        }
++
++	/*
+ 	 * XXX The nexthop destination is also used as lookup key for the
+ 	 * per-destination queue. Fold the nexthop to lower case so that we
+ 	 * don't have multiple queues for the same site.
+diff -bru postfix-2.0.18/src/trivial-rewrite/resolve.c postfix-2.0.18-sender_relay/src/trivial-rewrite/resolve.c
+--- postfix-2.0.18/src/trivial-rewrite/resolve.c	2003-01-12 00:52:41.000000000 +0100
++++ postfix-2.0.18-sender_relay/src/trivial-rewrite/resolve.c	2004-02-04 18:28:25.000000000 +0100
+@@ -459,12 +459,14 @@
+ 	    /*
+ 	     * With off-host delivery, relayhost overrides recipient domain.
+ 	     */
+-	    if (*var_relayhost)
++            if (*var_relayhost) {
+ 		vstring_strcpy(nexthop, var_relayhost);
+-	    else
++                *flags |= RESOLVE_CLASS_SMARTHOST;
++            } else {
+ 		vstring_strcpy(nexthop, rcpt_domain);
+ 	}
+     }
++    }
+ 
+     /*
+      * Local delivery.


Property changes on: tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.18-sender_relay.patch
___________________________________________________________________
Name: svn:executable
   + *

Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-02 16:26:10 UTC (rev 5797)
+++ tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-02 17:48:12 UTC (rev 5798)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
 Version: 2.0.20
-Release: 3ts
+Release: 4gd
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz
@@ -20,6 +20,7 @@
 Source7: postfix-script
 Source8: postfix-sasl
 Source9: postfix-pam
+Source10: README.sender_auth+sender_relay
 Patch0: http://www.ipnet6.org/postfix/download/tls+ipv6-1.21-pf-2.0.18.patch.gz
 Patch1: postfix-1.1.2-contrib.patch
 # Not applied, provided by source1
@@ -38,6 +39,8 @@
 Patch15: postfix-2.0.13-sasl-postfix.patch
 Patch16: postfix-2.0.19-sql-libs.patch
 Patch17: postfix-2.0.20-vda.patch
+Patch18: postfix-2.0.15-sender_auth.patch
+Patch19: postfix-2.0.18-sender_relay.patch
 URL: http://www.postfix.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %service_requires
@@ -123,6 +126,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1 -b .vda~
+%patch18 -p1
+%patch19 -p1
 
 
 %build
@@ -477,6 +482,10 @@
 
 
 %changelog
+* Wed Feb 02 2005 Gerald Dachs <gda at tinysofa dot org> 2.0.20-4gd
+- Sender based SASL-authentification and sender based relaying 
+  (patch18 and patch19)
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 2.0.20-3ts
 - current (2.0.20-3jh) integrated as 2.0.20-3ts for release 1.1-U3
 


From svn at tinysofa.org  Wed Feb  2 19:33:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 14:33:59 -0500 (EST)
Subject: [tinysofa-svn] r5802 - tinysofa/releases/1.2/postfix/current/specs
Message-ID: <20050202193359.B39343443AA@minbar.tinysofa.org>

Author: gda
Date: 2005-02-02 14:33:52 -0500 (Wed, 02 Feb 2005)
New Revision: 5802

Modified:
   tinysofa/releases/1.2/postfix/current/specs/postfix.spec
Log:
included README

Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-02 19:28:47 UTC (rev 5801)
+++ tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-02 19:33:52 UTC (rev 5802)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
 Version: 2.0.20
-Release: 4gd
+Release: 5gd
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz
@@ -343,6 +343,7 @@
 %doc RELEASE_NOTES-* README_FILES/*
 %doc postfix-contrib
 %doc tls
+%doc %{SOURCE10}
 
 %dir %attr(755,root,root) %{_sysconfdir}/postfix
 %config(noreplace) %verify(not mtime size md5) %attr(644,root,root) %{_sysconfdir}/postfix/access
@@ -482,6 +483,10 @@
 
 
 %changelog
+* Wed Feb 02 2005 Gerald Dachs <gda at tinysofa dot org> 2.0.20-5gd
+- included README for Sender based SASL-authentification and sender
+  based relaying
+
 * Wed Feb 02 2005 Gerald Dachs <gda at tinysofa dot org> 2.0.20-4gd
 - Sender based SASL-authentification and sender based relaying 
   (patch18 and patch19)


From svn at tinysofa.org  Wed Feb  2 19:28:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 14:28:57 -0500 (EST)
Subject: [tinysofa-svn] 
	r5801 - in tinysofa/releases/1.2/anaconda/current: sources specs
Message-ID: <20050202192857.9DEAB34427A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 14:28:47 -0500 (Wed, 02 Feb 2005)
New Revision: 5801

Added:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-grsecurity.patch
Modified:
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- initial grsecurity patch


Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-grsecurity.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-grsecurity.patch	2005-02-02 17:56:21 UTC (rev 5800)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-grsecurity.patch	2005-02-02 19:28:47 UTC (rev 5801)
@@ -0,0 +1,165 @@
+diff -urN anaconda-9.1/dispatch.py anaconda-9.1.grsec/dispatch.py
+--- anaconda-9.1/dispatch.py	2005-02-02 13:53:38.000000000 +0200
++++ anaconda-9.1.grsec/dispatch.py	2005-02-02 14:50:34.000000000 +0200
+@@ -38,6 +38,7 @@
+ from network import networkDeviceCheck
+ from installmethod import doMethodComplete
+ from sshd import enableSshd
++from grsecurity import disableGrsecurity
+ 
+ from rhpl.log import log
+ 
+@@ -138,6 +139,8 @@
+                                     "id.grpset", "instPath", "id.bootloader")),
+     ("sshd", ("dispatch", "id.grpset")),
+     ("enablesshd", enableSshd, ("intf", "instPath")),
++    ("grsecurity", ("dispatch", "id.grpset")),
++    ("disablegrsecurity", disableGrsecurity, ("intf", "instPath")),
+ #    ("videocard", ("dispatch", "id.xsetup", "id.videocard", "intf")),
+ #    ("monitor", ("id.xsetup", "id.monitor")),
+ #    ("xcustom", ("id.xsetup", "id.monitor", "id.videocard",
+diff -urN anaconda-9.1/grsecurity.py anaconda-9.1.grsec/grsecurity.py
+--- anaconda-9.1/grsecurity.py	1970-01-01 02:00:00.000000000 +0200
++++ anaconda-9.1.grsec/grsecurity.py	2005-02-02 14:49:19.000000000 +0200
+@@ -0,0 +1,43 @@
++#
++# grsecurity.py - grsecurity configuration
++#
++# Jaakko Heinonen <jh at tinysofa dot org>
++#
++# Copyright 2005 Jaakko Heinonen & Omar Kilani
++#
++# This software may be freely redistributed under the terms of the GNU
++# library public license.
++#
++# You should have received a copy of the GNU Library Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++#
++
++import isys
++import errno
++import iutil
++import re
++import os
++import rpm
++import kudzu
++from constants import *
++from rhpl.log import log
++from flags import flags
++from rhpl.translate import _, N_
++
++def disableGrsecurity (intf, instPath):
++    if flags.test:
++	return DISPATCH_NOOP
++
++    rc = iutil.execWithRedirect("/sbin/chkconfig",
++				[ "/sbin/chkconfig",
++				  "grsec",
++				  "off"
++				],
++				stdout = '/dev/tty5', stderr = '/dev/tty5',
++				searchPath = 1, root = instPath)
++
++    if rc:
++        intf.messageWindow( _("Error"),
++		    _("An error occured while disabling grsecurity."))
++	return DISPATCH_BACK
+diff -urN anaconda-9.1/installclass.py anaconda-9.1.grsec/installclass.py
+--- anaconda-9.1/installclass.py	2005-02-02 13:53:38.000000000 +0200
++++ anaconda-9.1.grsec/installclass.py	2005-02-02 14:53:28.000000000 +0200
+@@ -157,6 +157,7 @@
+ #		 "writexconfig",
+ 		 "writeksconfig",
+ 		 "sshd",
++		 "grsecurity",
+                  "methodcomplete",
+ 		 "complete"
+ 		)
+@@ -218,6 +219,12 @@
+     def setSshd(self, state):
+ 	self.sshd = state
+ 
++    def getGrsecurity(self):
++	return self.grsecurity
++
++    def setGrsecurity(self, state):
++	self.grsecurity = state
++
+     def setZeroMbr(self, id, zeroMbr):
+         id.partitions.zeroMbr = zeroMbr
+ 
+diff -urN anaconda-9.1/kickstart.py anaconda-9.1.grsec/kickstart.py
+--- anaconda-9.1/kickstart.py	2005-02-02 13:53:38.000000000 +0200
++++ anaconda-9.1.grsec/kickstart.py	2005-02-02 14:51:02.000000000 +0200
+@@ -1166,10 +1166,12 @@
+             dispatch.skipStep("fdisk")
+             dispatch.skipStep("autopartition")
+             dispatch.skipStep("sshd")
++            dispatch.skipStep("grsecurity")
+             dispatch.skipStep("bootdisk")            
+             return
+         
+         dispatch.skipStep("sshd")
++        dispatch.skipStep("grsecurity")
+ 	dispatch.skipStep("bootdisk")
+         dispatch.skipStep("welcome")
+         dispatch.skipStep("betanag")
+diff -urN anaconda-9.1/text.py anaconda-9.1.grsec/text.py
+--- anaconda-9.1/text.py	2005-02-02 13:53:38.000000000 +0200
++++ anaconda-9.1.grsec/text.py	2005-02-02 14:48:11.000000000 +0200
+@@ -73,6 +73,7 @@
+     "install" : ("progress_text", "setupForInstall"),
+     "bootdisk" : ("bootdisk_text", ("BootDiskWindow")),
+     "sshd" : ("sshd_text", "SshdWindow"),
++    "grsecurity" : ("grsecurity_text", "GrsecurityWindow"),
+     "complete" : ("complete_text", "FinishedWindow"),
+ }
+ 
+diff -urN anaconda-9.1/textw/grsecurity_text.py anaconda-9.1.grsec/textw/grsecurity_text.py
+--- anaconda-9.1/textw/grsecurity_text.py	1970-01-01 02:00:00.000000000 +0200
++++ anaconda-9.1.grsec/textw/grsecurity_text.py	2005-02-02 14:44:49.000000000 +0200
+@@ -0,0 +1,43 @@
++#
++# grsecurity_text.py: text mode grsecurity service configuration
++#
++# Jaakko Heinonen <jh at tinysofa dot org>
++#
++# Copyright 2005 Jaakko Heinonen & Omar Kilani
++#
++# This software may be freely redistributed under the terms of the GNU
++# library public license.
++#
++# You should have received a copy of the GNU Library Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++#
++
++import iutil
++from rhpl.translate import _, N_
++from snack import *
++from constants_text import *
++from constants import *
++
++
++class GrsecurityWindow:
++    def __call__(self, screen, disp, grpset):
++	if not grpset.hdrlist.has_key('grsecurity') or (grpset.hdrlist.has_key('grsecurity') and not grpset.hdrlist['grsecurity'].isSelected()):
++		disp.skipStep("disablegrsecurity")
++		return INSTALL_OK
++	
++	buttons = [ _("Yes"), _("No") ]
++	text =  _("Grsecurity role based access control provides finer-grained"
++			"security controls.\n\n"
++		  "Would you like to enable the Grsecurity RBAC?")
++
++	rc = ButtonChoiceWindow(screen, _("Grsecurity configuration"), text,
++                                buttons=buttons,
++				help="grsecurityquery")
++
++	if rc == string.lower (_("No")):
++	    disp.skipStep("disablegrsecurity", skip=0)
++	else:
++	    disp.skipStep("disablegrsecurity")
++
++	return INSTALL_OK

Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-02 17:56:21 UTC (rev 5800)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-02 19:28:47 UTC (rev 5801)
@@ -32,6 +32,7 @@
 Patch15: anaconda-9.1-isys.patch
 Patch16: anaconda-9.1-modprobe.conf.patch
 Patch17: anaconda-9.1-mdadm.patch
+Patch18: anaconda-9.1-grsecurity.patch
 # booty patches
 Patch100: booty-0.38-tinysofa.patch
 Patch101: booty-0.38-tinysofa-splash.patch
@@ -92,6 +93,7 @@
 %patch15 -p1 -b .isys~
 %patch16 -p1 -b .modprobe.conf~
 %patch17 -p1 -b .mdadm~
+%patch18 -p1
 
 # rhpl and booty use originally python 2.3
 # anaconda uses orginally python 2.2


From svn at tinysofa.org  Thu Feb  3 02:42:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 21:42:15 -0500 (EST)
Subject: [tinysofa-svn] 
	r5807 - in tinysofa/releases/1.2/dump/current: sources specs
Message-ID: <20050203024215.F1317344413@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 21:41:59 -0500 (Wed, 02 Feb 2005)
New Revision: 5807

Added:
   tinysofa/releases/1.2/dump/current/sources/dump-0.4b39-ea.patch.bz2
   tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.bz2
Removed:
   tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.gz
Modified:
   tinysofa/releases/1.2/dump/current/specs/dump.spec
Log:
- new package with acl support


Added: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39-ea.patch.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39-ea.patch.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/dump/current/sources/dump-0.4b39.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/dump/current/specs/dump.spec
===================================================================
--- tinysofa/releases/1.2/dump/current/specs/dump.spec	2005-02-03 02:01:23 UTC (rev 5806)
+++ tinysofa/releases/1.2/dump/current/specs/dump.spec	2005-02-03 02:41:59 UTC (rev 5807)
@@ -1,72 +1,79 @@
-Summary: Programs for backing up and restoring filesystems.
+%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.4b39
-Release: 1jh
+Release: 2jh
 License: BSD
 Group: main
-Source: http://download.sourceforge.net/dump/dump-%{version}.tar.gz
+URL: http://dump.sourceforge.net
+Source: dump-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2
+BuildRequires: libtermcap-devel, zlib-devel
+BuildRequires: ncurses-devel bzip2-devel
+Patch0: dump-%{version}-ea.patch.bz2
+# 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}-%{version}-root
 
 %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: main
+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 -p1 -b .ea
 
-
 %build
-%configure --with-binmode=0755 \
-	--with-manowner=root \
-	--with-mangrp=root \
-	--with-manmode=0644 \
-	--enable-rmt
+%configure %{myoptions} --enable-rmt --enable-qfa
+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
 %{__mkdir_p} \
-	%{buildroot}/sbin \
+	%{buildroot}%{_sbindir} \
 	%{buildroot}%{_mandir}/man8
 
-make install \
-	SBINDIR=%{buildroot}/sbin \
-	MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man8 \
+%makeinstall \
+	SBINDIR=%{buildroot}%{_sbindir} \
+	BINDIR=%{buildroot}%{_sbindir} \
+	MANDIR=%{buildroot}%{_mandir}/man8 \
 	BINOWNER=$(id -un) \
 	BINGRP=$(id -gn) \
 	MANOWNER=$(id -un) \
 	MANGRP=$(id -gn)
 
-{ cd %{buildroot}
-  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 restore .%{_sbindir}/rrestore
+  chmod ug-s .%{_sbindir}/rmt
+  mkdir -p .%{_sysconfdir}
+  > .%{_sysconfdir}/dumpdates
+  ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt
+  strip .%{_sbindir}/*
+popd
 
 
 %clean
@@ -75,79 +82,261 @@
 
 %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
-/sbin/rdump
-%attr(0755,root,tty)	/sbin/restore
-/sbin/rrestore
-%{_mandir}/man8/dump.8*
-%{_mandir}/man8/rdump.8*
-%{_mandir}/man8/restore.8*
-%{_mandir}/man8/rrestore.8*
+%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)	%{_sbindir}/dump
+%{_sbindir}/rdump
+%attr(0755,root,root)	%{_sbindir}/restore
+%{_sbindir}/rrestore
+%{_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
-* Fri Jan 21 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.4b39-1jh
-- 0.4b39
+* Mon Jan 24 2005 Jindrich Novy <jnovy at redhat.com. 0.4b39-1
+- Updated to dump 0.4b39
+- Updated the experimental patch.
 
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 0.4b36-2ts
-- current (0.4b36-2jh) integrated as 0.4b36-2ts for release 1.1
+* Wed Jan 12 2005 Jindrich Novy <jnovy at redhat.com> 0.4b38-1
+- Updated to dump 0.4b38 (#144840)
+- Updated the experimental dump patch.
+- Dropped the cvs patch, applied in the upstream release.
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.4b36-1ts
-- current (0.4b36-1ok) integrated as 0.4b36-1ts for release 1.0-U1
+* Mon Dec 20 2004 Dan Walsh <dwalsh at redhat.com> 0.4b37-3
+- Updated experimental dump patch from upstream to allow dump/restore of xattr.
 
-* Sat May 15 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- fix non-root build
+* Thu Dec 9 2004 Dan Walsh <dwalsh at redhat.com> 0.4b37-2
+- Added experimental dump patch from upstream to allow dump/restore of xattr.
 
-* Thu May 13 2004 Omar Kilani <omar at tinysofa dot org> 0.4b36-1ok
-- New Upstream.
+* Thu Jul 29 2004 Warren Togami <wtogami at redhat.com>
+- 0.4b37
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 0.4b34-3tr
-- Big rebuild
+* Fri Jul 02 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- 0.4b36
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.4b34-2tr
-- Big rebuild
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri May 16 2003 Tore Olsen <toreo at trustix dot com> 0.4b34-1to
-- New upstream version
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.4b31-1em
-- Rebuilt against glibc 2.3.2.
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Aug 13 2002 Christian H. Toldnes <christht at trustix dot com> 0.4b31-1ct
-- New upstream version
-- .spec cleanup
+* Sat May 17 2003 Mike A. Harris <mharris at redhat.com> 0.4b33-1
+- Updated to dump 0.4b33, fixes (#89835)
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 0.4b22-2dm
-- rebuild for Trustix Secure Linux 2.0
+* Fri Jan 24 2003 Mike A. Harris <mharris at redhat.com> 0.4b28-7
+- Added --enable-qfa to configure macro for RFE: (#77608)
 
-* Fri Jun  1 2001 Oystein Viggen <oysteivi at trustix dot com>
-- New upstream version
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 0.4b28-6
+- rebuilt
 
-* Mon Mar  5 2001 Alexander Reelsen <ar at trustix dot com>
-- Picked up 0.4b21
-- Bigfile patch is now upstream
+* Mon Oct  7 2002 Mike A. Harris <mharris at redhat.com> 0.4b28-5
+- All-arch rebuild
 
-* Fri Nov  3 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Removed (sg)uid bits on dump.
-- Added RH's bigfile patch.
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Fri Sep 15 2000 Oystein Viggen <oysteivi at trustix dot com>
-- 4b19 - latest and greatest
+* Sun May 26 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Tue Jan 25 2000 Tore Olsen <toreo at trustix dot com>
-- moved /usr/man to /usr/share/man for FHS compliance
+* Tue May 21 2002 Mike A. Harris <mharris at redhat.com> 0.4b28-2
+- Updated to dump 0.4b28
+- Removed atomic_read/write patch, not needed anymore
 
-* Fri Sep 24 1999 Jeff Johnson <jbj at redhat.com>
-- bump the dump version release to match e2fs hack.
+* Fri Mar  1 2002 Mike A. Harris <mharris at redhat.com> 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
 
+* Thu Feb 28 2002 Mike A. Harris <mharris at redhat.com> 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.
+
+* Tue Feb 26 2002 Mike A. Harris <mharris at redhat.com> 0.4b27-1
+- Updated to dump 0.4b27-1
+
+* Fri Feb 22 2002 Mike A. Harris <mharris at redhat.com> 0.4b25-5
+- Bumped release up a couple notches to rebuild in rawhide
+ 
+* Thu Feb 21 2002 Mike A. Harris <mharris at redhat.com> 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 <mharris at redhat.com> 0.4b25-3
+- Added missing zlib buildprereq
+- Rebuild in new environment
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Nov 21 2001 Mike A. Harris <mharris at redhat.com> 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 <mharris at redhat.com> 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 <teg at redhat.com> 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 <teg at redhat.com> 0.4b22-5
+- Move non-static binaries to /usr/sbin (#49520)
+
+* Fri Jun 29 2001 Mike A. Harris <mharris at redhat.com> 0.4b22-4
+- Added BuildPrereq: readline-devel (#44734 - which was reopened and changed)
+
+* Sat Jun 16 2001 Mike A. Harris <mharris at redhat.com> 0.4b22-3
+- Added BuildPrereq: libtermcap-devel (#44734)
+
+* Tue Jun 12 2001 Mike A. Harris <mharris at redhat.com> 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 <Florian.LaRoche at redhat.de> 0.4b22-1
+- 0.4b22
+
+* Mon May  7 2001 Mike A. Harris <mharris at redhat.com> 0.4b21-5
+- Added BuildPrereq: e2fsprogs-devel (#27428)
+
+* Mon Apr  9 2001 Bill Nottingham <notting at redhat.com>
+- fix ia64
+
+* Wed Feb 14 2001 Bill Nottingham <notting at redhat.com>
+- fix build with current glibc
+
+* Mon Jan 29 2001 Nalin Dahyabhai <nalin at redhat.com>
+- change copyright: UCB to License: BSD
+
+* Fri Jan 26 2001 Nalin Dahyabhai <nalin at redhat.com>
+- update to 0.4b21.
+
+* Sun Nov 26 2000 Jeff Johnson <jbj at redhat.com>
+- update to 0.4b20.
+
+* Fri Nov 10 2000 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b20 released, first packaging.
+
+* Tue Oct 31 2000 Jeff Johnson <jbj at redhat.com>
+- remove setuid bits for Red Hat 5.x errata.
+
+* Wed Aug 30 2000 Matt Wilson <msw at redhat.com>
+- rebuild to cope with glibc locale binary incompatibility, again
+
+* Wed Aug 30 2000 Preston Brown <pbrown at redhat.com>
+- fix for dumping files between 2 and 4 gigs (#16466)
+
+* Mon Aug 21 2000 Matt Wilson <msw at redhat.com>
+- don't use -O2 on alpha because of compiler ICE
+
+* Sun Aug 20 2000 Jeff Johnson <jbj at redhat.com>
+- update to 0.4b19.
+
+* Thu Aug 17 2000 Jeff Johnson <jbj at redhat.com>
+- summaries from specspo.
+
+* Wed Aug 16 2000 Erik Troan <ewt at redhat.com>
+- support LABEL= in fstab
+
+* Sat Jul 22 2000 Bill Nottingham <notting at redhat.com>
+- if dump/restore aren't set(u|g)id, they don't need group tty (#12670)
+
+* Wed Jul 19 2000 Jakub Jelinek <jakub at redhat.com>
+- rebuild to cope with glibc locale binary incompatibility
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Tue Jun 27 2000 Preston Brown <pbrown at redhat.com>
+- 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 <pbrown at redhat.com>
+- dropped SUID bits
+
+* Tue Jun  6 2000 Jeff Johnson <jbj at redhat.com>
+- update to 0.4b17.
+- FHS packaging.
+
+* Thu Jun  1 2000 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b17 released, first packaging.
+
+* Sat Mar 11 2000 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b16 released, first packaging.
+
+* Tue Mar  7 2000 Jeff Johnson <jbj at redhat.com>
+- use posix signal handling to preserve dump functionality with libc5.
+
+* Thu Mar  2 2000 Bill Nottingham <notting at redhat.com>
+- update to 0.4b15
+
+* Thu Feb 10 2000 Jeff Johnson <jbj at redhat.com>
+- dump -0ufB /dev/ftape 1638000 /mnt2 fails to use /mnt2 as tape device (#8036)
+
+* Thu Feb 10 2000 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b14 released, first packaging.
+
+* Wed Feb  9 2000 Jeff Johnson <jbj at redhat.com>
+- compress man pages.
+
+* Thu Jan 27 2000 Jeff Johnson <jbj at redhat.com>
+- update to 0.4b13.
+
+* Fri Jan 21 2000 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b13 released, first packaging.
+
+* Mon Jan 10 2000 Jeff Johnson <jbj at redhat.com.
+- update to 0.4b12.
+
+* Fri Jan 8 2000 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b12 released, first packaging.
+
+* Sun Dec 5 1999 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b11 released, first packaging.
+
+* Sat Nov 27 1999 Jeff Johnson <jbj at redhat.com>
+- intergrate Stelian's fixes (Thanks!).
+
+* Sun Nov 21 1999 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b10 released, first packaging.
+
+* Thu Nov 11 1999 Stelian Pop <pop at cybercable.fr>
+- make static versions also for rescue purposes.
+
+* Wed Nov 5 1999 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b9 released, first packaging.
+
+* Wed Nov 3 1999 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b8 released, first packaging.
+
+* Thu Oct 8 1999 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b7 released, first packaging.
+
+* Thu Sep 30 1999 Stelian Pop <pop at cybercable.fr>
+- dump 0.4b6 released, first packaging.
+
 * Fri Sep 10 1999 Jeff Johnson <jbj at redhat.com>
 - recompile with e2fsprogs = 1.15 (#4962).
 
@@ -210,4 +399,4 @@
 - Added endian cleanups for SPARC
 
 * Fri Feb 07 1997 Michael K. Johnson <johnsonm at redhat.com> 
-- Made /etc/dumpdates writeable by group disk
+- Made /etc/dumpdates writeable by group disk.


From svn at tinysofa.org  Thu Feb  3 02:42:37 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 21:42:37 -0500 (EST)
Subject: [tinysofa-svn] r5808 - tinysofa/releases/1.2/dump/current/specs
Message-ID: <20050203024237.818BB344413@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 21:42:31 -0500 (Wed, 02 Feb 2005)
New Revision: 5808

Modified:
   tinysofa/releases/1.2/dump/current/specs/dump.spec
Log:
- fix rmt group


Modified: tinysofa/releases/1.2/dump/current/specs/dump.spec
===================================================================
--- tinysofa/releases/1.2/dump/current/specs/dump.spec	2005-02-03 02:41:59 UTC (rev 5807)
+++ tinysofa/releases/1.2/dump/current/specs/dump.spec	2005-02-03 02:42:31 UTC (rev 5808)
@@ -34,7 +34,7 @@
 
 %package -n rmt
 Summary: Provides certain programs with access to remote tape devices.
-Group: Applications/Archiving
+Group: main
 
 %description -n rmt
 The rmt utility provides remote access to tape devices for programs


From svn at tinysofa.org  Thu Feb  3 02:01:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Feb 2005 21:01:29 -0500 (EST)
Subject: [tinysofa-svn] r5806 - contrib/1.1/perl-dbd-mysql/current/specs
Message-ID: <20050203020129.767CF34440C@minbar.tinysofa.org>

Author: jh
Date: 2005-02-02 21:01:23 -0500 (Wed, 02 Feb 2005)
New Revision: 5806

Modified:
   contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec
Log:
- disable test (running mysql needed)


Modified: contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec
===================================================================
--- contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec	2005-02-02 20:32:12 UTC (rev 5805)
+++ contrib/1.1/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec	2005-02-03 02:01:23 UTC (rev 5806)
@@ -24,7 +24,7 @@
 %build
 %{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
 %{__make} OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} test
+#%{__make} test
 
 
 %install


From svn at tinysofa.org  Thu Feb  3 05:13:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 00:13:47 -0500 (EST)
Subject: [tinysofa-svn] 
	r5809 - in tinysofa/releases/1.2/tar/current: sources specs
Message-ID: <20050203051347.1C21D344423@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 00:13:27 -0500 (Thu, 03 Feb 2005)
New Revision: 5809

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.002.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002-timeh.patch
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002.tar.gz
Removed:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- 1.02.002

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.002.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.002.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002-timeh.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002-timeh.patch	2005-02-03 02:42:31 UTC (rev 5808)
+++ tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002-timeh.patch	2005-02-03 05:13:27 UTC (rev 5809)
@@ -0,0 +1,20 @@
+--- libarchive-1.02.002/archive_read_support_format_iso9660.c.timeh~	2005-01-25 07:19:42.000000000 +0200
++++ libarchive-1.02.002/archive_read_support_format_iso9660.c	2005-02-03 07:09:36.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <time.h>
+ 
+ #include "archive.h"
+ #include "archive_entry.h"
+--- libarchive-1.02.002/archive_read_support_format_zip.c.timeh~	2005-02-03 07:09:52.000000000 +0200
++++ libarchive-1.02.002/archive_read_support_format_zip.c	2005-02-03 07:10:02.000000000 +0200
+@@ -34,6 +34,7 @@
+ #ifdef HAVE_ZLIB_H
+ #include <zlib.h>
+ #endif
++#include <time.h>
+ 
+ #include "archive.h"
+ #include "archive_entry.h"

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.002.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-03 02:42:31 UTC (rev 5808)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-03 05:13:27 UTC (rev 5809)
@@ -1,12 +1,13 @@
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.01.022
+Version: 1.02.002
 Release: 1jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+Patch0: libarchive-1.02.002-timeh.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -23,6 +24,9 @@
 
 %prep
 %setup -q -n bsdtar-%{version} -a 1
+pushd libarchive-%{version}
+%patch0 -p1 -b .timeh~
+popd
 
 
 %build
@@ -57,6 +61,9 @@
 
 
 %changelog
+* Thu Feb  3 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.002-1jh
+- 1.02.002
+
 * Sun Jan  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022
 - new upstream
 - change package name to tar


From svn at tinysofa.org  Thu Feb  3 08:02:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 03:02:11 -0500 (EST)
Subject: [tinysofa-svn] 
	r5810 - in tinysofa/releases/1.2/elinks/current: sources specs
Message-ID: <20050203080211.47BEC3441CA@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 03:01:18 -0500 (Thu, 03 Feb 2005)
New Revision: 5810

Added:
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-pkgconfig.patch
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-utf_8_io-default.patch
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-xterm.patch
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1.tar.bz2
Removed:
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.3-latin1-term.patch
   tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.3.tar.bz2
   tinysofa/releases/1.2/elinks/current/sources/elinks-convert_string.patch
   tinysofa/releases/1.2/elinks/current/sources/elinks-pkgconfig.patch
Modified:
   tinysofa/releases/1.2/elinks/current/specs/elinks.spec
Log:
- 0.10.1

Added: tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-pkgconfig.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-pkgconfig.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-pkgconfig.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -0,0 +1,22 @@
+--- elinks-0.10.1/configure.in.pkgconfig	2005-01-04 14:51:02.000000000 +0100
++++ elinks-0.10.1/configure.in	2005-01-28 18:00:55.964204016 +0100
+@@ -655,6 +655,11 @@
+ if test "$disable_openssl" = yes; then
+ 	cf_result="not used"
+ else
++	if pkg-config openssl ; then
++		CFLAGS="$CFLAGS_X `pkg-config --cflags openssl`"
++		LIBS="$LIBS_X `pkg-config --libs openssl`"
++		cf_result=yes
++	else
+ 	for ssldir in "$openssl_withval" "" /usr /usr/local/openssl \
+ 			 /usr/lib/openssl /usr/local/ssl \
+ 			 /usr/local/www /usr/lib/ssl /usr/local \
+@@ -682,6 +687,7 @@
+ 			fi
+ 		fi
+ 	done
++	fi
+ 
+ 	if test "$cf_result" != yes; then
+ 		if test "$withval" = yes; then

Added: tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-utf_8_io-default.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-utf_8_io-default.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-utf_8_io-default.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -0,0 +1,11 @@
+--- elinks-0.10.1/src/config/options.inc.utf_8_io-default	2005-01-04 01:42:56.000000000 +0100
++++ elinks-0.10.1/src/config/options.inc	2005-01-28 17:54:42.568968720 +0100
+@@ -747,7 +747,7 @@
+ 		"terminal.")),
+ 
+ 	INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
+-		"utf_8_io", 0, 0,
++		"utf_8_io", 0, 1,
+ 		N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
+ 		"only the subset of UTF8 according to terminal codepage is used.")),
+ 

Added: tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-xterm.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-xterm.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1-xterm.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -0,0 +1,13 @@
+--- elinks-0.10.1/src/config/options.c.xterm	2005-01-04 01:50:29.000000000 +0100
++++ elinks-0.10.1/src/config/options.c	2005-01-28 18:32:34.523579120 +0100
+@@ -643,8 +643,9 @@
+ 	get_opt_bool("terminal.linux.m11_hack") = 1;
+ 	get_opt_int("terminal.vt100.type") = 1;
+ 	get_opt_int("terminal.vt110.type") = 1;
+-	get_opt_int("terminal.xterm.type") = 1;
++	get_opt_int("terminal.xterm.type") = 2;
+ 	get_opt_bool("terminal.xterm.underline") = 1;
++	get_opt_int("terminal.xterm.colors") = 1;
+ 	get_opt_int("terminal.xterm-color.type") = 1;
+ 	get_opt_int("terminal.xterm-color.colors") = COLOR_MODE_16;
+ 	get_opt_bool("terminal.xterm-color.underline") = 1;

Added: tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/elinks/current/sources/elinks-0.10.1.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.1-utf_8_io-default.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -1,12 +0,0 @@
-diff -Naur elinks-0.9.1.orig/src/config/options.inc elinks-0.9.1/src/config/options.inc
---- elinks-0.9.1.orig/src/config/options.inc	2004-01-08 23:00:01.000000000 +0100
-+++ elinks-0.9.1/src/config/options.inc	2004-05-27 22:05:57.000000000 +0200
-@@ -850,7 +850,7 @@
- 		"terminal.")),
- 
- 	INIT_OPT_BOOL("terminal._template_", N_("I/O in UTF8"),
--		"utf_8_io", 0, 0,
-+		"utf_8_io", 0, 1,
- 		N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
- 		"only the subset of UTF8 according to terminal codepage is used.")),
- 

Deleted: tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.3-latin1-term.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.3-latin1-term.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.3-latin1-term.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -1,22 +0,0 @@
---- elinks-0.9.3/doc/man/man5/elinks.conf.5.latin1-term	2004-12-02 11:50:05.911564349 +0200
-+++ elinks-0.9.3/doc/man/man5/elinks.conf.5	2004-12-02 11:49:08.327013331 +0200
-@@ -1054,7 +1054,7 @@
- \f3terminal._template_.underline\f2 [0|1]\f1 (default: 0)
- If we should use underline or enhance the color instead.
- .TP
--\f3terminal._template_.charset\f2 <codepage>\f1 (default: 7-bit ASCII)
-+\f3terminal._template_.charset\f2 <codepage>\f1 (default: ISO-8859-1)
- Codepage of charset used for displaying content on terminal.
- .SS User interface (ui)
- User interface options.
---- elinks-0.9.3/src/config/options.inc.latin1-term	2004-05-28 23:20:00.000000000 +0300
-+++ elinks-0.9.3/src/config/options.inc	2004-12-02 11:21:58.411321669 +0200
-@@ -886,7 +886,7 @@
- 		N_("If we should use underline or enhance the color instead.")),
- 
- 	INIT_OPT_CODEPAGE("terminal._template_", N_("Codepage"),
--		"charset", 0, "us-ascii",
-+		"charset", 0, "iso-8859-1",
- 		N_("Codepage of charset used for displaying content on terminal.")),
- 
- 	/* Keep options in alphabetical order. */

Deleted: tinysofa/releases/1.2/elinks/current/sources/elinks-0.9.3.tar.bz2
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.2/elinks/current/sources/elinks-convert_string.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-convert_string.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-convert_string.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -1,147 +0,0 @@
---- elinks-0.9.1/ChangeLog.nsswins	2004-01-22 17:58:27.000000000 +0100
-+++ elinks-0.9.1/ChangeLog	2004-05-14 16:41:55.149581200 +0200
-@@ -0,0 +1,11 @@
-+Fri May 14 17:00:00 2004  Derek Poon <dpoon at ocf.berkeley.edu>:
-+
-+	* intl/charsets.c, intl/charsets.h, document/html/parser.c,
-+	  document/html/renderer.c, document/plain/renderer.c,
-+	  viewer/text/form.c:
-+
-+	Renamed convert_string() function to elinks_convert_string() to
-+	avoid clash with the Samba function of the same name.
-+	(Hostname lookup would fail if "wins" is listed as a name resolution
-+	method in nsswitch.conf.)
-+
---- elinks-0.9.1/src/intl/charsets.c.nsswins	2003-12-29 13:24:31.000000000 +1200
-+++ elinks-0.9.1/src/intl/charsets.c	2004-05-14 16:34:30.484180616 +0200
-@@ -571,8 +571,8 @@
- }
- 
- unsigned char *
--convert_string(struct conv_table *convert_table, unsigned char *chars,
--	       int charslen, enum convert_string_mode mode)
-+elinks_convert_string(struct conv_table *convert_table, unsigned char *chars,
-+	              int charslen, enum convert_string_mode mode)
- {
- 	unsigned char *buffer;
- 	int bufferpos = 0;
---- elinks-0.9.1/src/intl/charsets.h.nsswins	2003-12-29 13:24:31.000000000 +0100
-+++ elinks-0.9.1/src/intl/charsets.h	2004-05-14 16:34:48.078505872 +0200
-@@ -32,7 +32,7 @@
- 
- struct conv_table *get_translation_table(int, int);
- unsigned char *get_entity_string(const unsigned char *, const int, const int);
--unsigned char *convert_string(struct conv_table *, unsigned char *, int, enum convert_string_mode mode);
-+unsigned char *elinks_convert_string(struct conv_table *, unsigned char *, int, enum convert_string_mode mode);
- int get_cp_index(unsigned char *);
- unsigned char *get_cp_name(int);
- unsigned char *get_cp_mime_name(int);
---- elinks-0.9.1/src/document/html/parser.c.nsswins	2004-01-08 22:26:00.000000000 +0100
-+++ elinks-0.9.1/src/document/html/parser.c	2004-05-14 16:35:09.440258392 +0200
-@@ -225,7 +225,7 @@
- 		if (memchr(attr, '&', attrlen)) {
- 			unsigned char *saved_attr = attr;
- 
--			attr = convert_string(NULL, saved_attr, attrlen, CSM_QUERY);
-+			attr = elinks_convert_string(NULL, saved_attr, attrlen, CSM_QUERY);
- 			mem_free(saved_attr);
- 		}
- 
-@@ -1911,7 +1911,7 @@
- 
- 		while (l && WHITECHAR(s[0])) s++, l--;
- 		while (l && WHITECHAR(s[l-1])) l--;
--		q = convert_string(ct, s, l, CSM_DEFAULT);
-+		q = elinks_convert_string(ct, s, l, CSM_DEFAULT);
- 		if (q) add_to_string(&lbl, q), mem_free(q);
- 	}
- 
-@@ -3379,7 +3379,7 @@
- 		unsigned char *alt = get_attr_val(attr, "alt");
- 
- 		if (alt) {
--			label = convert_string(ct, alt, strlen(alt), CSM_DEFAULT);
-+			label = elinks_convert_string(ct, alt, strlen(alt), CSM_DEFAULT);
- 			mem_free(alt);
- 		} else {
- 			label = NULL;
---- elinks-0.9.1/src/document/html/renderer.c.nsswins	2004-01-17 23:30:37.000000000 +0100
-+++ elinks-0.9.1/src/document/html/renderer.c	2004-05-14 16:36:02.347215312 +0200
-@@ -835,7 +835,7 @@
- 	/* XXX: Perhaps doing the whole string at once could be an ugly memory
- 	 * hit? Dunno, someone should measure that. --pasky */
- 
--	buffer = convert_string(convert_table, chars, charslen, CSM_DEFAULT);
-+	buffer = elinks_convert_string(convert_table, chars, charslen, CSM_DEFAULT);
- 	if (buffer) {
- 		if (*buffer) put_chars(part, buffer, strlen(buffer));
- 		mem_free(buffer);
-@@ -1109,9 +1109,10 @@
- 	/* We don't want to recode hidden fields. */
- 	if (fc->type == FC_TEXT || fc->type == FC_PASSWORD ||
- 	    fc->type == FC_TEXTAREA) {
--		unsigned char *dv = convert_string(convert_table,
--						   fc->default_value,
--						   strlen(fc->default_value), CSM_QUERY);
-+		unsigned char *dv = elinks_convert_string(convert_table,
-+							  fc->default_value,
-+							  strlen(fc->default_value),
-+							  CSM_QUERY);
- 
- 		if (dv) {
- 			if (fc->default_value) mem_free(fc->default_value);
-@@ -1491,7 +1492,7 @@
- 					  &document->cp_status,
- 					  document->options.hard_assume);
- 
--	document->title = convert_string(convert_table, title.source, title.length, CSM_DEFAULT);
-+	document->title = elinks_convert_string(convert_table, title.source, title.length, CSM_DEFAULT);
- 	done_string(&title);
- 
- 	part = format_html_part(start, end, par_format.align,
---- elinks-0.9.1/src/document/plain/renderer.c.nsswins	2003-12-29 20:44:49.000000000 +0100
-+++ elinks-0.9.1/src/document/plain/renderer.c	2004-05-14 16:36:09.177177000 +0200
-@@ -154,7 +154,7 @@
- 			line[line_pos] = '.';
- 	}
- 
--	line = convert_string(convert_table, line, width, CSM_NONE);
-+	line = elinks_convert_string(convert_table, line, width, CSM_NONE);
- 	if (!line) return 0;
- 
- 	/* After conversion, line may have a different length. */
---- elinks-0.9.1/src/viewer/text/form.c.nsswins	2004-01-08 04:44:01.000000000 +0100
-+++ elinks-0.9.1/src/viewer/text/form.c	2004-05-14 16:36:38.375738144 +0200
-@@ -497,8 +497,8 @@
- 				if (!convert_table)
- 					convert_table = get_translation_table(cp_from, cp_to);
- 
--				p2 = convert_string(convert_table, p,
--						    strlen(p), CSM_FORM);
-+				p2 = elinks_convert_string(convert_table, p,
-+							   strlen(p), CSM_FORM);
- 				mem_free(p);
- 			}
- 		} else if (sv->type == FC_TEXT ||
-@@ -506,8 +506,8 @@
- 			if (!convert_table)
- 				convert_table = get_translation_table(cp_from, cp_to);
- 
--			p2 = convert_string(convert_table, sv->value,
--					    strlen(sv->value), CSM_FORM);
-+			p2 = elinks_convert_string(convert_table, sv->value,
-+						   strlen(sv->value), CSM_FORM);
- 		} else {
- 			p2 = stracpy(sv->value);
- 		}
-@@ -606,8 +606,8 @@
- 					convert_table = get_translation_table(cp_from,
- 									      cp_to);
- 
--				p = convert_string(convert_table, sv->value,
--						   strlen(sv->value), CSM_FORM);
-+				p = elinks_convert_string(convert_table, sv->value,
-+							  strlen(sv->value), CSM_FORM);
- 				if (p) {
- 					add_to_string(data, p);
- 					mem_free(p);

Deleted: tinysofa/releases/1.2/elinks/current/sources/elinks-pkgconfig.patch
===================================================================
--- tinysofa/releases/1.2/elinks/current/sources/elinks-pkgconfig.patch	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/sources/elinks-pkgconfig.patch	2005-02-03 08:01:18 UTC (rev 5810)
@@ -1,22 +0,0 @@
---- elinks-0.9.1/configure.in.pkgconfig	2004-01-22 16:57:34.000000000 +0000
-+++ elinks-0.9.1/configure.in	2004-03-11 17:15:45.000000000 +0000
-@@ -584,6 +584,11 @@
- 		openssl_withval=""
- 	fi
- 
-+	if pkg-config openssl ; then
-+		CFLAGS="$CFLAGS_X `pkg-config --cflags openssl`"
-+		LIBS="$LIBS_X `pkg-config --libs openssl`"
-+		cf_result=yes
-+	else
- 	for ssldir in "$openssl_withval" "" /usr /usr/local/openssl \
- 			 /usr/lib/openssl /usr/local/ssl \
- 			 /usr/local/www /usr/lib/ssl /usr/local \
-@@ -611,6 +616,7 @@
- 			fi
- 		fi
- 	done
-+	fi
- 
- 	if test "$cf_result" != yes; then
- 		if test "$withval" = yes; then

Modified: tinysofa/releases/1.2/elinks/current/specs/elinks.spec
===================================================================
--- tinysofa/releases/1.2/elinks/current/specs/elinks.spec	2005-02-03 05:13:27 UTC (rev 5809)
+++ tinysofa/releases/1.2/elinks/current/specs/elinks.spec	2005-02-03 08:01:18 UTC (rev 5810)
@@ -1,21 +1,18 @@
 Name: elinks
 Summary: A text-mode Web browser.
-Version: 0.9.3
-Release: 2ts
+Version: 0.10.1
+Release: 1jh
 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2
 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2
 Patch0: elinks-noegd.patch
-Patch1: elinks-0.9.1-utf_8_io-default.patch
-Patch2: elinks-pkgconfig.patch
-Patch3: elinks-convert_string.patch
-Patch4: elinks-0.4.2-getaddrinfo.patch
-Patch5: elinks-sysname.patch
-Patch6: elinks-stdin.patch
-Patch7: elinks-0.9.2-xterm.patch
-Patch8: elinks-0.9.3-latin1-term.patch
+Patch1: elinks-0.10.1-utf_8_io-default.patch
+Patch2: elinks-0.10.1-pkgconfig.patch
+Patch3: elinks-0.4.2-getaddrinfo.patch
+Patch4: elinks-sysname.patch
+Patch5: elinks-0.10.1-xterm.patch
 Group: main
 URL: http://elinks.or.cz/
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, openssl-devel, pkgconfig, perl
 BuildRequires: expat-devel, zlib-devel, bzip2-devel
 License: GPL
@@ -42,23 +39,15 @@
 
 %patch2 -p1 -b .pkgconfig
 
-# Avoid symbol clash (bug #131170).
-%patch3 -p1 -b .convert_string
-
 # Make getaddrinfo call use AI_ADDRCONFIG.
-%patch4 -p1 -b .getaddrinfo
+%patch3 -p1 -b .getaddrinfo
 
 # Don't put so much information in the user-agent header string (bug #97273).
-%patch5 -p1 -b .sysname
+%patch4 -p1 -b .sysname
 
-# Fix elinks -dump -stdin (bug #127624).
-%patch6 -p1 -b .stdin
-
 # Fix xterm terminal: "Linux" driver seems better than "VT100" (#128105)
-%patch7 -p1 -b .xterm
+%patch5 -p1 -b .xterm
 
-%patch8 -p1 -b .latin1-term
-
 aclocal
 automake -a
 autoconf
@@ -95,6 +84,9 @@
 
 
 %changelog
+* Thu Feb  3 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.10.1-1jh
+- 0.10.1
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 0.9.3-2ts
 - current (0.9.3-2jh) integrated as 0.9.3-2ts for release 1.1-U3
 


From svn at tinysofa.org  Thu Feb  3 14:01:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 09:01:15 -0500 (EST)
Subject: [tinysofa-svn] 
	r5811 - tinysofa/releases/1.2/cyrus-sasl/current/specs
Message-ID: <20050203140115.7B3243443DF@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 09:01:09 -0500 (Thu, 03 Feb 2005)
New Revision: 5811

Modified:
   tinysofa/releases/1.2/cyrus-sasl/current/specs/cyrus-sasl.spec
Log:
- move *.la files to actual plugin packages because sasl use them to to check
  plugin availability (if you have installed devel, but not all plugins, it
  complains about the missing plugin files in syslog)


Modified: tinysofa/releases/1.2/cyrus-sasl/current/specs/cyrus-sasl.spec
===================================================================
--- tinysofa/releases/1.2/cyrus-sasl/current/specs/cyrus-sasl.spec	2005-02-03 08:01:18 UTC (rev 5810)
+++ tinysofa/releases/1.2/cyrus-sasl/current/specs/cyrus-sasl.spec	2005-02-03 14:01:09 UTC (rev 5811)
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 2.1.20
-Release: 1ts
+Release: 2gd
 License: Distributable
 Group: main
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -179,7 +179,9 @@
 %config(noreplace) %attr(640,root,sasldb)%{_sysconfdir}/sasl/sasldb
 %dir /var/run/saslauthd/
 %{_plugindir2}/*anonymous*.so*
+%{_plugindir2}/libanonymous.la
 %{_plugindir2}/*sasldb*.so*
+%{_plugindir2}/libsasldb.la
 %{_mandir}/man8/*
 %exclude %{_mandir}/cat8
 %{_sbindir}/saslauthd
@@ -194,20 +196,26 @@
 %files plain
 %defattr(-,root,root)
 %{_plugindir2}/*plain*.so*
+%{_plugindir2}/libplain.la
 %{_plugindir2}/*login*.so*
+%{_plugindir2}/liblogin.la
 
 %files md5
 %defattr(-,root,root)
 %{_plugindir2}/*crammd5*.so*
+%{_plugindir2}/libcrammd5.la
 %{_plugindir2}/*digestmd5*.so*
+%{_plugindir2}/libdigestmd5.la
 
 %files sql
 %defattr(-,root,root)
 %{_plugindir2}/*sql*.so*
+%{_plugindir2}/libsql.la
 
 %files otp
 %defattr(-,root,root)
 %{_plugindir2}/*otp*.so*
+%{_plugindir2}/libotp.la
 
 %files devel
 %defattr(-,root,root)
@@ -218,11 +226,15 @@
 %{_libdir}/libsasl*.*a
 %{_libdir}/libsasl*.*so
 %{_plugindir2}/*.a
-%{_plugindir2}/*.la
 %{_mandir}/man3/*
 
 
 %changelog
+* Thu Feb 03 2005 Gerald Dachs <gda at tinysofa dot org> 2.1.20-2gd
+- move *.la files to actual plugin packages because sasl use them to to check
+  plugin availability (if you have installed devel, but not all plugins, it
+  complains about the missing plugin files in syslog)
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 2.1.20-1ts
 - current (2.1.20-1jh) integrated as 2.1.20-1ts for release 1.1-U3
 


From svn at tinysofa.org  Thu Feb  3 14:35:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 09:35:35 -0500 (EST)
Subject: [tinysofa-svn] r5812 - tinysofa/releases/1.2
Message-ID: <20050203143535.7EFD33443DB@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 09:35:31 -0500 (Thu, 03 Feb 2005)
New Revision: 5812

Removed:
   tinysofa/releases/1.2/tar/
Log:
- remove



From svn at tinysofa.org  Thu Feb  3 14:36:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 09:36:17 -0500 (EST)
Subject: [tinysofa-svn] r5813 - tinysofa/releases/1.2
Message-ID: <20050203143617.C3A0F3443DB@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 09:36:12 -0500 (Thu, 03 Feb 2005)
New Revision: 5813

Added:
   tinysofa/releases/1.2/tar/
Log:
- revert to revision 5808


Copied: tinysofa/releases/1.2/tar (from rev 5808, tinysofa/releases/1.2/tar)


From svn at tinysofa.org  Thu Feb  3 15:10:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 10:10:26 -0500 (EST)
Subject: [tinysofa-svn] r5814 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050203151026.AE8CE3443DB@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 10:10:20 -0500 (Thu, 03 Feb 2005)
New Revision: 5814

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
- php4 -> php


Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-03 14:36:12 UTC (rev 5813)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-03 15:10:20 UTC (rev 5814)
@@ -53,7 +53,6 @@
       <packagereq type="mandatory">mdadm</packagereq>
       <packagereq type="mandatory">mkinitrd</packagereq>
       <packagereq type="mandatory">mktemp</packagereq>
-      <packagereq type="mandatory">modutils</packagereq>
       <packagereq type="mandatory">module-init-tools</packagereq>
       <packagereq type="mandatory">mount</packagereq>
       <packagereq type="mandatory">net-tools</packagereq>
@@ -66,7 +65,7 @@
       <packagereq type="mandatory">procps</packagereq>
       <packagereq type="mandatory">psacct</packagereq>
       <packagereq type="mandatory">psmisc</packagereq>
-      <packagereq type="mandatory">pump</packagereq>
+      <packagereq type="mandatory">dhcp-client</packagereq>
       <packagereq type="mandatory">readline</packagereq>
       <packagereq type="mandatory">release</packagereq>
       <packagereq type="mandatory">rootfiles</packagereq>
@@ -569,16 +568,16 @@
       <packagereq type="mandatory">httpd</packagereq>
       <packagereq type="mandatory">apr</packagereq>
       <packagereq type="mandatory">apr-util</packagereq>
-      <packagereq type="optional">php4</packagereq>
-      <packagereq type="optional">php4-pear</packagereq>
-      <packagereq type="optional">php4-gd</packagereq>
-      <packagereq type="optional">php4-imap</packagereq>
-      <packagereq type="optional">php4-ldap</packagereq>
-      <packagereq type="optional">php4-mbstring</packagereq>
-      <packagereq type="optional">php4-mysql</packagereq>
-      <packagereq type="optional">php4-ncurses</packagereq>
-      <packagereq type="optional">php4-pgsql</packagereq>
-      <packagereq type="optional">php4-xmlrpc</packagereq>
+      <packagereq type="optional">php</packagereq>
+      <packagereq type="optional">php-pear</packagereq>
+      <packagereq type="optional">php-gd</packagereq>
+      <packagereq type="optional">php-imap</packagereq>
+      <packagereq type="optional">php-ldap</packagereq>
+      <packagereq type="optional">php-mbstring</packagereq>
+      <packagereq type="optional">php-mysql</packagereq>
+      <packagereq type="optional">php-ncurses</packagereq>
+      <packagereq type="optional">php-pgsql</packagereq>
+      <packagereq type="optional">php-xmlrpc</packagereq>
     </packagelist>
   </group>
 


From svn at tinysofa.org  Thu Feb  3 20:54:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Feb 2005 15:54:26 -0500 (EST)
Subject: [tinysofa-svn] r5815 - tinysofa/releases/1.2/php/current/specs
Message-ID: <20050203205426.0CE4D3443E7@minbar.tinysofa.org>

Author: jh
Date: 2005-02-03 15:54:21 -0500 (Thu, 03 Feb 2005)
New Revision: 5815

Modified:
   tinysofa/releases/1.2/php/current/specs/php.spec
Log:
- prereq httpd for httpd user


Modified: tinysofa/releases/1.2/php/current/specs/php.spec
===================================================================
--- tinysofa/releases/1.2/php/current/specs/php.spec	2005-02-03 15:10:20 UTC (rev 5814)
+++ tinysofa/releases/1.2/php/current/specs/php.spec	2005-02-03 20:54:21 UTC (rev 5815)
@@ -52,7 +52,7 @@
 BuildRequires: bzip2, fileutils, file >= 4.0, perl, libtool >= 1.4.3
 Obsoletes: php-dbg, mod_php, php3, phpfi, stronghold-php, php-openssl
 # Enforce Apache module ABI compatibility
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+PreReq: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 Requires: php-pear, file >= 4.0
 Conflicts: php >= 5.0.0
 Obsoletes: php < 5.0.0
@@ -597,7 +597,7 @@
 %dir %{_libdir}/php
 %dir %{_libdir}/php/modules
 %dir %{_localstatedir}/lib/php
-%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
+%attr(0770,root,httpd) %dir %{_localstatedir}/lib/php/session
 %{_libdir}/httpd/modules/libphp5.so
 %config %{_sysconfdir}/httpd/conf.d/php.conf
 %dir %{_sysconfdir}/php.d


From svn at tinysofa.org  Fri Feb  4 05:24:41 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 00:24:41 -0500 (EST)
Subject: [tinysofa-svn] 
	r5816 - in tinysofa/releases/1.2/grsecurity/current: sources specs
Message-ID: <20050204052441.89AA4344420@minbar.tinysofa.org>

Author: jh
Date: 2005-02-04 00:24:32 -0500 (Fri, 04 Feb 2005)
New Revision: 5816

Modified:
   tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.0.1-dummypw.patch
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- change dummypw patch to use /dev/urandom if /dev/random doesn't have
  enough entropy


Modified: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.0.1-dummypw.patch
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.0.1-dummypw.patch	2005-02-03 20:54:21 UTC (rev 5815)
+++ tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.0.1-dummypw.patch	2005-02-04 05:24:32 UTC (rev 5816)
@@ -1,6 +1,5 @@
-diff -urN gradm2/gradm_arg.c gradm2.jh/gradm_arg.c
---- gradm2/gradm_arg.c	2004-12-28 17:21:32.030693961 +0200
-+++ gradm2.jh/gradm_arg.c	2004-12-28 17:48:59.971880072 +0200
+--- gradm2/gradm_arg.c.dummypw	2005-01-13 00:38:54.000000000 +0200
++++ gradm2/gradm_arg.c	2005-02-04 07:19:41.000000000 +0200
 @@ -144,7 +144,7 @@
  	struct gr_pw_entry entry;
  	struct gr_arg_wrapper *grarg;
@@ -10,7 +9,7 @@
  	const struct option long_opts[] = {
  		{"help", 0, NULL, 'h'},
  		{"version", 0, NULL, 'v'},
-@@ -298,6 +298,26 @@
+@@ -300,6 +300,33 @@
  			memset(&entry, 0, sizeof (struct gr_pw_entry));
  			exit(EXIT_SUCCESS);
  			break;
@@ -22,8 +21,15 @@
 +					failure("open");
 +				}
 +				if (read(fd, entry.passwd, GR_PW_LEN) != GR_PW_LEN) {
-+					fprintf(stderr, "Unable to read from /dev/random\n");
-+					failure("read");
++					close(fd);
++					if ((fd = open("/dev/urandom", O_RDONLY)) < 0) {
++						fprintf(stderr,"Unable to open /dev/urandom for reading.\n");
++						failure("open");
++					}
++					if (read(fd, entry.passwd, GR_PW_LEN) != GR_PW_LEN) {
++						fprintf(stderr, "Unable to read from /dev/urandom\n");
++						failure("read");
++					}
 +				}
 +				entry.passwd[GR_PW_LEN - 1] = '\0';
 +			}

Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-03 20:54:21 UTC (rev 5815)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-04 05:24:32 UTC (rev 5816)
@@ -2,7 +2,7 @@
 Summary: grsecurity user space utilities and policies
 Name: grsecurity
 Version: 2.1.1
-Release: 1jh
+Release: 2jh
 Source0: gradm-2.1.1-200501222316.tar.gz
 Source1: grsec.init
 Source2: policies-%{policies_date}.tar
@@ -109,6 +109,10 @@
 
 
 %changelog
+* Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.1.1-2jh
+- change dummypw patch to use /dev/urandom if /dev/random doesn't have
+  enough entropy
+
 * Wed Jan 26 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - handle rpmnew files in %%post
 


From svn at tinysofa.org  Fri Feb  4 11:06:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 06:06:55 -0500 (EST)
Subject: [tinysofa-svn] r5817 - tinysofa/releases/1.1
Message-ID: <20050204110655.A30B734443C@minbar.tinysofa.org>

Author: jh
Date: 2005-02-04 06:06:46 -0500 (Fri, 04 Feb 2005)
New Revision: 5817

Added:
   tinysofa/releases/1.1/grub/
Log:
- copy grub to 1.1


Copied: tinysofa/releases/1.1/grub (from rev 5816, tinysofa/releases/1.2/grub)


From svn at tinysofa.org  Fri Feb  4 11:13:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 06:13:07 -0500 (EST)
Subject: [tinysofa-svn] r5818 - tinysofa/releases/1.1/grub/current/specs
Message-ID: <20050204111307.736B034443C@minbar.tinysofa.org>

Author: jh
Date: 2005-02-04 06:13:01 -0500 (Fri, 04 Feb 2005)
New Revision: 5818

Modified:
   tinysofa/releases/1.1/grub/current/specs/grub.spec
Log:
- fix grub configuration for tcs 1.1

Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec
===================================================================
--- tinysofa/releases/1.1/grub/current/specs/grub.spec	2005-02-04 11:06:46 UTC (rev 5817)
+++ tinysofa/releases/1.1/grub/current/specs/grub.spec	2005-02-04 11:13:01 UTC (rev 5818)
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.95
-Release: 3jh
+Release: 4jh
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: main
 License: GPL
@@ -103,9 +103,9 @@
 %patch503 -p1 -b .i2o
 %patch504 -p1 -b .moreraid
 
-%patch800 -p1 -b .odirect
+###%patch800 -p1 -b .odirect
 
-%patch1000 -p1 -b .26geom
+###%patch1000 -p1 -b .26geom
 
 
 %build
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.95-4jh
+- fix grub configuration for tcs 1.1
+
 * Wed Jan  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.95-3jh
 - add RAID1 patches
 


From svn at tinysofa.org  Fri Feb  4 18:45:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 13:45:42 -0500 (EST)
Subject: [tinysofa-svn] 
	r5819 - in tinysofa/releases/1.2/tar/current: sources specs
Message-ID: <20050204184542.16029344455@minbar.tinysofa.org>

Author: jh
Date: 2005-02-04 13:45:31 -0500 (Fri, 04 Feb 2005)
New Revision: 5819

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- don't print warning if setlocale returns NULL


Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch	2005-02-04 11:13:01 UTC (rev 5818)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch	2005-02-04 18:45:31 UTC (rev 5819)
@@ -0,0 +1,12 @@
+--- bsdtar-1.01.022/bsdtar.c.orig	2005-02-04 20:42:18.000000000 +0200
++++ bsdtar-1.01.022/bsdtar.c	2005-02-04 20:42:54.000000000 +0200
+@@ -191,7 +191,9 @@
+ 	option_o = 0;
+ 
+ 	if (setlocale(LC_ALL, "") == NULL)
++#if 0
+ 		bsdtar_warnc(bsdtar, 0, "Failed to set default locale");
++#endif
+ #if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
+ 	bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
+ #endif

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-04 11:13:01 UTC (rev 5818)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-04 18:45:31 UTC (rev 5819)
@@ -2,11 +2,12 @@
 Name: tar
 Epoch: 1
 Version: 1.01.022
-Release: 1jh
+Release: 2jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+Patch0: bsdtar-1.01.022-setlocale.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q -n bsdtar-%{version} -a 1
+%patch0 -p1 -b .setlocale~
 
 
 %build
@@ -57,7 +59,10 @@
 
 
 %changelog
-* Sun Jan  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022
+* Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-2jh
+- don't print warning if setlocale returns NULL
+
+* Sun Jan  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-1jh
 - new upstream
 - change package name to tar
 - provide bsdtar


From svn at tinysofa.org  Fri Feb  4 20:34:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 15:34:21 -0500 (EST)
Subject: [tinysofa-svn] 
	r5820 - in tinysofa/releases/1.2: . drbd drbd/current
	drbd/current/sources drbd/current/specs
Message-ID: <20050204203421.54C25344459@minbar.tinysofa.org>

Author: jh
Date: 2005-02-04 15:34:05 -0500 (Fri, 04 Feb 2005)
New Revision: 5820

Added:
   tinysofa/releases/1.2/drbd/
   tinysofa/releases/1.2/drbd/current/
   tinysofa/releases/1.2/drbd/current/sources/
   tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.0-tinysofa-service-default.patch
   tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.10.tar.gz
   tinysofa/releases/1.2/drbd/current/specs/
   tinysofa/releases/1.2/drbd/current/specs/drbd.spec
   tinysofa/releases/1.2/drbd/pristine/
   tinysofa/releases/1.2/drbd/releases/
Log:
- add drbd package


Added: tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.0-tinysofa-service-default.patch
===================================================================
--- tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.0-tinysofa-service-default.patch	2005-02-04 18:45:31 UTC (rev 5819)
+++ tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.0-tinysofa-service-default.patch	2005-02-04 20:34:05 UTC (rev 5820)
@@ -0,0 +1,11 @@
+diff -urN drbd-0.7.0/scripts/drbd drbd-0.7.0.tinysofa-service-default/scripts/drbd
+--- drbd-0.7.0/scripts/drbd	2004-07-15 22:57:27.000000000 +1000
++++ drbd-0.7.0.tinysofa-service-default/scripts/drbd	2004-07-22 18:34:02.992980944 +1000
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ #
+-# chkconfig: 345 70 8
++# chkconfig: - 70 8
+ # description: Loads and unloads the drbd module
+ #
+ # complete rewrite from scratch by Philipp Reisner in March and April 2001

Added: tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.10.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/drbd/current/sources/drbd-0.7.10.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.2/drbd/current/specs/drbd.spec
===================================================================
--- tinysofa/releases/1.2/drbd/current/specs/drbd.spec	2005-02-04 18:45:31 UTC (rev 5819)
+++ tinysofa/releases/1.2/drbd/current/specs/drbd.spec	2005-02-04 20:34:05 UTC (rev 5820)
@@ -0,0 +1,107 @@
+Name: drbd
+Summary: Distributed Redundant Block Device driver for Linux
+Version: 0.7.10
+Release: 1jh
+Group: main
+License: GPL
+Source:	%{name}-%{version}.tar.gz
+Patch0: drbd-0.7.0-tinysofa-service-default.patch
+URL: http://www.drbd.org/
+ExclusiveOS: Linux
+BuildRoot:%{_tmppath}/%{name}-%{version}-root
+Requires: kernel-drbd = %{version}
+Requires: /sbin/service
+PreReq: /sbin/chkconfig
+BuildRequires: flex bison
+
+%description
+Drbd is a distributed replicated block device. It mirrors a block device over
+the network to another machine. Think of it as networked raid 1. It is a
+building block for setting up high availability (HA) clusters.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .tinysofa-service-default~
+
+
+%build
+%make tools doc PREFIX=%{buildroot}/ MANDIR=%{_mandir}
+
+
+%install
+%{__make} install-tools PREFIX=%{buildroot}/ MANDIR=%{_mandir}
+
+%{__install} -m 644 scripts/drbd.conf %{buildroot}%{_sysconfdir}
+
+# remove unpackaged files
+%{__rm} -fr -- \
+	%{buildroot}%{_mandir}/{ja,pt_BR} \
+	%{buildroot}/etc/ha.d
+
+# drbd device files
+for i in `seq 0 15` ; do
+	echo "%%attr(0660, root, disk) %%dev(b, 147, $i) /dev/drbd$i" \
+		>> manifest
+done
+
+
+%files -f manifest
+%defattr(755,root,root,755)
+/sbin/drbdsetup
+/sbin/drbdadm
+%{_initrddir}/drbd
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/drbd.conf
+
+%defattr(-,root,root)
+%{_mandir}/man8/*
+%{_mandir}/man5/*
+%doc scripts/drbd.conf scripts/drbddisk
+%doc ChangeLog
+%doc README
+%doc documentation/NFS-Server-README.txt
+
+
+%post
+/sbin/chkconfig --add drbd
+
+%preun
+if [ $1 = 0 ]; then
+	/sbin/service drbd stop > /dev/null 2>&1
+	/sbin/chkconfig --del drbd
+fi
+
+
+%changelog
+* Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.7.10-1jh
+- userspace only
+- include Omar's init script patches from enterprise
+
+* Tue Dec 21 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.7.7-1jh
+- 0.7.7
+- tinysofa
+- create drbd devices
+
+* Thu Mar 19 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 0.6.11-7jh
+- don't restart the service after upgrade
+
+* Thu Mar 18 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 0.6.11-6jh
+- fixed manual page removal
+
+* Mon Mar 15 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 0.6.11-5jh
+- install an example configuration file
+- changed group to follow current policy
+
+* Tue Mar 09 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 0.6.11-4jh
+- disabled stack protector on TSL 2.1 for kernel module
+- corrected packages inter-dependencies
+
+* Mon Mar 01 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 0.6.11-3jh
+- spec file cleanups
+
+* Wed Feb 25 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net> 0.6.11-2jh
+- added PreReqs
+- spec file cleanups
+
+* Tue Feb 24 2004 Jaakko Heinonen <jheinonen at users.sourceforge.net>
+- first TSL version


From svn at tinysofa.org  Sat Feb  5 00:04:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 19:04:21 -0500 (EST)
Subject: [tinysofa-svn] 
	r5821 - in tinysofa/releases/1.2/perl/current: sources specs
Message-ID: <20050205000421.9DBEB34445F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-04 19:04:11 -0500 (Fri, 04 Feb 2005)
New Revision: 5821

Removed:
   tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch
   tinysofa/releases/1.2/perl/current/sources/perl-5.8.5.tar.bz2
Modified:
   tinysofa/releases/1.2/perl/current/specs/perl.spec
Log:
new upstream

Deleted: tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch
===================================================================
--- tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch	2005-02-04 20:34:05 UTC (rev 5820)
+++ tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2004-0452.patch	2005-02-05 00:04:11 UTC (rev 5821)
@@ -1,251 +0,0 @@
-diff -ur perl-5.8.5.orig/ext/DB_File/DB_File.pm perl-5.8.5/ext/DB_File/DB_File.pm
---- perl-5.8.5.orig/ext/DB_File/DB_File.pm	2004-06-23 14:46:20.000000000 +0000
-+++ perl-5.8.5/ext/DB_File/DB_File.pm	2004-11-04 15:18:37.000000000 +0000
-@@ -1825,7 +1825,7 @@
-     my $filename = "filt" ;
-     unlink $filename ;
- 
--    my $db = tie %hash, 'DB_File', $filename, O_CREAT|O_RDWR, 0666, $DB_HASH 
-+    my $db = tie %hash, 'DB_File', $filename, O_CREAT|O_RDWR, 0644, $DB_HASH 
-       or die "Cannot open $filename: $!\n" ;
- 
-     # Install DBM Filters
-diff -ur perl-5.8.5.orig/ext/Devel/PPPort/PPPort.pm perl-5.8.5/ext/Devel/PPPort/PPPort.pm
---- perl-5.8.5.orig/ext/Devel/PPPort/PPPort.pm	2003-12-15 07:56:37.000000000 +0000
-+++ perl-5.8.5/ext/Devel/PPPort/PPPort.pm	2004-11-04 15:21:05.000000000 +0000
-@@ -349,13 +349,13 @@
- 	}
- 	
- 	if ($changes) {
--		open(OUT,">/tmp/ppport.h.$$");
-+		open(OUT,"ppport.h.$$");
- 		print OUT $c;
- 		close(OUT);
--		open(DIFF, "diff -u $filename /tmp/ppport.h.$$|");
--		while (<DIFF>) { s!/tmp/ppport\.h\.$$!$filename.patched!; print STDOUT; }
-+		open(DIFF, "diff -u $filename ppport.h.$$|");
-+		while (<DIFF>) { s!ppport\.h\.$$!$filename.patched!; print STDOUT; }
- 		close(DIFF);
--		unlink("/tmp/ppport.h.$$");
-+		unlink("ppport.h.$$");
- 	} else {
- 		print "Looks OK\n";
- 	}
-diff -ur perl-5.8.5.orig/ext/ODBM_File/ODBM_File.xs perl-5.8.5/ext/ODBM_File/ODBM_File.xs
---- perl-5.8.5.orig/ext/ODBM_File/ODBM_File.xs	2004-02-01 14:01:20.000000000 +0000
-+++ perl-5.8.5/ext/ODBM_File/ODBM_File.xs	2004-11-04 15:22:36.000000000 +0000
-@@ -32,7 +32,7 @@
-  * Set DBM_BUG_DUPLICATE_FREE in the extension hint file.
-  */
- /* Close the previous dbm, and fail to open a new dbm */
--#define dbmclose()	((void) dbminit("/non/exist/ent"))
-+#define dbmclose()	((void) dbminit("/nonexistent"))
- #endif
- 
- #include <fcntl.h>
-diff -ur perl-5.8.5.orig/lib/CGI/Cookie.pm perl-5.8.5/lib/CGI/Cookie.pm
---- perl-5.8.5.orig/lib/CGI/Cookie.pm	2004-03-09 15:13:48.000000000 +0000
-+++ perl-5.8.5/lib/CGI/Cookie.pm	2004-11-04 15:27:13.000000000 +0000
-@@ -407,7 +407,7 @@
- You may also retrieve cookies that were stored in some external
- form using the parse() class method:
- 
--       $COOKIES = `cat /usr/tmp/Cookie_stash`;
-+       $COOKIES = `cat /var/run/www/Cookie_stash`;
-        %cookies = parse CGI::Cookie($COOKIES);
- 
- If you are in a mod_perl environment, you can save some overhead by
-diff -ur perl-5.8.5.orig/lib/CPAN.pm perl-5.8.5/lib/CPAN.pm
---- perl-5.8.5.orig/lib/CPAN.pm	2003-09-22 05:42:59.000000000 +0000
-+++ perl-5.8.5/lib/CPAN.pm	2004-11-04 15:29:04.000000000 +0000
-@@ -2273,7 +2273,7 @@
- # If more accuracy is wanted/needed, Chris Leach sent me this patch...
- 
-  # > *** /install/perl/live/lib/CPAN.pm-	Wed Sep 24 13:08:48 1997
-- # > --- /tmp/cp	Wed Sep 24 13:26:40 1997
-+ # > --- cp	Wed Sep 24 13:26:40 1997
-  # > ***************
-  # > *** 1562,1567 ****
-  # > --- 1562,1580 ----
-diff -ur perl-5.8.5.orig/lib/ExtUtils/MakeMaker.pm perl-5.8.5/lib/ExtUtils/MakeMaker.pm
---- perl-5.8.5.orig/lib/ExtUtils/MakeMaker.pm	2004-01-05 22:34:59.000000000 +0000
-+++ perl-5.8.5/lib/ExtUtils/MakeMaker.pm	2004-11-04 15:30:40.000000000 +0000
-@@ -1013,7 +1013,7 @@
- The Makefile to be produced may be altered by adding arguments of the
- form C<KEY=VALUE>. E.g.
- 
--  perl Makefile.PL PREFIX=/tmp/myperl5
-+  perl Makefile.PL PREFIX=~/myperl5
- 
- Other interesting targets in the generated Makefile are
- 
-@@ -1355,13 +1355,13 @@
- 
- This is the root directory into which the code will be installed.  It
- I<prepends itself to the normal prefix>.  For example, if your code
--would normally go into /usr/local/lib/perl you could set DESTDIR=/tmp/
--and installation would go into /tmp/usr/local/lib/perl.
-+would normally go into /usr/local/lib/perl you could set DESTDIR=/other/
-+and installation would go into /other/usr/local/lib/perl.
- 
- This is primarily of use for people who repackage Perl modules.
- 
- NOTE: Due to the nature of make, it is important that you put the trailing
--slash on your DESTDIR.  "/tmp/" not "/tmp".
-+slash on your DESTDIR.  "/other/" not "/other".
- 
- =item DIR
- 
-diff -ur perl-5.8.5.orig/lib/ExtUtils/instmodsh perl-5.8.5/lib/ExtUtils/instmodsh
---- perl-5.8.5.orig/lib/ExtUtils/instmodsh	2004-01-05 22:34:59.000000000 +0000
-+++ perl-5.8.5/lib/ExtUtils/instmodsh	2004-11-04 15:32:15.000000000 +0000
-@@ -58,16 +58,12 @@
-       $reply =~ /^t\s*/ and do
-          {
-          my $file = (split(' ', $reply))[1];
--         my $tmp = "/tmp/inst.$$";
--         if (my $fh = IO::File->new($tmp, "w"))
--            {
--            $fh->print(join("\n", $Inst->files($module)));
--            $fh->close();
--            system("tar cvf $file -I $tmp");
--            unlink($tmp);
--            last CASE;
--            }
--         else { print("Can't open $file: $!\n"); }
-+         my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1);
-+         $fh->print(join("\n", $Inst->files($module)));
-+         $fh->close();
-+         # This used to use -I which is wrong for GNU tar.
-+         system("tar cvf $file -T $tmp");
-+         unlink($tmp);
-          last CASE;
-          };
-       $reply eq 'v' and do
-diff -ur perl-5.8.5.orig/lib/Memoize/t/tie.t perl-5.8.5/lib/Memoize/t/tie.t
---- perl-5.8.5.orig/lib/Memoize/t/tie.t	2002-07-12 19:56:19.000000000 +0000
-+++ perl-5.8.5/lib/Memoize/t/tie.t	2004-11-04 15:33:17.000000000 +0000
-@@ -29,14 +29,7 @@
-   $_[0]+1;
- }
- 
--if (eval {require File::Spec::Functions}) {
--  File::Spec::Functions->import('tmpdir', 'catfile');
--  $tmpdir = tmpdir();
--} else {
--  *catfile = sub { join '/', @_ };
--  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
--}
--$file = catfile($tmpdir, "md$$");
-+$file = "md$$";
- @files = ($file, "$file.db", "$file.dir", "$file.pag");
- 1 while unlink @files;
- 
-diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_gdbm.t perl-5.8.5/lib/Memoize/t/tie_gdbm.t
---- perl-5.8.5.orig/lib/Memoize/t/tie_gdbm.t	2002-07-12 19:56:19.000000000 +0000
-+++ perl-5.8.5/lib/Memoize/t/tie_gdbm.t	2004-11-04 15:33:53.000000000 +0000
-@@ -26,13 +26,7 @@
- 
- print "1..4\n";
- 
--if (eval {require File::Spec::Functions}) {
-- File::Spec::Functions->import();
--} else {
--  *catfile = sub { join '/', @_ };
--}
--$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
--$file = catfile($tmpdir, "md$$");
-+$file = "md$$";
- 1 while unlink $file, "$file.dir", "$file.pag";
- tryout('GDBM_File', $file, 1);  # Test 1..4
- 1 while unlink $file, "$file.dir", "$file.pag";
-diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_ndbm.t perl-5.8.5/lib/Memoize/t/tie_ndbm.t
---- perl-5.8.5.orig/lib/Memoize/t/tie_ndbm.t	2002-07-12 19:56:19.000000000 +0000
-+++ perl-5.8.5/lib/Memoize/t/tie_ndbm.t	2004-11-04 15:34:21.000000000 +0000
-@@ -29,13 +29,7 @@
- print "1..4\n";
- 
- 
--if (eval {require File::Spec::Functions}) {
-- File::Spec::Functions->import();
--} else {
--  *catfile = sub { join '/', @_ };
--}
--$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
--$file = catfile($tmpdir, "md$$");
-+$file = "md$$";
- 1 while unlink $file, "$file.dir", "$file.pag";
- tryout('Memoize::NDBM_File', $file, 1);  # Test 1..4
- 1 while unlink $file, "$file.dir", "$file.pag";
-diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_sdbm.t perl-5.8.5/lib/Memoize/t/tie_sdbm.t
---- perl-5.8.5.orig/lib/Memoize/t/tie_sdbm.t	2002-07-12 19:56:19.000000000 +0000
-+++ perl-5.8.5/lib/Memoize/t/tie_sdbm.t	2004-11-04 15:35:15.000000000 +0000
-@@ -28,14 +28,7 @@
- 
- print "1..4\n";
- 
--if (eval {require File::Spec::Functions}) {
-- File::Spec::Functions->import('tmpdir', 'catfile');
-- $tmpdir = tmpdir();
--} else {
-- *catfile = sub { join '/', @_ };
--  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
--}
--$file = catfile($tmpdir, "md$$");
-+$file = "md$$";
- 1 while unlink $file, "$file.dir", "$file.pag";
- tryout('Memoize::SDBM_File', $file, 1);  # Test 1..4
- 1 while unlink $file, "$file.dir", "$file.pag";
-diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_storable.t perl-5.8.5/lib/Memoize/t/tie_storable.t
---- perl-5.8.5.orig/lib/Memoize/t/tie_storable.t	2002-07-12 19:56:19.000000000 +0000
-+++ perl-5.8.5/lib/Memoize/t/tie_storable.t	2004-11-04 15:35:39.000000000 +0000
-@@ -34,13 +34,7 @@
- print "1..4\n";
- 
- 
--if (eval {require File::Spec::Functions}) {
-- File::Spec::Functions->import();
--} else {
--  *catfile = sub { join '/', @_ };
--}
--$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
--$file = catfile($tmpdir, "storable$$");
-+$file = "storable$$";
- 1 while unlink $file;
- tryout('Memoize::Storable', $file, 1);  # Test 1..4
- 1 while unlink $file;
-diff -ur perl-5.8.5.orig/lib/Shell.pm perl-5.8.5/lib/Shell.pm
---- perl-5.8.5.orig/lib/Shell.pm	2004-06-23 13:08:56.000000000 +0000
-+++ perl-5.8.5/lib/Shell.pm	2004-11-04 15:36:16.000000000 +0000
-@@ -127,7 +127,7 @@
-    use Shell qw(cat ps cp);
-    $passwd = cat('</etc/passwd');
-    @pslines = ps('-ww'),
--   cp("/etc/passwd", "/tmp/passwd");
-+   cp("/etc/passwd", "/etc/passwd.orig");
- 
-    # object oriented 
-    my $sh = Shell->new;
-diff -ur perl-5.8.5.orig/lib/perl5db.pl perl-5.8.5/lib/perl5db.pl
---- perl-5.8.5.orig/lib/perl5db.pl	2004-05-11 11:11:37.000000000 +0000
-+++ perl-5.8.5/lib/perl5db.pl	2004-11-04 15:38:29.000000000 +0000
-@@ -207,7 +207,7 @@
- =item * noTTY 
- 
- if set, goes in NonStop mode.  On interrupt, if TTY is not set,
--uses the value of noTTY or "/tmp/perldbtty$$" to find TTY using
-+uses the value of noTTY or "/var/run/perldbtty$$" to find TTY using
- Term::Rendezvous.  Current variant is to have the name of TTY in this
- file.
- 
-@@ -5810,8 +5810,8 @@
-             eval "require Term::Rendezvous;" or die;
- 
-             # See if we have anything to pass to Term::Rendezvous.
--            # Use /tmp/perldbtty$$ if not.
--            my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$";
-+            # Use /var/run/perldbtty$$ if not.
-+            my $rv = $ENV{PERLDB_NOTTY} || "/var/run/perldbtty$$";
- 
-             # Rendezvous and get the filehandles.
-             my $term_rv = new Term::Rendezvous $rv;

Deleted: tinysofa/releases/1.2/perl/current/sources/perl-5.8.5.tar.bz2
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-04 20:34:05 UTC (rev 5820)
+++ tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-05 00:04:11 UTC (rev 5821)
@@ -2,9 +2,9 @@
 
 Summary: The Perl programming language.
 Name: perl
-Version: 5.8.5
+Version: 5.8.6
 Epoch: 1
-Release: 4ts
+Release: 1gd
 License: GPL
 Group: main
 Url: http://www.perl.com
@@ -20,7 +20,6 @@
 Patch4: perl-5.8.3-desthtml.patch
 # Configure doesn't listen well when we say no ndbm.
 Patch5: perl-5.8.5-nondbm.patch
-Patch6: perl-5.8.5-CAN-2004-0452.patch
 Patch7: perl-5.8.5-CAN-2004-0976.patch
 
 # arch-specific patches
@@ -97,7 +96,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 
 %patch100 -p1
@@ -442,6 +440,9 @@
 
 
 %changelog
+* Sat Feb 05 2005 Gerald Dachs <gda at tinysofa dot org> 5.8.6-1gd
+- New upstream
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 5.8.5-4ts
 - current (5.8.5-4jh) integrated as 5.8.5-4ts for release 1.1-U3
 


From svn at tinysofa.org  Sat Feb  5 00:14:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Feb 2005 19:14:46 -0500 (EST)
Subject: [tinysofa-svn] r5822 - tinysofa/releases/1.2/perl/current/sources
Message-ID: <20050205001446.961373443E6@minbar.tinysofa.org>

Author: gda
Date: 2005-02-04 19:05:00 -0500 (Fri, 04 Feb 2005)
New Revision: 5822

Added:
   tinysofa/releases/1.2/perl/current/sources/perl-5.8.6.tar.bz2
Log:
new upstream

Added: tinysofa/releases/1.2/perl/current/sources/perl-5.8.6.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/perl/current/sources/perl-5.8.6.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Sat Feb  5 09:09:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 04:09:40 -0500 (EST)
Subject: [tinysofa-svn] r5824 - tinysofa/releases/1.2/ucarp/current/sources
Message-ID: <20050205090940.4E44234445F@minbar.tinysofa.org>

Author: jh
Date: 2005-02-05 04:09:33 -0500 (Sat, 05 Feb 2005)
New Revision: 5824

Modified:
   tinysofa/releases/1.2/ucarp/current/sources/vip-001.conf.example
Log:
- ONBOOT -> ONPARENT


Modified: tinysofa/releases/1.2/ucarp/current/sources/vip-001.conf.example
===================================================================
--- tinysofa/releases/1.2/ucarp/current/sources/vip-001.conf.example	2005-02-05 06:40:04 UTC (rev 5823)
+++ tinysofa/releases/1.2/ucarp/current/sources/vip-001.conf.example	2005-02-05 09:09:33 UTC (rev 5824)
@@ -11,7 +11,7 @@
 
 # Do *NOT* use a main interface for the virtual IP, use an ethX:Y alias
 # with the corresponding /etc/sysconfig/network-scripts/ifcfg-ethX:Y file
-# already configured and with ONBOOT=no
+# already configured and with ONPARENT=no
 VIP_INTERFACE="eth0:0"
 
 # If you have extra options to add, see "ucarp --help" output


From svn at tinysofa.org  Sat Feb  5 11:59:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 06:59:24 -0500 (EST)
Subject: [tinysofa-svn] 
	r5825 - in tinysofa/releases/1.2/perl/current: sources specs
Message-ID: <20050205115924.657DE3443A9@minbar.tinysofa.org>

Author: gda
Date: 2005-02-05 06:59:12 -0500 (Sat, 05 Feb 2005)
New Revision: 5825

Added:
   tinysofa/releases/1.2/perl/current/sources/perl-5.8.6-CAN-2004-0452.patch
Modified:
   tinysofa/releases/1.2/perl/current/specs/perl.spec
Log:
reapplied patch CAN-2004-0452

Added: tinysofa/releases/1.2/perl/current/sources/perl-5.8.6-CAN-2004-0452.patch
===================================================================
--- tinysofa/releases/1.2/perl/current/sources/perl-5.8.6-CAN-2004-0452.patch	2005-02-05 09:09:33 UTC (rev 5824)
+++ tinysofa/releases/1.2/perl/current/sources/perl-5.8.6-CAN-2004-0452.patch	2005-02-05 11:59:12 UTC (rev 5825)
@@ -0,0 +1,229 @@
+diff -ur perl-5.8.5.orig/ext/DB_File/DB_File.pm perl-5.8.5/ext/DB_File/DB_File.pm
+--- perl-5.8.5.orig/ext/DB_File/DB_File.pm	2004-06-23 14:46:20.000000000 +0000
++++ perl-5.8.5/ext/DB_File/DB_File.pm	2004-11-04 15:18:37.000000000 +0000
+@@ -1825,7 +1825,7 @@
+     my $filename = "filt" ;
+     unlink $filename ;
+ 
+-    my $db = tie %hash, 'DB_File', $filename, O_CREAT|O_RDWR, 0666, $DB_HASH 
++    my $db = tie %hash, 'DB_File', $filename, O_CREAT|O_RDWR, 0644, $DB_HASH 
+       or die "Cannot open $filename: $!\n" ;
+ 
+     # Install DBM Filters
+diff -ur perl-5.8.5.orig/ext/ODBM_File/ODBM_File.xs perl-5.8.5/ext/ODBM_File/ODBM_File.xs
+--- perl-5.8.5.orig/ext/ODBM_File/ODBM_File.xs	2004-02-01 14:01:20.000000000 +0000
++++ perl-5.8.5/ext/ODBM_File/ODBM_File.xs	2004-11-04 15:22:36.000000000 +0000
+@@ -32,7 +32,7 @@
+  * Set DBM_BUG_DUPLICATE_FREE in the extension hint file.
+  */
+ /* Close the previous dbm, and fail to open a new dbm */
+-#define dbmclose()	((void) dbminit("/non/exist/ent"))
++#define dbmclose()	((void) dbminit("/nonexistent"))
+ #endif
+ 
+ #include <fcntl.h>
+diff -ur perl-5.8.5.orig/lib/CGI/Cookie.pm perl-5.8.5/lib/CGI/Cookie.pm
+--- perl-5.8.5.orig/lib/CGI/Cookie.pm	2004-03-09 15:13:48.000000000 +0000
++++ perl-5.8.5/lib/CGI/Cookie.pm	2004-11-04 15:27:13.000000000 +0000
+@@ -407,7 +407,7 @@
+ You may also retrieve cookies that were stored in some external
+ form using the parse() class method:
+ 
+-       $COOKIES = `cat /usr/tmp/Cookie_stash`;
++       $COOKIES = `cat /var/run/www/Cookie_stash`;
+        %cookies = parse CGI::Cookie($COOKIES);
+ 
+ If you are in a mod_perl environment, you can save some overhead by
+diff -ur perl-5.8.5.orig/lib/CPAN.pm perl-5.8.5/lib/CPAN.pm
+--- perl-5.8.5.orig/lib/CPAN.pm	2003-09-22 05:42:59.000000000 +0000
++++ perl-5.8.5/lib/CPAN.pm	2004-11-04 15:29:04.000000000 +0000
+@@ -2273,7 +2273,7 @@
+ # If more accuracy is wanted/needed, Chris Leach sent me this patch...
+ 
+  # > *** /install/perl/live/lib/CPAN.pm-	Wed Sep 24 13:08:48 1997
+- # > --- /tmp/cp	Wed Sep 24 13:26:40 1997
++ # > --- cp	Wed Sep 24 13:26:40 1997
+  # > ***************
+  # > *** 1562,1567 ****
+  # > --- 1562,1580 ----
+diff -ur perl-5.8.5.orig/lib/ExtUtils/MakeMaker.pm perl-5.8.5/lib/ExtUtils/MakeMaker.pm
+--- perl-5.8.5.orig/lib/ExtUtils/MakeMaker.pm	2004-01-05 22:34:59.000000000 +0000
++++ perl-5.8.5/lib/ExtUtils/MakeMaker.pm	2004-11-04 15:30:40.000000000 +0000
+@@ -1013,7 +1013,7 @@
+ The Makefile to be produced may be altered by adding arguments of the
+ form C<KEY=VALUE>. E.g.
+ 
+-  perl Makefile.PL PREFIX=/tmp/myperl5
++  perl Makefile.PL PREFIX=~/myperl5
+ 
+ Other interesting targets in the generated Makefile are
+ 
+@@ -1355,13 +1355,13 @@
+ 
+ This is the root directory into which the code will be installed.  It
+ I<prepends itself to the normal prefix>.  For example, if your code
+-would normally go into /usr/local/lib/perl you could set DESTDIR=/tmp/
+-and installation would go into /tmp/usr/local/lib/perl.
++would normally go into /usr/local/lib/perl you could set DESTDIR=/other/
++and installation would go into /other/usr/local/lib/perl.
+ 
+ This is primarily of use for people who repackage Perl modules.
+ 
+ NOTE: Due to the nature of make, it is important that you put the trailing
+-slash on your DESTDIR.  "/tmp/" not "/tmp".
++slash on your DESTDIR.  "/other/" not "/other".
+ 
+ =item DIR
+ 
+diff -ur perl-5.8.5.orig/lib/ExtUtils/instmodsh perl-5.8.5/lib/ExtUtils/instmodsh
+--- perl-5.8.5.orig/lib/ExtUtils/instmodsh	2004-01-05 22:34:59.000000000 +0000
++++ perl-5.8.5/lib/ExtUtils/instmodsh	2004-11-04 15:32:15.000000000 +0000
+@@ -58,16 +58,12 @@
+       $reply =~ /^t\s*/ and do
+          {
+          my $file = (split(' ', $reply))[1];
+-         my $tmp = "/tmp/inst.$$";
+-         if (my $fh = IO::File->new($tmp, "w"))
+-            {
+-            $fh->print(join("\n", $Inst->files($module)));
+-            $fh->close();
+-            system("tar cvf $file -I $tmp");
+-            unlink($tmp);
+-            last CASE;
+-            }
+-         else { print("Can't open $file: $!\n"); }
++         my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1);
++         $fh->print(join("\n", $Inst->files($module)));
++         $fh->close();
++         # This used to use -I which is wrong for GNU tar.
++         system("tar cvf $file -T $tmp");
++         unlink($tmp);
+          last CASE;
+          };
+       $reply eq 'v' and do
+diff -ur perl-5.8.5.orig/lib/Memoize/t/tie.t perl-5.8.5/lib/Memoize/t/tie.t
+--- perl-5.8.5.orig/lib/Memoize/t/tie.t	2002-07-12 19:56:19.000000000 +0000
++++ perl-5.8.5/lib/Memoize/t/tie.t	2004-11-04 15:33:17.000000000 +0000
+@@ -29,14 +29,7 @@
+   $_[0]+1;
+ }
+ 
+-if (eval {require File::Spec::Functions}) {
+-  File::Spec::Functions->import('tmpdir', 'catfile');
+-  $tmpdir = tmpdir();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
+-}
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ @files = ($file, "$file.db", "$file.dir", "$file.pag");
+ 1 while unlink @files;
+ 
+diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_gdbm.t perl-5.8.5/lib/Memoize/t/tie_gdbm.t
+--- perl-5.8.5.orig/lib/Memoize/t/tie_gdbm.t	2002-07-12 19:56:19.000000000 +0000
++++ perl-5.8.5/lib/Memoize/t/tie_gdbm.t	2004-11-04 15:33:53.000000000 +0000
+@@ -26,13 +26,7 @@
+ 
+ print "1..4\n";
+ 
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-}
+-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ 1 while unlink $file, "$file.dir", "$file.pag";
+ tryout('GDBM_File', $file, 1);  # Test 1..4
+ 1 while unlink $file, "$file.dir", "$file.pag";
+diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_ndbm.t perl-5.8.5/lib/Memoize/t/tie_ndbm.t
+--- perl-5.8.5.orig/lib/Memoize/t/tie_ndbm.t	2002-07-12 19:56:19.000000000 +0000
++++ perl-5.8.5/lib/Memoize/t/tie_ndbm.t	2004-11-04 15:34:21.000000000 +0000
+@@ -29,13 +29,7 @@
+ print "1..4\n";
+ 
+ 
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-}
+-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ 1 while unlink $file, "$file.dir", "$file.pag";
+ tryout('Memoize::NDBM_File', $file, 1);  # Test 1..4
+ 1 while unlink $file, "$file.dir", "$file.pag";
+diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_sdbm.t perl-5.8.5/lib/Memoize/t/tie_sdbm.t
+--- perl-5.8.5.orig/lib/Memoize/t/tie_sdbm.t	2002-07-12 19:56:19.000000000 +0000
++++ perl-5.8.5/lib/Memoize/t/tie_sdbm.t	2004-11-04 15:35:15.000000000 +0000
+@@ -28,14 +28,7 @@
+ 
+ print "1..4\n";
+ 
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import('tmpdir', 'catfile');
+- $tmpdir = tmpdir();
+-} else {
+- *catfile = sub { join '/', @_ };
+-  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
+-}
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ 1 while unlink $file, "$file.dir", "$file.pag";
+ tryout('Memoize::SDBM_File', $file, 1);  # Test 1..4
+ 1 while unlink $file, "$file.dir", "$file.pag";
+diff -ur perl-5.8.5.orig/lib/Memoize/t/tie_storable.t perl-5.8.5/lib/Memoize/t/tie_storable.t
+--- perl-5.8.5.orig/lib/Memoize/t/tie_storable.t	2002-07-12 19:56:19.000000000 +0000
++++ perl-5.8.5/lib/Memoize/t/tie_storable.t	2004-11-04 15:35:39.000000000 +0000
+@@ -34,13 +34,7 @@
+ print "1..4\n";
+ 
+ 
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-}
+-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
+-$file = catfile($tmpdir, "storable$$");
++$file = "storable$$";
+ 1 while unlink $file;
+ tryout('Memoize::Storable', $file, 1);  # Test 1..4
+ 1 while unlink $file;
+diff -ur perl-5.8.5.orig/lib/Shell.pm perl-5.8.5/lib/Shell.pm
+--- perl-5.8.5.orig/lib/Shell.pm	2004-06-23 13:08:56.000000000 +0000
++++ perl-5.8.5/lib/Shell.pm	2004-11-04 15:36:16.000000000 +0000
+@@ -127,7 +127,7 @@
+    use Shell qw(cat ps cp);
+    $passwd = cat('</etc/passwd');
+    @pslines = ps('-ww'),
+-   cp("/etc/passwd", "/tmp/passwd");
++   cp("/etc/passwd", "/etc/passwd.orig");
+ 
+    # object oriented 
+    my $sh = Shell->new;
+--- perl-5.8.6/lib/perl5db.pl~	2004-11-17 13:51:18.000000000 +0100
++++ perl-5.8.6/lib/perl5db.pl	2005-02-05 12:45:30.000000000 +0100
+@@ -215,7 +215,7 @@
+ =item * noTTY 
+ 
+ if set, goes in NonStop mode.  On interrupt, if TTY is not set,
+-uses the value of noTTY or F</tmp/perldbtty$$> to find TTY using
++uses the value of noTTY or F</var/run/perldbtty$$> to find TTY using
+ Term::Rendezvous.  Current variant is to have the name of TTY in this
+ file.
+ 
+@@ -6004,8 +6004,8 @@
+             eval "require Term::Rendezvous;" or die;
+ 
+             # See if we have anything to pass to Term::Rendezvous.
+-            # Use /tmp/perldbtty$$ if not.
+-            my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$";
++            # Use /var/run/perldbtty$$ if not.
++            my $rv = $ENV{PERLDB_NOTTY} || "/var/run/perldbtty$$";
+ 
+             # Rendezvous and get the filehandles.
+             my $term_rv = new Term::Rendezvous $rv;

Modified: tinysofa/releases/1.2/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-05 09:09:33 UTC (rev 5824)
+++ tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-05 11:59:12 UTC (rev 5825)
@@ -4,7 +4,7 @@
 Name: perl
 Version: 5.8.6
 Epoch: 1
-Release: 1gd
+Release: 2gd
 License: GPL
 Group: main
 Url: http://www.perl.com
@@ -20,6 +20,7 @@
 Patch4: perl-5.8.3-desthtml.patch
 # Configure doesn't listen well when we say no ndbm.
 Patch5: perl-5.8.5-nondbm.patch
+Patch6: perl-5.8.6-CAN-2004-0452.patch
 Patch7: perl-5.8.5-CAN-2004-0976.patch
 
 # arch-specific patches
@@ -96,6 +97,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 
 %patch100 -p1
@@ -440,6 +442,9 @@
 
 
 %changelog
+* Sat Feb 05 2005 Gerald Dachs <gda at tinysofa dot org> 5.8.6-2gd
+- reapplied patch CAN-2004-0452
+
 * Sat Feb 05 2005 Gerald Dachs <gda at tinysofa dot org> 5.8.6-1gd
 - New upstream
 


From svn at tinysofa.org  Sat Feb  5 12:20:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 07:20:23 -0500 (EST)
Subject: [tinysofa-svn] 
	r5826 - in tinysofa/releases/1.2/grub/current: sources specs
Message-ID: <20050205122023.16F093443A9@minbar.tinysofa.org>

Author: jh
Date: 2005-02-05 07:20:13 -0500 (Sat, 05 Feb 2005)
New Revision: 5826

Added:
   tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch
Removed:
   tinysofa/releases/1.2/grub/current/sources/grub-0.94-geometry-26kernel.patch
Modified:
   tinysofa/releases/1.2/grub/current/specs/grub.spec
Log:
- update the geometry patch

Deleted: tinysofa/releases/1.2/grub/current/sources/grub-0.94-geometry-26kernel.patch
===================================================================
--- tinysofa/releases/1.2/grub/current/sources/grub-0.94-geometry-26kernel.patch	2005-02-05 11:59:12 UTC (rev 5825)
+++ tinysofa/releases/1.2/grub/current/sources/grub-0.94-geometry-26kernel.patch	2005-02-05 12:20:13 UTC (rev 5826)
@@ -1,151 +0,0 @@
---- grub-0.94/lib/device.c.26geom	2004-04-14 14:05:24.786938853 -0400
-+++ grub-0.94/lib/device.c	2004-04-14 14:32:50.768600176 -0400
-@@ -88,6 +88,122 @@
- #include <shared.h>
- #include <device.h>
- 
-+#if defined(__linux__)
-+/* The 2.6 kernel has removed all of the geometry handling for IDE drives
-+ * that did fixups for LBA, etc.  This means that the geometry we get
-+ * with the ioctl has a good chance of being wrong.  So, we get to 
-+ * also know about partition tables and try to read what the geometry
-+ * is there. *grumble*   Very closely based on code from cfdisk
-+ */
-+static void get_kernel_geometry(int fd, int *cyl, int *heads, int *sectors) {
-+    struct hd_geometry hdg;
-+    
-+    if (ioctl (fd, HDIO_GETGEO, &hdg))
-+        return;
-+
-+    *cyl = hdg.cylinders;
-+    *heads = hdg.heads;
-+    *sectors = hdg.sectors;
-+}
-+
-+struct partition {
-+        unsigned char boot_ind;         /* 0x80 - active */
-+        unsigned char head;             /* starting head */
-+        unsigned char sector;           /* starting sector */
-+        unsigned char cyl;              /* starting cylinder */
-+        unsigned char sys_ind;          /* What partition type */
-+        unsigned char end_head;         /* end head */
-+        unsigned char end_sector;       /* end sector */
-+        unsigned char end_cyl;          /* end cylinder */
-+        unsigned char start4[4];        /* starting sector counting from 0 */
-+        unsigned char size4[4];         /* nr of sectors in partition */
-+};
-+
-+#define ALIGNMENT 2
-+typedef union {
-+    struct {
-+	unsigned char align[ALIGNMENT];
-+	unsigned char b[SECTOR_SIZE];
-+    } c;
-+    struct {
-+	unsigned char align[ALIGNMENT];
-+	unsigned char buffer[0x1BE];
-+	struct partition part[4];
-+	unsigned char magicflag[2];
-+    } p;
-+} partition_table;
-+
-+#define PART_TABLE_FLAG0 0x55
-+#define PART_TABLE_FLAG1 0xAA
-+
-+static void
-+get_partition_table_geometry(partition_table *bufp, int *cyl, int *heads, 
-+                             int *sectors) {
-+    struct partition *p;
-+    int i,h,s,hh,ss;
-+    int first = 1;
-+    int bad = 0;
-+
-+    if (bufp->p.magicflag[0] != PART_TABLE_FLAG0 ||
-+	bufp->p.magicflag[1] != PART_TABLE_FLAG1) {
-+	    /* Matthew Wilcox: slightly friendlier version of
-+	       fatal(_("Bad signature on partition table"), 3);
-+	    */
-+            fprintf(stderr, "Unknown partition table signature\n");
-+	    return;
-+    }
-+
-+    hh = ss = 0;
-+    for (i=0; i<4; i++) {
-+	p = &(bufp->p.part[i]);
-+	if (p->sys_ind != 0) {
-+	    h = p->end_head + 1;
-+	    s = (p->end_sector & 077);
-+	    if (first) {
-+		hh = h;
-+		ss = s;
-+		first = 0;
-+	    } else if (hh != h || ss != s)
-+		bad = 1;
-+	}
-+    }
-+
-+    if (!first && !bad) {
-+	*heads = hh;
-+	*sectors = ss;
-+    }
-+}
-+
-+static void get_linux_geometry (int fd, struct geometry *geom) {
-+    int kern_cyl = 0, kern_head = 0, kern_sectors = 0;
-+    int pt_cyl = 0, pt_head = 0, pt_sectors = 0;
-+    partition_table bufp;
-+
-+    get_kernel_geometry(fd, &kern_cyl, &kern_head, &kern_sectors);
-+
-+    if (read(fd, bufp.c.b, SECTOR_SIZE) == SECTOR_SIZE) {
-+        get_partition_table_geometry(&bufp, &pt_cyl, &pt_head, &pt_sectors);
-+    } else {
-+        fprintf(stderr, "Unable to read partition table: %s\n", strerror(errno));
-+    }
-+
-+    if (pt_head && pt_sectors) {
-+        int cyl_size;
-+
-+        geom->heads = pt_head;
-+        geom->sectors = pt_sectors;
-+        cyl_size = pt_head * pt_sectors;
-+        geom->cylinders = geom->total_sectors/cyl_size;
-+    } else {
-+        geom->heads = kern_head;
-+        geom->sectors = kern_sectors;
-+        geom->cylinders = kern_cyl;
-+    }
-+
-+    return;
-+}
-+#endif
-+
- /* Get the geometry of a drive DRIVE.  */
- void
- get_drive_geometry (struct geometry *geom, char **map, int drive)
-@@ -100,20 +216,16 @@
- #if defined(__linux__)
-   /* Linux */
-   {
--    struct hd_geometry hdg;
-     unsigned long nr;
-     
--    if (ioctl (fd, HDIO_GETGEO, &hdg))
--      goto fail;
--
-     if (ioctl (fd, BLKGETSIZE, &nr))
-       goto fail;
--    
--    /* Got the geometry, so save it. */
--    geom->cylinders = hdg.cylinders;
--    geom->heads = hdg.heads;
--    geom->sectors = hdg.sectors;
-+
-     geom->total_sectors = nr;
-+    get_linux_geometry(fd, geom);
-+
-+    if (!geom->heads && !geom->cylinders && !geom->sectors)
-+        goto fail;
-     
-     close (fd);
-     return;

Added: tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch
===================================================================
--- tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch	2005-02-05 11:59:12 UTC (rev 5825)
+++ tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch	2005-02-05 12:20:13 UTC (rev 5826)
@@ -0,0 +1,229 @@
+--- grub-0.95/lib/device.c.26geom	2004-11-30 16:33:00.186025728 -0500
++++ grub-0.95/lib/device.c	2004-11-30 16:45:09.073218032 -0500
+@@ -131,6 +131,152 @@
+ #include <shared.h>
+ #include <device.h>
+ 
++#if defined(__linux__)
++/* The 2.6 kernel has removed all of the geometry handling for IDE drives
++ * that did fixups for LBA, etc.  This means that the geometry we get
++ * with the ioctl has a good chance of being wrong.  So, we get to 
++ * also know about partition tables and try to read what the geometry
++ * is there. *grumble*   Very closely based on code from cfdisk
++ */
++static void get_kernel_geometry(int fd, long long *cyl, int *heads, int *sectors) {
++    struct hd_geometry hdg;
++    
++    if (ioctl (fd, HDIO_GETGEO, &hdg))
++        return;
++
++    *cyl = hdg.cylinders;
++    *heads = hdg.heads;
++    *sectors = hdg.sectors;
++}
++
++struct partition {
++        unsigned char boot_ind;         /* 0x80 - active */
++        unsigned char head;             /* starting head */
++        unsigned char sector;           /* starting sector */
++        unsigned char cyl;              /* starting cylinder */
++        unsigned char sys_ind;          /* What partition type */
++        unsigned char end_head;         /* end head */
++        unsigned char end_sector;       /* end sector */
++        unsigned char end_cyl;          /* end cylinder */
++        unsigned char start4[4];        /* starting sector counting from 0 */
++        unsigned char size4[4];         /* nr of sectors in partition */
++};
++
++#define ALIGNMENT 2
++typedef union {
++    struct {
++	unsigned char align[ALIGNMENT];
++	unsigned char b[SECTOR_SIZE];
++    } c;
++    struct {
++	unsigned char align[ALIGNMENT];
++	unsigned char buffer[0x1BE];
++	struct partition part[4];
++	unsigned char magicflag[2];
++    } p;
++} partition_table;
++
++#define PART_TABLE_FLAG0 0x55
++#define PART_TABLE_FLAG1 0xAA
++
++static void
++get_partition_table_geometry(partition_table *bufp, long long *cyl, int *heads, 
++                             int *sectors) {
++    struct partition *p;
++    int i,h,s,hh,ss;
++    int first = 1;
++    int bad = 0;
++
++    if (bufp->p.magicflag[0] != PART_TABLE_FLAG0 ||
++	bufp->p.magicflag[1] != PART_TABLE_FLAG1) {
++	    /* Matthew Wilcox: slightly friendlier version of
++	       fatal(_("Bad signature on partition table"), 3);
++	    */
++            fprintf(stderr, "Unknown partition table signature\n");
++	    return;
++    }
++
++    hh = ss = 0;
++    for (i=0; i<4; i++) {
++	p = &(bufp->p.part[i]);
++	if (p->sys_ind != 0) {
++	    h = p->end_head + 1;
++	    s = (p->end_sector & 077);
++	    if (first) {
++		hh = h;
++		ss = s;
++		first = 0;
++	    } else if (hh != h || ss != s)
++		bad = 1;
++	}
++    }
++
++    if (!first && !bad) {
++	*heads = hh;
++	*sectors = ss;
++    }
++}
++
++static long long my_lseek (unsigned int fd, long long offset, 
++                           unsigned int origin)
++{
++#if defined(__linux__) && (!defined(__GLIBC__) || \
++        ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))))
++  /* Maybe libc doesn't have large file support.  */
++  loff_t offset, result;
++  static int _llseek (uint filedes, ulong hi, ulong lo,
++                      loff_t *res, uint wh);
++  _syscall5 (int, _llseek, uint, filedes, ulong, hi, ulong, lo,
++             loff_t *, res, uint, wh);
++  
++  if (_llseek (fd, offset >> 32, offset & 0xffffffff, &result, SEEK_SET) < 0)
++    return (long long) -1;
++  return result;
++#else
++  return lseek(fd, offset, SEEK_SET);
++#endif
++}
++
++static void get_linux_geometry (int fd, struct geometry *geom) {
++    long long kern_cyl = 0; int kern_head = 0, kern_sectors = 0;
++    long long pt_cyl = 0; int pt_head = 0, pt_sectors = 0;
++    partition_table bufp;
++    char *buff, *buf_unaligned;
++
++    buf_unaligned = malloc(sizeof(partition_table) + 4095);
++    buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++                     (~(4096-1)));
++
++    get_kernel_geometry(fd, &kern_cyl, &kern_head, &kern_sectors);
++
++    if (my_lseek (fd, 0*SECTOR_SIZE, SEEK_SET) < 0) {
++        fprintf(stderr, "Unable to seek");
++    }
++
++    if (read(fd, buff, SECTOR_SIZE) == SECTOR_SIZE) {
++        memcpy(bufp.c.b, buff, SECTOR_SIZE);
++        get_partition_table_geometry(&bufp, &pt_cyl, &pt_head, &pt_sectors);
++    } else {
++        fprintf(stderr, "Unable to read partition table: %s\n", strerror(errno));
++    }
++
++    if (pt_head && pt_sectors) {
++        int cyl_size;
++
++        geom->heads = pt_head;
++        geom->sectors = pt_sectors;
++        cyl_size = pt_head * pt_sectors;
++        geom->cylinders = geom->total_sectors/cyl_size;
++    } else {
++        geom->heads = kern_head;
++        geom->sectors = kern_sectors;
++        geom->cylinders = kern_cyl;
++    }
++
++    return;
++}
++#endif
++
+ /* Get the geometry of a drive DRIVE.  */
+ void
+ get_drive_geometry (struct geometry *geom, char **map, int drive)
+@@ -151,21 +297,16 @@
+ #if defined(__linux__)
+   /* Linux */
+   {
+-    struct hd_geometry hdg;
+     unsigned long nr;
+-    
+-    if (ioctl (fd, HDIO_GETGEO, &hdg))
+-      goto fail;
+ 
+     if (ioctl (fd, BLKGETSIZE, &nr))
+       goto fail;
+     
+     /* Got the geometry, so save it. */
+-    geom->cylinders = hdg.cylinders;
+-    geom->heads = hdg.heads;
+-    geom->sectors = hdg.sectors;
+     geom->total_sectors = nr;
+-    
++    get_linux_geometry(fd, geom);
++    if (!geom->heads && !geom->cylinders && !geom->sectors)
++        goto fail;
+     goto success;
+   }
+ 
+@@ -841,6 +982,7 @@
+ {
+   char dev[PATH_MAX];	/* XXX */
+   int fd;
++  off_t offset = (off_t) sector * (off_t) SECTOR_SIZE;
+   
+   if ((partition & 0x00FF00) != 0x00FF00)
+     {
+@@ -874,35 +1016,13 @@
+       errnum = ERR_NO_PART;
+       return 0;
+     }
+-  
+-#if defined(__linux__) && (!defined(__GLIBC__) || \
+-        ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))))
+-  /* Maybe libc doesn't have large file support.  */
+-  {
+-    loff_t offset, result;
+-    static int _llseek (uint filedes, ulong hi, ulong lo,
+-                        loff_t *res, uint wh);
+-    _syscall5 (int, _llseek, uint, filedes, ulong, hi, ulong, lo,
+-               loff_t *, res, uint, wh);
+ 
+-    offset = (loff_t) sector * (loff_t) SECTOR_SIZE;
+-    if (_llseek (fd, offset >> 32, offset & 0xffffffff, &result, SEEK_SET))
+-      {
+-	errnum = ERR_DEV_VALUES;
+-	return 0;
+-      }
+-  }
+-#else
+-  {
+-    off_t offset = (off_t) sector * (off_t) SECTOR_SIZE;
+ 
+-    if (lseek (fd, offset, SEEK_SET) != offset)
+-      {
+-	errnum = ERR_DEV_VALUES;
+-	return 0;
+-      }
+-  }
+-#endif
++  if (my_lseek(fd, offset, SEEK_SET) != offset)
++    {
++      errnum = ERR_DEV_VALUES;
++      return 0;
++    }
+   
+   if (write (fd, buf, size * SECTOR_SIZE) != (size * SECTOR_SIZE))
+     {

Modified: tinysofa/releases/1.2/grub/current/specs/grub.spec
===================================================================
--- tinysofa/releases/1.2/grub/current/specs/grub.spec	2005-02-05 11:59:12 UTC (rev 5825)
+++ tinysofa/releases/1.2/grub/current/specs/grub.spec	2005-02-05 12:20:13 UTC (rev 5826)
@@ -58,9 +58,9 @@
 
 # the 2.6 kernel no longer does geometry fixups.  so now I get to do it
 # instead in userspace everywhere.  
-Patch1000: grub-0.94-geometry-26kernel.patch
+Patch1000: grub-0.95-geometry-26kernel.patch
 
-ExclusiveArch: i386 i586 x86_64
+ExclusiveArch: %{ix86} x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
 BuildRequires: autoconf automake libtool
 Requires: mktemp
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.95-5jh
+- update the geometry patch
+
 * Wed Jan  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.95-3jh
 - add RAID1 patches
 


From svn at tinysofa.org  Sat Feb  5 12:32:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 07:32:52 -0500 (EST)
Subject: [tinysofa-svn] r5827 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050205123252.575613443E6@minbar.tinysofa.org>

Author: jh
Date: 2005-02-05 07:32:47 -0500 (Sat, 05 Feb 2005)
New Revision: 5827

Modified:
   tinysofa/releases/1.2/kernel/current/sources/exec-shield-nx-2.6.10-A3.patch
Log:
- change exec-shield default mode to 1


Modified: tinysofa/releases/1.2/kernel/current/sources/exec-shield-nx-2.6.10-A3.patch
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/exec-shield-nx-2.6.10-A3.patch	2005-02-05 12:20:13 UTC (rev 5826)
+++ tinysofa/releases/1.2/kernel/current/sources/exec-shield-nx-2.6.10-A3.patch	2005-02-05 12:32:47 UTC (rev 5827)
@@ -1146,7 +1146,7 @@
  
 +extern unsigned int vdso_enabled;
 +
-+int exec_shield = 2;
++int exec_shield = 1;
 +int exec_shield_randomize = 1;
 +
 +static int __init setup_exec_shield(char *str)


From svn at tinysofa.org  Sat Feb  5 14:12:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 09:12:03 -0500 (EST)
Subject: [tinysofa-svn] 
	r5828 - in tinysofa/releases/1.2/python/current: sources specs
Message-ID: <20050205141203.0B1E73443E0@minbar.tinysofa.org>

Author: gda
Date: 2005-02-05 09:11:53 -0500 (Sat, 05 Feb 2005)
New Revision: 5828

Added:
   tinysofa/releases/1.2/python/current/sources/python-CAN-2005-0089.patch
Modified:
   tinysofa/releases/1.2/python/current/specs/python.spec
Log:
applied CAN-2005-0089 patch

Added: tinysofa/releases/1.2/python/current/sources/python-CAN-2005-0089.patch
===================================================================
--- tinysofa/releases/1.2/python/current/sources/python-CAN-2005-0089.patch	2005-02-05 12:32:47 UTC (rev 5827)
+++ tinysofa/releases/1.2/python/current/sources/python-CAN-2005-0089.patch	2005-02-05 14:11:53 UTC (rev 5828)
@@ -0,0 +1,125 @@
+Index: Lib/SimpleXMLRPCServer.py
+===================================================================
+RCS file: /cvsroot/python/python/dist/src/Lib/SimpleXMLRPCServer.py,v
+retrieving revision 1.7.8.1
+diff -c -r1.7.8.1 SimpleXMLRPCServer.py
+*** Lib/SimpleXMLRPCServer.py	3 Oct 2004 23:23:00 -0000	1.7.8.1
+--- Lib/SimpleXMLRPCServer.py	3 Feb 2005 05:33:55 -0000
+***************
+*** 107,120 ****
+  import types
+  import os
+  
+! def resolve_dotted_attribute(obj, attr):
+      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
+  
+      Resolves a dotted attribute name to an object.  Raises
+      an AttributeError if any attribute in the chain starts with a '_'.
+      """
+  
+!     for i in attr.split('.'):
+          if i.startswith('_'):
+              raise AttributeError(
+                  'attempt to access private attribute "%s"' % i
+--- 107,128 ----
+  import types
+  import os
+  
+! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
+      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
+  
+      Resolves a dotted attribute name to an object.  Raises
+      an AttributeError if any attribute in the chain starts with a '_'.
++ 
++     If the optional allow_dotted_names argument is false, dots are not
++     supported and this function operates similar to getattr(obj, attr).
+      """
+  
+!     if allow_dotted_names:
+!         attrs = attr.split('.')
+!     else:
+!         attrs = [attr]
+! 
+!     for i in attrs:
+          if i.startswith('_'):
+              raise AttributeError(
+                  'attempt to access private attribute "%s"' % i
+***************
+*** 156,162 ****
+          self.funcs = {}
+          self.instance = None
+  
+!     def register_instance(self, instance):
+          """Registers an instance to respond to XML-RPC requests.
+  
+          Only one instance can be installed at a time.
+--- 164,170 ----
+          self.funcs = {}
+          self.instance = None
+  
+!     def register_instance(self, instance, allow_dotted_names=False):
+          """Registers an instance to respond to XML-RPC requests.
+  
+          Only one instance can be installed at a time.
+***************
+*** 174,182 ****
+--- 182,204 ----
+  
+          If a registered function matches a XML-RPC request, then it
+          will be called instead of the registered instance.
++ 
++         If the optional allow_dotted_names argument is true and the
++         instance does not have a _dispatch method, method names
++         containing dots are supported and resolved, as long as none of
++         the name segments start with an '_'.
++ 
++             *** SECURITY WARNING: ***
++ 
++             Enabling the allow_dotted_names options allows intruders
++             to access your module's global variables and may allow
++             intruders to execute arbitrary code on your machine.  Only
++             use this option on a secure, closed network.
++ 
+          """
+  
+          self.instance = instance
++         self.allow_dotted_names = allow_dotted_names
+  
+      def register_function(self, function, name = None):
+          """Registers a function to respond to XML-RPC requests.
+***************
+*** 295,301 ****
+                  try:
+                      method = resolve_dotted_attribute(
+                                  self.instance,
+!                                 method_name
+                                  )
+                  except AttributeError:
+                      pass
+--- 317,324 ----
+                  try:
+                      method = resolve_dotted_attribute(
+                                  self.instance,
+!                                 method_name,
+!                                 self.allow_dotted_names
+                                  )
+                  except AttributeError:
+                      pass
+***************
+*** 374,380 ****
+                      try:
+                          func = resolve_dotted_attribute(
+                              self.instance,
+!                             method
+                              )
+                      except AttributeError:
+                          pass
+--- 397,404 ----
+                      try:
+                          func = resolve_dotted_attribute(
+                              self.instance,
+!                             method,
+!                             self.allow_dotted_names
+                              )
+                      except AttributeError:
+                          pass

Modified: tinysofa/releases/1.2/python/current/specs/python.spec
===================================================================
--- tinysofa/releases/1.2/python/current/specs/python.spec	2005-02-05 12:32:47 UTC (rev 5827)
+++ tinysofa/releases/1.2/python/current/specs/python.spec	2005-02-05 14:11:53 UTC (rev 5828)
@@ -9,7 +9,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}
-Release: 1jh
+Release: 2gd
 License: PSF - see LICENSE
 Group: main
 Provides: python-abi = %{pybasever}
@@ -35,6 +35,7 @@
 Patch14: python-2.3.4-pydocnodoc.patch
 Patch16: python-2.4-db43.patch
 Patch17: python-2.4-gdbm.patch
+Patch18: python-CAN-2005-0089.patch
 
 Obsoletes: Distutils
 Provides: Distutils
@@ -142,6 +143,7 @@
 %patch14 -p1 -b .no-doc
 %patch16 -p1 -b .db43
 %patch17 -p1 -b .gdbm
+%patch18 -p0
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -333,6 +335,9 @@
 
 
 %changelog
+* Sat Feb 05 2005 Gerald Dachs <gda at tinsofa dot org> 2.4-2gd
+- applied CAN-2005-0089 patch
+
 * Mon Jan 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.4-1jh
 - 2.4
 - fix dbm module


From svn at tinysofa.org  Sat Feb  5 15:27:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 10:27:05 -0500 (EST)
Subject: [tinysofa-svn] 
	r5829 - in tinysofa/releases/1.1/python/current: sources specs
Message-ID: <20050205152705.B6B38344436@minbar.tinysofa.org>

Author: jh
Date: 2005-02-05 10:26:54 -0500 (Sat, 05 Feb 2005)
New Revision: 5829

Added:
   tinysofa/releases/1.1/python/current/sources/python-2.3-CAN-2005-0089.patch
   tinysofa/releases/1.1/python/current/sources/python-2.3-gdbm.patch
Modified:
   tinysofa/releases/1.1/python/current/specs/python.spec
Log:
- CAN-2005-0089
- build bzip2 module
- fix dbm module


Added: tinysofa/releases/1.1/python/current/sources/python-2.3-CAN-2005-0089.patch
===================================================================
--- tinysofa/releases/1.1/python/current/sources/python-2.3-CAN-2005-0089.patch	2005-02-05 14:11:53 UTC (rev 5828)
+++ tinysofa/releases/1.1/python/current/sources/python-2.3-CAN-2005-0089.patch	2005-02-05 15:26:54 UTC (rev 5829)
@@ -0,0 +1,125 @@
+Index: Lib/SimpleXMLRPCServer.py
+===================================================================
+RCS file: /cvsroot/python/python/dist/src/Lib/SimpleXMLRPCServer.py,v
+retrieving revision 1.7.8.1
+diff -c -r1.7.8.1 SimpleXMLRPCServer.py
+*** Lib/SimpleXMLRPCServer.py	3 Oct 2004 23:23:00 -0000	1.7.8.1
+--- Lib/SimpleXMLRPCServer.py	3 Feb 2005 05:33:55 -0000
+***************
+*** 107,120 ****
+  import types
+  import os
+  
+! def resolve_dotted_attribute(obj, attr):
+      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
+  
+      Resolves a dotted attribute name to an object.  Raises
+      an AttributeError if any attribute in the chain starts with a '_'.
+      """
+  
+!     for i in attr.split('.'):
+          if i.startswith('_'):
+              raise AttributeError(
+                  'attempt to access private attribute "%s"' % i
+--- 107,128 ----
+  import types
+  import os
+  
+! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
+      """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
+  
+      Resolves a dotted attribute name to an object.  Raises
+      an AttributeError if any attribute in the chain starts with a '_'.
++ 
++     If the optional allow_dotted_names argument is false, dots are not
++     supported and this function operates similar to getattr(obj, attr).
+      """
+  
+!     if allow_dotted_names:
+!         attrs = attr.split('.')
+!     else:
+!         attrs = [attr]
+! 
+!     for i in attrs:
+          if i.startswith('_'):
+              raise AttributeError(
+                  'attempt to access private attribute "%s"' % i
+***************
+*** 156,162 ****
+          self.funcs = {}
+          self.instance = None
+  
+!     def register_instance(self, instance):
+          """Registers an instance to respond to XML-RPC requests.
+  
+          Only one instance can be installed at a time.
+--- 164,170 ----
+          self.funcs = {}
+          self.instance = None
+  
+!     def register_instance(self, instance, allow_dotted_names=False):
+          """Registers an instance to respond to XML-RPC requests.
+  
+          Only one instance can be installed at a time.
+***************
+*** 174,182 ****
+--- 182,204 ----
+  
+          If a registered function matches a XML-RPC request, then it
+          will be called instead of the registered instance.
++ 
++         If the optional allow_dotted_names argument is true and the
++         instance does not have a _dispatch method, method names
++         containing dots are supported and resolved, as long as none of
++         the name segments start with an '_'.
++ 
++             *** SECURITY WARNING: ***
++ 
++             Enabling the allow_dotted_names options allows intruders
++             to access your module's global variables and may allow
++             intruders to execute arbitrary code on your machine.  Only
++             use this option on a secure, closed network.
++ 
+          """
+  
+          self.instance = instance
++         self.allow_dotted_names = allow_dotted_names
+  
+      def register_function(self, function, name = None):
+          """Registers a function to respond to XML-RPC requests.
+***************
+*** 295,301 ****
+                  try:
+                      method = resolve_dotted_attribute(
+                                  self.instance,
+!                                 method_name
+                                  )
+                  except AttributeError:
+                      pass
+--- 317,324 ----
+                  try:
+                      method = resolve_dotted_attribute(
+                                  self.instance,
+!                                 method_name,
+!                                 self.allow_dotted_names
+                                  )
+                  except AttributeError:
+                      pass
+***************
+*** 374,380 ****
+                      try:
+                          func = resolve_dotted_attribute(
+                              self.instance,
+!                             method
+                              )
+                      except AttributeError:
+                          pass
+--- 397,404 ----
+                      try:
+                          func = resolve_dotted_attribute(
+                              self.instance,
+!                             method,
+!                             self.allow_dotted_names
+                              )
+                      except AttributeError:
+                          pass

Added: tinysofa/releases/1.1/python/current/sources/python-2.3-gdbm.patch
===================================================================
--- tinysofa/releases/1.1/python/current/sources/python-2.3-gdbm.patch	2005-02-05 14:11:53 UTC (rev 5828)
+++ tinysofa/releases/1.1/python/current/sources/python-2.3-gdbm.patch	2005-02-05 15:26:54 UTC (rev 5829)
@@ -0,0 +1,17 @@
+--- Python-2.4/setup.py.gdbm	2005-01-10 21:48:51.585372218 +0200
++++ Python-2.4/setup.py	2005-01-10 21:50:01.730008709 +0200
+@@ -606,12 +606,12 @@
+                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
+                     ndbm_libs = ['ndbm']
+                 else:
+-                    ndbm_libs = []
++                    ndbm_libs = ['gdbm', 'gdbm_compat']
+                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                                        define_macros=[('HAVE_NDBM_H',None)],
+                                        libraries = ndbm_libs ) )
+             elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
+-                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
++                  and find_file("ndbm.h", inc_dirs, []) is not None):
+                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
+                                        libraries = ['gdbm'] ) )

Modified: tinysofa/releases/1.1/python/current/specs/python.spec
===================================================================
--- tinysofa/releases/1.1/python/current/specs/python.spec	2005-02-05 14:11:53 UTC (rev 5828)
+++ tinysofa/releases/1.1/python/current/specs/python.spec	2005-02-05 15:26:54 UTC (rev 5829)
@@ -7,7 +7,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.4
-Release: 3ts
+Release: 4jh
 License: PSF - see LICENSE
 Group: main
 Provides: python-abi = %{pybasever}
@@ -26,6 +26,8 @@
 Patch9: japanese-codecs-lib64.patch
 Patch12: python-2.3.2-nomkhowto.patch
 Patch100: python-2.3.3-tinysofa-distutils.patch
+Patch101: python-2.3-gdbm.patch
+Patch102: python-2.3-CAN-2005-0089.patch
 
 Obsoletes: python2 python-modules python-gdbm python-dbm
 Provides: python2 = %{version}
@@ -40,7 +42,7 @@
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
 BuildPrereq: glibc-devel gcc-c++ libstdc++-devel
 BuildPrereq: gzip tar findutils pkgconfig
-BuildPrereq: gdbm-devel
+BuildPrereq: gdbm-devel bzip2-devel
 URL: http://www.python.org/
 
 
@@ -132,6 +134,8 @@
 %endif
 %patch12 -p1 -b .nomkhowto
 %patch100 -p1
+%patch101 -p1
+%patch102 -p0
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -328,6 +332,11 @@
 
 
 %changelog
+* Sat Feb  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.3.4-4jh
+- CAN-2005-0089
+- build bzip2 module
+- fix dbm module
+
 * Fri Aug 20 2004 tsintegrate <release at tinysofa dot org> 2.3.4-3ts
 - current (2.3.4-3jh) integrated as 2.3.4-3ts for release 1.1
 


From svn at tinysofa.org  Sat Feb  5 15:28:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Feb 2005 10:28:40 -0500 (EST)
Subject: [tinysofa-svn] r5830 - tinysofa/releases/1.1
Message-ID: <20050205152840.E2484344441@minbar.tinysofa.org>

Author: jh
Date: 2005-02-05 10:28:31 -0500 (Sat, 05 Feb 2005)
New Revision: 5830

Added:
   tinysofa/releases/1.1/perl/
Log:
- copy 5.8.5 to 1.1


Copied: tinysofa/releases/1.1/perl (from rev 5820, tinysofa/releases/1.2/perl)


From svn at tinysofa.org  Sun Feb  6 09:07:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 04:07:32 -0500 (EST)
Subject: [tinysofa-svn] 
	r5832 - in tinysofa/releases/1.2/perl/current: sources specs
Message-ID: <20050206090732.B701E3443C1@minbar.tinysofa.org>

Author: jh
Date: 2005-02-06 04:07:21 -0500 (Sun, 06 Feb 2005)
New Revision: 5832

Added:
   tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch
Modified:
   tinysofa/releases/1.2/perl/current/specs/perl.spec
Log:
- fix CAN-2005-0155 and CAN-2005-0156 (#5)

Added: tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch
===================================================================
--- tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch	2005-02-06 08:58:12 UTC (rev 5831)
+++ tinysofa/releases/1.2/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch	2005-02-06 09:07:21 UTC (rev 5832)
@@ -0,0 +1,20 @@
+--- perl-5.8.5.orig/perlio.c
++++ perl-5.8.5/perlio.c
+@@ -448,7 +448,7 @@
+     va_list ap;
+     dSYS;
+     va_start(ap, fmt);
+-    if (!dbg) {
++    if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
+ 	char *s = PerlEnv_getenv("PERLIO_DEBUG");
+ 	if (s && *s)
+ 	    dbg = PerlLIO_open3(s, O_WRONLY | O_CREAT | O_APPEND, 0666);
+@@ -465,7 +465,7 @@
+ 	s = CopFILE(PL_curcop);
+ 	if (!s)
+ 	    s = "(none)";
+-	sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
++	sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
+ 	len = strlen(buffer);
+ 	vsprintf(buffer+len, fmt, ap);
+ 	PerlLIO_write(dbg, buffer, strlen(buffer));

Modified: tinysofa/releases/1.2/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-06 08:58:12 UTC (rev 5831)
+++ tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-06 09:07:21 UTC (rev 5832)
@@ -4,7 +4,7 @@
 Name: perl
 Version: 5.8.6
 Epoch: 1
-Release: 2gd
+Release: 3jh
 License: GPL
 Group: main
 Url: http://www.perl.com
@@ -22,6 +22,7 @@
 Patch5: perl-5.8.5-nondbm.patch
 Patch6: perl-5.8.6-CAN-2004-0452.patch
 Patch7: perl-5.8.5-CAN-2004-0976.patch
+Patch8: perl-5.8.5-CAN-2005-0155.patch
 
 # arch-specific patches
 Patch100: perl-5.8.1-fpic.patch
@@ -99,6 +100,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %patch100 -p1
                                                                                 
@@ -442,6 +444,9 @@
 
 
 %changelog
+* Sun Feb  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 5.8.6-3jh
+- fix CAN-2005-0155 and CAN-2005-0156 (#5)
+
 * Sat Feb 05 2005 Gerald Dachs <gda at tinysofa dot org> 5.8.6-2gd
 - reapplied patch CAN-2004-0452
 


From svn at tinysofa.org  Sun Feb  6 09:56:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 04:56:48 -0500 (EST)
Subject: [tinysofa-svn] r5833 - tinysofa/releases/1.1
Message-ID: <20050206095648.3BDF03443D6@minbar.tinysofa.org>

Author: jh
Date: 2005-02-06 04:56:42 -0500 (Sun, 06 Feb 2005)
New Revision: 5833

Removed:
   tinysofa/releases/1.1/grub/
Log:
- remove grub from 1.1 branch (grub in 1.2 branch works now with both releases)



From svn at tinysofa.org  Sun Feb  6 09:57:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 04:57:11 -0500 (EST)
Subject: [tinysofa-svn] 
	r5834 - in tinysofa/releases/1.2/grub/current: sources specs
Message-ID: <20050206095711.68DB23443E3@minbar.tinysofa.org>

Author: jh
Date: 2005-02-06 04:57:02 -0500 (Sun, 06 Feb 2005)
New Revision: 5834

Modified:
   tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch
   tinysofa/releases/1.2/grub/current/specs/grub.spec
Log:
- add kernel version detection to 2.6 geometry patch

Modified: tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch
===================================================================
--- tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch	2005-02-06 09:56:42 UTC (rev 5833)
+++ tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch	2005-02-06 09:57:02 UTC (rev 5834)
@@ -1,6 +1,14 @@
---- grub-0.95/lib/device.c.26geom	2004-11-30 16:33:00.186025728 -0500
-+++ grub-0.95/lib/device.c	2004-11-30 16:45:09.073218032 -0500
-@@ -131,6 +131,152 @@
+--- grub-0.95/lib/device.c.26geom	2005-02-06 11:33:55.000000000 +0200
++++ grub-0.95/lib/device.c	2005-02-06 11:49:42.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <stdarg.h>
++#include <sys/utsname.h>
+ 
+ #ifdef __linux__
+ # if !defined(__GLIBC__) || \
+@@ -131,6 +132,152 @@
  #include <shared.h>
  #include <device.h>
  
@@ -153,7 +161,7 @@
  /* Get the geometry of a drive DRIVE.  */
  void
  get_drive_geometry (struct geometry *geom, char **map, int drive)
-@@ -151,21 +297,16 @@
+@@ -151,21 +298,32 @@
  #if defined(__linux__)
    /* Linux */
    {
@@ -162,6 +170,13 @@
 -    
 -    if (ioctl (fd, HDIO_GETGEO, &hdg))
 -      goto fail;
++    int kernel26_geometry = 0;
++    struct utsname uts;
++
++    if(!uname(&uts) && strlen(uts.release) >= 3) {
++      kernel26_geometry += uts.release[0] > '2';
++      kernel26_geometry += uts.release[0] >= '2' && uts.release[2] >= '6';
++    }
  
      if (ioctl (fd, BLKGETSIZE, &nr))
        goto fail;
@@ -172,13 +187,22 @@
 -    geom->sectors = hdg.sectors;
      geom->total_sectors = nr;
 -    
-+    get_linux_geometry(fd, geom);
-+    if (!geom->heads && !geom->cylinders && !geom->sectors)
++    if(kernel26_geometry) {
++      get_linux_geometry(fd, geom);
++      if (!geom->heads && !geom->cylinders && !geom->sectors)
++          goto fail;
++    } else {
++      struct hd_geometry hdg;
++      if (ioctl (fd, HDIO_GETGEO, &hdg))
 +        goto fail;
++      geom->cylinders = hdg.cylinders;
++      geom->heads = hdg.heads;
++      geom->sectors = hdg.sectors;
++    }
      goto success;
    }
  
-@@ -841,6 +982,7 @@
+@@ -942,6 +1100,7 @@
  {
    char dev[PATH_MAX];	/* XXX */
    int fd;
@@ -186,7 +210,7 @@
    
    if ((partition & 0x00FF00) != 0x00FF00)
      {
-@@ -874,35 +1016,13 @@
+@@ -976,35 +1135,13 @@
        errnum = ERR_NO_PART;
        return 0;
      }

Modified: tinysofa/releases/1.2/grub/current/specs/grub.spec
===================================================================
--- tinysofa/releases/1.2/grub/current/specs/grub.spec	2005-02-06 09:56:42 UTC (rev 5833)
+++ tinysofa/releases/1.2/grub/current/specs/grub.spec	2005-02-06 09:57:02 UTC (rev 5834)
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.95
-Release: 3jh
+Release: 6jh
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: main
 License: GPL
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Sun Feb  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.95-6jh
+- add kernel version detection to 2.6 geometry patch
+
 * Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.95-5jh
 - update the geometry patch
 


From svn at tinysofa.org  Sun Feb  6 08:58:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 03:58:21 -0500 (EST)
Subject: [tinysofa-svn] 
	r5831 - in tinysofa/releases/1.1/perl/current: sources specs
Message-ID: <20050206085821.C93653443F0@minbar.tinysofa.org>

Author: jh
Date: 2005-02-06 03:58:12 -0500 (Sun, 06 Feb 2005)
New Revision: 5831

Added:
   tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch
Modified:
   tinysofa/releases/1.1/perl/current/specs/perl.spec
Log:
- fix CAN-2005-0155 and CAN-2005-0156 (#5)

Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch
===================================================================
--- tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch	2005-02-05 15:28:31 UTC (rev 5830)
+++ tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-CAN-2005-0155.patch	2005-02-06 08:58:12 UTC (rev 5831)
@@ -0,0 +1,20 @@
+--- perl-5.8.5.orig/perlio.c
++++ perl-5.8.5/perlio.c
+@@ -448,7 +448,7 @@
+     va_list ap;
+     dSYS;
+     va_start(ap, fmt);
+-    if (!dbg) {
++    if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
+ 	char *s = PerlEnv_getenv("PERLIO_DEBUG");
+ 	if (s && *s)
+ 	    dbg = PerlLIO_open3(s, O_WRONLY | O_CREAT | O_APPEND, 0666);
+@@ -465,7 +465,7 @@
+ 	s = CopFILE(PL_curcop);
+ 	if (!s)
+ 	    s = "(none)";
+-	sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
++	sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
+ 	len = strlen(buffer);
+ 	vsprintf(buffer+len, fmt, ap);
+ 	PerlLIO_write(dbg, buffer, strlen(buffer));

Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/1.1/perl/current/specs/perl.spec	2005-02-05 15:28:31 UTC (rev 5830)
+++ tinysofa/releases/1.1/perl/current/specs/perl.spec	2005-02-06 08:58:12 UTC (rev 5831)
@@ -4,7 +4,7 @@
 Name: perl
 Version: 5.8.5
 Epoch: 1
-Release: 4ts
+Release: 5jh
 License: GPL
 Group: main
 Url: http://www.perl.com
@@ -22,6 +22,7 @@
 Patch5: perl-5.8.5-nondbm.patch
 Patch6: perl-5.8.5-CAN-2004-0452.patch
 Patch7: perl-5.8.5-CAN-2004-0976.patch
+Patch8: perl-5.8.5-CAN-2005-0155.patch
 
 # arch-specific patches
 Patch100: perl-5.8.1-fpic.patch
@@ -99,6 +100,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %patch100 -p1
                                                                                 
@@ -442,6 +444,9 @@
 
 
 %changelog
+* Sun Feb  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 5.8.5-5jh
+- fix CAN-2005-0155 and CAN-2005-0156 (#5)
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 5.8.5-4ts
 - current (5.8.5-4jh) integrated as 5.8.5-4ts for release 1.1-U3
 


From svn at tinysofa.org  Sun Feb  6 12:33:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 07:33:55 -0500 (EST)
Subject: [tinysofa-svn] r5835 - in tinysofa/releases/1.2: . squashfs-tools
	squashfs-tools/current squashfs-tools/current/sources
	squashfs-tools/current/specs
Message-ID: <20050206123355.CA9293443E1@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 07:33:32 -0500 (Sun, 06 Feb 2005)
New Revision: 5835

Added:
   tinysofa/releases/1.2/squashfs-tools/
   tinysofa/releases/1.2/squashfs-tools/current/
   tinysofa/releases/1.2/squashfs-tools/current/sources/
   tinysofa/releases/1.2/squashfs-tools/current/sources/squashfs2.1-r2.tar.gz
   tinysofa/releases/1.2/squashfs-tools/current/specs/
   tinysofa/releases/1.2/squashfs-tools/current/specs/squashfs-tools.spec
   tinysofa/releases/1.2/squashfs-tools/pristine/
   tinysofa/releases/1.2/squashfs-tools/releases/
Log:
new in tinysofa

Added: tinysofa/releases/1.2/squashfs-tools/current/sources/squashfs2.1-r2.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/squashfs-tools/current/sources/squashfs2.1-r2.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.2/squashfs-tools/current/specs/squashfs-tools.spec
===================================================================
--- tinysofa/releases/1.2/squashfs-tools/current/specs/squashfs-tools.spec	2005-02-06 09:57:02 UTC (rev 5834)
+++ tinysofa/releases/1.2/squashfs-tools/current/specs/squashfs-tools.spec	2005-02-06 12:33:32 UTC (rev 5835)
@@ -0,0 +1,41 @@
+%define realname squashfs
+%define realversion 2.1
+%define realrelease r2
+Summary: Tools for the Squash filesystem
+Name: 		%{realname}-tools
+Version: 	%{realversion}_%{realrelease}
+Release: 	1gd
+License:        GNU GPL
+Group: 		extra
+Source0: 	%{realname}%{realversion}-%{realrelease}.tar.gz
+BuildRoot: 	/var/tmp/%{name}-%{version}-root
+URL:            http://squashfs.sourceforge.net/
+Requires:	zlib
+BuildRequires:  zlib-devel
+
+%description
+Squashfs is a compressed read-only filesystem for Linux. Squashfs is intended for general read-only filesystem use, for archival use (i.e. in cases where a .tar.gz file may be used), and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed. The filesystem is currently stable, and has been tested on PowerPC, i586, Sparc and ARM architectures.
+
+%prep 
+%setup -n %{realname}%{realversion}-%{realrelease}
+
+%build
+cd %{name}
+%make
+
+%install
+mkdir -p $RPM_BUILD_ROOT/sbin
+install -m 755 %{name}/mksquashfs $RPM_BUILD_ROOT/sbin
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc ACKNOWLEDGEMENTS README CHANGES README-2.0 COPYING README-2.1
+%doc INSTALL README-AMD64 PERFORMANCE.README
+/sbin/*
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 2.1_r2-1gd
+- new in tinysofa


From svn at tinysofa.org  Sun Feb  6 12:47:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 07:47:32 -0500 (EST)
Subject: [tinysofa-svn] 
	r5836 - in tinysofa/releases/1.2/lilo/current: sources specs
Message-ID: <20050206124732.069FA3441CB@minbar.tinysofa.org>

Author: jh
Date: 2005-02-06 07:47:15 -0500 (Sun, 06 Feb 2005)
New Revision: 5836

Added:
   tinysofa/releases/1.2/lilo/current/sources/lilo-22.6.1.src.tar.gz
Removed:
   tinysofa/releases/1.2/lilo/current/sources/lilo-22.6.tar.gz
   tinysofa/releases/1.2/lilo/current/sources/lilo-nolatexdoc.patch
Modified:
   tinysofa/releases/1.2/lilo/current/specs/lilo.spec
Log:
- 22.6.1
- fix license
- don't use crappy make install
- get rid of nolatex patch


Added: tinysofa/releases/1.2/lilo/current/sources/lilo-22.6.1.src.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/lilo/current/sources/lilo-22.6.1.src.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/lilo/current/sources/lilo-22.6.tar.gz
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.2/lilo/current/sources/lilo-nolatexdoc.patch
===================================================================
--- tinysofa/releases/1.2/lilo/current/sources/lilo-nolatexdoc.patch	2005-02-06 12:33:32 UTC (rev 5835)
+++ tinysofa/releases/1.2/lilo/current/sources/lilo-nolatexdoc.patch	2005-02-06 12:47:15 UTC (rev 5836)
@@ -1,63 +0,0 @@
-diff -Nur lilo-22.3.2/doc/Makefile lilo-22.3.2.changed/doc/Makefile
---- lilo-22.3.2/doc/Makefile	Mon Jun  4 00:39:11 2001
-+++ lilo-22.3.2.changed/doc/Makefile	Mon Jul 22 21:21:53 2002
-@@ -1,40 +1,40 @@
--LATEX=latex
--RLATEX=./rlatex
--FIG2DEV=fig2dev
--SHELL=/bin/sh
-+#LATEX=latex
-+#RLATEX=./rlatex
-+#FIG2DEV=fig2dev
-+#SHELL=/bin/sh
- 
- IMAGES=bootloader.tex map.tex image.tex parameter.tex other.tex
- 
--.SUFFIXES:	.fig .tex .dvi .ps
-+#.SUFFIXES:	.fig .tex .dvi .ps
- 
- .fig.tex:
--		$(FIG2DEV) -L latex $*.fig $*.tex
-+#		$(FIG2DEV) -L latex $*.fig $*.tex
- 
- .tex.dvi:
--		$(RLATEX) $*
-+#		$(RLATEX) $*
- 
--all:		user.dvi tech.dvi user.ps tech.ps
-+all:#		user.dvi tech.dvi user.ps tech.ps
- 
--user.ps:	user.dvi
--		dvips -o user.ps user.dvi
-+user.ps:#	user.dvi
-+	#	dvips -o user.ps user.dvi
- 
--tech.ps:	tech.dvi
--		dvips -o tech.ps tech.dvi
-+tech.ps:#	tech.dvi
-+	#	dvips -o tech.ps tech.dvi
- 
--user.dvi:	user.tex
-+user.dvi:#	user.tex
- 
--tech.dvi:	tech.tex $(IMAGES)
-+tech.dvi:#	tech.tex $(IMAGES)
- 
- ../README:	user.tex
- 		perl t2a.pl <user.tex >../README || { rm -f ../README; exit 1; }
- 
--html:		user.ps tech.ps
--		latex2html -split 2 -link 2 -toc_depth 2 user
--		latex2html -split 1 -link 1 -toc_depth 1 tech
-+html:#		user.ps tech.ps
-+#		latex2html -split 2 -link 2 -toc_depth 2 user
-+#		latex2html -split 1 -link 1 -toc_depth 1 tech
- 
- again:
--		$(LATEX) user
--		$(LATEX) tech
-+#		$(LATEX) user
-+#		$(LATEX) tech
- 
- tidy:
- 		rm -f *~ *.toc *.aux *.log

Modified: tinysofa/releases/1.2/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/releases/1.2/lilo/current/specs/lilo.spec	2005-02-06 12:33:32 UTC (rev 5835)
+++ tinysofa/releases/1.2/lilo/current/specs/lilo.spec	2005-02-06 12:47:15 UTC (rev 5836)
@@ -1,3 +1,4 @@
+%define _sbindir	/sbin
 Summary: The boot loader for Linux and other operating systems
 Summary(pt_BR): Carregador de boot para Linux e outros sistemas operacionais
 Summary(es): Cargador de arranque para Linux y otros sistemas operativos
@@ -2,16 +3,14 @@
 Name: lilo
-Version: 22.6
-Release: 2ts
-License: MIT
+Version: 22.6.1
+Release: 1jh
+License: BSD
 Group: main
-Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{version}.tar.gz
+Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{version}.src.tar.gz
 Source2: keytab-lilo.c
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Patch0: lilo-nolatexdoc.patch
 PreReq: /sbin/grubby grep
 BuildRequires: dev86, nasm, sed
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Exclusivearch: i386 i586
+Exclusivearch: %{ix86}
 
-
 %description
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 
 
 # we need a hack to properly use CFLAGS
 sed -e "s/^CFLAGS=/CFLAGS=$RPM_OPT_FLAGS /" < Makefile > Makefile.new
@@ -46,29 +44,30 @@
 
 
 %build
-%make all boot-menu.b
-%make -C doc 
-rm -f doc/*.aux doc/*.log doc/*.toc
+%make lilo bootsect.b boot-menu.b
 
 gcc $RPM_OPT_FLAGS -o keytab-lilo %{SOURCE2}
 
+
 %install
-mkdir -p %{buildroot}/%{_mandir} %{buildroot}/usr
-make install ROOT=%{buildroot} MAN_DIR=%{_mandir}
+%{__mkdir_p} \
+	%{buildroot}%{_mandir}/man{5,8} \
+	%{buildroot}%{_sbindir}
 
-# this pulls in a perl dependency with it we don't want
-rm -f %{buildroot}%{_sbindir}/keytab-lilo.pl
-chmod 0644 keytab-lilo.pl
+%{__install} -m 755 lilo %{buildroot}%{_sbindir}
+%{__install} -m 755 mkrescue %{buildroot}%{_sbindir}
 
+%{__install} -m 644 manPages/lilo.conf.5 %{buildroot}%{_mandir}/man5
+%{__install} -m 644 manPages/mkrescue.8 %{buildroot}%{_mandir}/man8
+%{__install} -m 644 manPages/lilo.8 %{buildroot}%{_mandir}/man8
+
 install -D -m 755 keytab-lilo %{buildroot}%{_bindir}/keytab-lilo
 
 install -D -m 644 boot-menu.b %{buildroot}/boot/boot.b
 install -D -m 644 os2_d.b %{buildroot}/boot/os2_d.b
 install -D -m 644 chain.b %{buildroot}/boot/chain.b
 
-rm -f %{buildroot}/boot/*.img
 
-
 %clean
 %clean_buildroot
 
@@ -94,12 +93,18 @@
 %{_mandir}/man8/lilo.8*
 %{_mandir}/man8/mkrescue.8*
 %defattr(-,root,root)
-/sbin/mkrescue
-/sbin/lilo
+%{_sbindir}/mkrescue
+%{_sbindir}/lilo
 %{_bindir}/keytab-lilo
 
 
 %changelog
+* Sun Feb  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 22.6.1-1jh
+- 22.6.1
+- fix license
+- don't use crappy make install
+- get rid of nolatex patch
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 22.6-2ts
 - current (22.6-2jh) integrated as 22.6-2ts for release 1.1-U3
 


From svn at tinysofa.org  Sun Feb  6 15:46:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 10:46:17 -0500 (EST)
Subject: [tinysofa-svn] r5838 - in contrib/1.1: . kernel-module-unionfs
	kernel-module-unionfs/current kernel-module-unionfs/current/sources
	kernel-module-unionfs/current/specs
Message-ID: <20050206154617.83B31344415@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 10:45:58 -0500 (Sun, 06 Feb 2005)
New Revision: 5838

Added:
   contrib/1.1/kernel-module-unionfs/
   contrib/1.1/kernel-module-unionfs/current/
   contrib/1.1/kernel-module-unionfs/current/sources/
   contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8-makefile.patch
   contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8.tar.gz
   contrib/1.1/kernel-module-unionfs/current/specs/
   contrib/1.1/kernel-module-unionfs/current/specs/kernel-module-unionfs.spec
   contrib/1.1/kernel-module-unionfs/pristine/
   contrib/1.1/kernel-module-unionfs/releases/
Log:
new in contrib

Added: contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8-makefile.patch
===================================================================
--- contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8-makefile.patch	2005-02-06 15:17:30 UTC (rev 5837)
+++ contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8-makefile.patch	2005-02-06 15:45:58 UTC (rev 5838)
@@ -0,0 +1,26 @@
+--- unionfs-1.0.8/Makefile.orig	2005-02-06 14:36:12.000000000 +0100
++++ unionfs-1.0.8/Makefile	2005-02-06 14:36:34.000000000 +0100
+@@ -75,16 +75,16 @@
+ 
+ ${unionfs-objs}: unionfs.h fist.h
+ 
+-install: all
++install:
+ 	mkdir -p ${PREFIX}/sbin
+ 	cp unionctl ${PREFIX}/sbin
+ 	cp uniondbg ${PREFIX}/sbin
+-	mkdir -p ${PREFIX}/man/man4
+-	mkdir -p ${PREFIX}/man/man8
+-	cp man/unionfs.4 ${PREFIX}/man/man4
+-	cp man/unionctl.8 ${PREFIX}/man/man8
+-	cp man/uniondbg.8 ${PREFIX}/man/man8
+-	if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi
++	mkdir -p ${MANDIR}/man4
++	mkdir -p ${MANDIR}/man8
++	cp man/unionfs.4 ${MANDIR}/man4
++	cp man/unionctl.8 ${MANDIR}/man8
++	cp man/uniondbg.8 ${MANDIR}/man8
++#	if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi
+ 
+ 
+ release: unionfs-${VERSION}.tar.gz

Added: contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/kernel-module-unionfs/current/sources/unionfs-1.0.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/kernel-module-unionfs/current/specs/kernel-module-unionfs.spec
===================================================================
--- contrib/1.1/kernel-module-unionfs/current/specs/kernel-module-unionfs.spec	2005-02-06 15:17:30 UTC (rev 5837)
+++ contrib/1.1/kernel-module-unionfs/current/specs/kernel-module-unionfs.spec	2005-02-06 15:45:58 UTC (rev 5838)
@@ -0,0 +1,52 @@
+%define realname unionfs
+
+%if %{?kversion:0}%{!?kversion:1}
+%define kversion %(uname -r)
+%endif
+
+Summary: A Stackable Unification File System
+Name: 		kernel-module-%{realname}
+Version: 	1.0.8
+Release: 	1gd
+License:        GNU GPL
+Group: 		contrib
+Source0: 	%{realname}-%{version}.tar.gz
+Patch0:		%{realname}-%{version}-makefile.patch
+BuildRoot: 	/var/tmp/%{name}-%{version}-root
+URL:            http://www.filesystems.org/project-unionfs.html
+Requires: kernel = %{kversion}
+BuildRequires: kernel = %{kversion}
+
+%description
+This project builds a stackable unification file system, which can appear to merge the contents of several directories (branches), while keeping their physical content separate. Unionfs is useful for unified source tree management, merged contents of split CD-ROM, merged separate software package directories, data grids, and more. Unionfs allows any mix of read-only and read-write branches, as well as insertion and deletion of branches anywhere in the fan-out. To maintain unix semantics, Unionfs handles elimination of duplicates, partial-error conditions, and more. Unionfs is part of the larger FiST project.
+
+%prep 
+%setup -q -n %{realname}-%{version}
+%patch -p1 -b .make~
+
+%build
+%make KERNELVERSION=2.6 LINUXSRC=/lib/modules/%{kversion}/build
+
+%install
+# we install the module ourself, because we can't say
+# make to use a relative directory
+mkdir -p $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/fs
+install -m 744 unionfs.ko $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/fs
+
+%makeinstall KVERSION=2.6 \
+             PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+             MANDIR=$RPM_BUILD_ROOT%{_mandir}
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README 
+%{_sbindir}/*
+%{_mandir}/*
+/lib/modules/%{kversion}/kernel/fs/*
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.8-1gd
+- new in tinysofa contrib


From svn at tinysofa.org  Sun Feb  6 16:08:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 11:08:59 -0500 (EST)
Subject: [tinysofa-svn] r5839 - in contrib/1.1: . freeze freeze/current
	freeze/current/sources freeze/current/specs
Message-ID: <20050206160859.356BE344415@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 11:08:44 -0500 (Sun, 06 Feb 2005)
New Revision: 5839

Added:
   contrib/1.1/freeze/
   contrib/1.1/freeze/current/
   contrib/1.1/freeze/current/sources/
   contrib/1.1/freeze/current/sources/freeze-2.5.0.tar.gz
   contrib/1.1/freeze/current/sources/freeze-2.5.patch
   contrib/1.1/freeze/current/specs/
   contrib/1.1/freeze/current/specs/freeze.spec
   contrib/1.1/freeze/pristine/
   contrib/1.1/freeze/releases/
Log:
new in contrib

Added: contrib/1.1/freeze/current/sources/freeze-2.5.0.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/freeze/current/sources/freeze-2.5.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/freeze/current/sources/freeze-2.5.patch
===================================================================
--- contrib/1.1/freeze/current/sources/freeze-2.5.patch	2005-02-06 15:45:58 UTC (rev 5838)
+++ contrib/1.1/freeze/current/sources/freeze-2.5.patch	2005-02-06 16:08:44 UTC (rev 5839)
@@ -0,0 +1,72 @@
+--- ./Makefile.in.orig	Thu May 20 11:05:34 1999
++++ ./Makefile.in	Sat Apr 14 22:34:24 2001
+@@ -20,7 +20,7 @@
+ # Added the prefix macro, so that it was easier to change installation place.
+ prefix        = /usr/local
+ DEST          = $(prefix)/bin
+-MANDEST       = $(prefix)/man/man1
++MANDEST       = $(prefix)/share/man/man1
+ SEC           = 1
+ 
+ HDRS          = bitio.h\
+@@ -34,7 +34,7 @@
+ # e.g. -DDEFFILE=\"/etc/default/freeze\"
+ # !!!! NOTE !!!! default is now $(prefix)/lib/freeze.cnf !!!!!
+ 
+-OPTIONS       = -DDEFFILE=\"$(prefix)/lib/freeze.cnf\"
++OPTIONS       = -DDEFFILE=\"/etc/freeze.cnf\"
+ 
+ LINTFLAGS     = -DDEBUG -DGATHER_STAT -x -h
+ 
+@@ -101,18 +101,18 @@
+ 
+ $(DEST)/freeze: freeze
+ 		$(INSTALL_PROGRAM) freeze $@
+-		-ln -sf $@ $(DEST)/melt
+-		-ln -sf $@ $(DEST)/unfreeze
+-		-ln -sf $@ $(DEST)/fcat
++		-ln -sf `basename $@` $(DEST)/melt
++		-ln -sf `basename $@` $(DEST)/unfreeze
++		-ln -sf `basename $@` $(DEST)/fcat
+ 
+ $(DEST)/statist: statist
+ 		$(INSTALL_PROGRAM) statist $@
+ 
+ $(MANDEST)/freeze.$(SEC): freeze.1
+ 		$(INSTALL_DATA) $(srcdir)/freeze.1 $@
+-		-ln -sf $@ $(MANDEST)/melt.$(SEC)
+-		-ln -sf $@ $(MANDEST)/unfreeze.$(SEC)
+-		-ln -sf $@ $(MANDEST)/fcat.$(SEC)
++		-ln -sf `basename $@` $(MANDEST)/melt.$(SEC)
++		-ln -sf `basename $@` $(MANDEST)/unfreeze.$(SEC)
++		-ln -sf `basename $@` $(MANDEST)/fcat.$(SEC)
+ # This is much better for places which keep preformated manpages.
+ #		echo ".so man1/freeze.$(SEC)" > $(MANDEST)/melt.$(SEC)
+ #		echo ".so man1/freeze.$(SEC)" > $(MANDEST)/unfreeze.$(SEC)
+--- ./statist.1.orig	Thu May 20 11:05:34 1999
++++ ./statist.1	Sat Apr 14 22:32:26 2001
+@@ -102,11 +102,8 @@
+ percentiles and sigma) are FYI only.
+ .PP
+ You may create the 
+-.IR /etc/default/freeze
+-file (if you don't like
+-.IR /etc/default/
+-directory, choose another - in MS-DOS it is FREEZE.CNF in
+-the directory of FREEZE.EXE), which has the following format:
++.IR /etc/freeze.cnf
++file, which has the following format:
+ .in +8
+ .I name
+ =
+--- ./freeze.1.orig	Thu May 20 11:05:34 1999
++++ ./freeze.1	Sat Apr 14 22:32:26 2001
+@@ -109,7 +109,7 @@
+ of following files in the command string. An explicite definition
+ of the file's type can give up to 2% of additional compression.
+ The list of types is stored in file
+-.IR /usr/local/lib/freeze.cnf .
++.IR /etc/freeze.cnf .
+ Types may be abbreviated while not ambigious. You can also determine
+ values for the static Huffman table by using a list of 8 numbers
+ separated by commas instead of

Added: contrib/1.1/freeze/current/specs/freeze.spec
===================================================================
--- contrib/1.1/freeze/current/specs/freeze.spec	2005-02-06 15:45:58 UTC (rev 5838)
+++ contrib/1.1/freeze/current/specs/freeze.spec	2005-02-06 16:08:44 UTC (rev 5839)
@@ -0,0 +1,54 @@
+Summary: Freeze archiver and compressor
+Name: freeze
+Version: 2.5.0
+Release: 16gd
+Source: ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}-%{version}.tar.gz
+License: distributable 
+Group: contrib
+Patch: freeze-2.5.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+Freeze is an old file compressor and decompressor that is not in
+common use anymore, but can be useful if the need ever arises to
+dearchive files compressed with it.
+
+%prep
+%setup
+%patch -p1 -b .orig
+
+%build
+%configure
+%make
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+%makeinstall
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc README
+%{_bindir}/freeze
+%{_bindir}/unfreeze
+%{_bindir}/melt
+%{_bindir}/fcat
+%{_bindir}/statist
+%{_mandir}/man1/freeze.1.gz
+%{_mandir}/man1/unfreeze.1.gz
+%{_mandir}/man1/melt.1.gz
+%{_mandir}/man1/fcat.1.gz
+%{_mandir}/man1/statist.1.gz
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 2.5.0-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Mon Feb 23 2004 Gerald Dachs <gda at trustix dot org> 2.5.0-1gd
+- Initial build for Trustix Contrib 


From svn at tinysofa.org  Sun Feb  6 16:38:20 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 11:38:20 -0500 (EST)
Subject: [tinysofa-svn] 
	r5840 - in contrib/1.1: . cabextract cabextract/current
	cabextract/current/sources cabextract/current/specs
Message-ID: <20050206163820.4174734442B@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 11:37:56 -0500 (Sun, 06 Feb 2005)
New Revision: 5840

Added:
   contrib/1.1/cabextract/
   contrib/1.1/cabextract/current/
   contrib/1.1/cabextract/current/sources/
   contrib/1.1/cabextract/current/sources/cabextract-1.1.tar.gz
   contrib/1.1/cabextract/current/specs/
   contrib/1.1/cabextract/current/specs/cabextract.spec
   contrib/1.1/cabextract/pristine/
   contrib/1.1/cabextract/releases/
Log:
new in contrib

Added: contrib/1.1/cabextract/current/sources/cabextract-1.1.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/cabextract/current/sources/cabextract-1.1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/cabextract/current/specs/cabextract.spec
===================================================================
--- contrib/1.1/cabextract/current/specs/cabextract.spec	2005-02-06 16:08:44 UTC (rev 5839)
+++ contrib/1.1/cabextract/current/specs/cabextract.spec	2005-02-06 16:37:56 UTC (rev 5840)
@@ -0,0 +1,58 @@
+Summary: Program to extract Microsoft Cabinet files
+Name: cabextract
+Version: 1.1
+Release: 1gd
+License: GPL
+Group: contrib
+URL: http://www.kyz.uklinux.net/cabextract.php3
+Source: http://www.kyz.uklinux.net/downloads/cabextract-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+Cabinet (.CAB) files are a form of archive, which Microsoft use to
+distribute their software, and things like Windows Font Packs. The
+cabextract program simply unpacks such files.
+
+
+%prep
+%setup
+
+
+%build
+%configure
+%make
+
+
+%install
+%makeinstall
+
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog NEWS README
+%{_bindir}/*
+%{_mandir}/man?/*
+
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 1.1-1gd
+- new in tinysofa contrib
+
+* Mon Oct 18 2004 Matthias Saou <http://freshrpms.net/> 1.1-1
+- Update to 1.1.
+
+* Mon Mar 15 2004 Matthias Saou <http://freshrpms.net/> 1.0-1
+- Update to 1.0.
+
+* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 0.6-3
+- Rebuild for Fedora Core 1.
+
+* Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
+- Rebuilt for Red Hat Linux 9.
+
+* Tue Jan  7 2003 Matthias Saou <http://freshrpms.net/>
+- Initial RPM release.
+


From svn at tinysofa.org  Sun Feb  6 17:45:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 12:45:34 -0500 (EST)
Subject: [tinysofa-svn] r5842 - in contrib/1.1: . ripole ripole/current
	ripole/current/sources ripole/current/specs
Message-ID: <20050206174534.BD80E344433@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 12:45:21 -0500 (Sun, 06 Feb 2005)
New Revision: 5842

Added:
   contrib/1.1/ripole/
   contrib/1.1/ripole/current/
   contrib/1.1/ripole/current/sources/
   contrib/1.1/ripole/current/sources/ripole-0.1.4.tar.gz
   contrib/1.1/ripole/current/specs/
   contrib/1.1/ripole/current/specs/ripole.spec
   contrib/1.1/ripole/pristine/
   contrib/1.1/ripole/releases/
Log:
new in contrib

Added: contrib/1.1/ripole/current/sources/ripole-0.1.4.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/ripole/current/sources/ripole-0.1.4.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/ripole/current/specs/ripole.spec
===================================================================
--- contrib/1.1/ripole/current/specs/ripole.spec	2005-02-06 16:43:54 UTC (rev 5841)
+++ contrib/1.1/ripole/current/specs/ripole.spec	2005-02-06 17:45:21 UTC (rev 5842)
@@ -0,0 +1,38 @@
+Summary: pulls out attachments from OLE2 data files
+Name: ripole
+Version: 0.1.4
+Release: 1gd
+License: BSD
+Group: contrib
+URL: http://www.pldaniels.com/ripole/
+Source: http://www.pldaniels.com/ripole/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+ripOLE is a small program/library designed to pull out attachments from OLE2 data files (ie, MS Office documents). ripOLE is BSD licenced meaning that commercial projects can also use the code without worry of licence costs or legal liabilities.
+
+%prep
+%setup
+
+
+%build
+%make
+
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 ripole $RPM_BUILD_ROOT%{_bindir}
+
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGELOG CONTRIBUTORS INSTALL TODO LICENSE README
+%{_bindir}/*
+
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 1.1-1gd
+- new in tinysofa contrib


From svn at tinysofa.org  Sun Feb  6 18:09:04 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 13:09:04 -0500 (EST)
Subject: [tinysofa-svn] r5844 - contrib/1.1/amavisd-new/current/sources
Message-ID: <20050206180904.3DDCF3443C4@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 13:08:57 -0500 (Sun, 06 Feb 2005)
New Revision: 5844

Modified:
   contrib/1.1/amavisd-new/current/sources/amavisd.conf
Log:
config updated

Modified: contrib/1.1/amavisd-new/current/sources/amavisd.conf
===================================================================
--- contrib/1.1/amavisd-new/current/sources/amavisd.conf	2005-02-06 18:03:23 UTC (rev 5843)
+++ contrib/1.1/amavisd-new/current/sources/amavisd.conf	2005-02-06 18:08:57 UTC (rev 5844)
@@ -17,7 +17,7 @@
 $daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis)
 $daemon_group = 'amavis';     # (no default;  customary: vscan or amavis)
 
-$mydomain = 'host.example.com';   # a convenient default for other settings
+$mydomain = 'example.com';   # a convenient default for other settings
 
 #$MYHOME   = '/var/amavis';   # a convenient default for other settings
 $TEMPBASE = "$MYHOME";   


From svn at tinysofa.org  Sun Feb  6 21:34:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 16:34:51 -0500 (EST)
Subject: [tinysofa-svn] r5845 - in contrib/1.1: . usbutils usbutils/current
	usbutils/current/sources usbutils/current/specs
Message-ID: <20050206213451.B2F0B34443E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 16:34:26 -0500 (Sun, 06 Feb 2005)
New Revision: 5845

Added:
   contrib/1.1/usbutils/
   contrib/1.1/usbutils/current/
   contrib/1.1/usbutils/current/sources/
   contrib/1.1/usbutils/current/sources/usbutils-0.11.tar.gz
   contrib/1.1/usbutils/current/specs/
   contrib/1.1/usbutils/current/specs/usbutils.spec
   contrib/1.1/usbutils/pristine/
   contrib/1.1/usbutils/releases/
Log:
new in contrib

Added: contrib/1.1/usbutils/current/sources/usbutils-0.11.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/usbutils/current/sources/usbutils-0.11.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/usbutils/current/specs/usbutils.spec
===================================================================
--- contrib/1.1/usbutils/current/specs/usbutils.spec	2005-02-06 18:08:57 UTC (rev 5844)
+++ contrib/1.1/usbutils/current/specs/usbutils.spec	2005-02-06 21:34:26 UTC (rev 5845)
@@ -0,0 +1,74 @@
+Name:		usbutils
+Version:	0.11
+Release:        1gd
+Source:		http://usb.cs.tum.edu/download/%{name}-%{version}.tar.gz
+Copyright:	GNU GPL
+Buildroot: 	/tmp/%{name}-%{version}-root
+ExclusiveOS: 	Linux
+Summary: Linux USB utilities.
+Group: contrib
+Requires: /sbin/ldconfig
+
+%description
+This package contains an utility for inspecting
+devices connected to an USB bus.
+
+It requires kernel version 2.3.99-pre7 or newer (supporting
+the /proc/bus/usb interface).
+
+%package devel
+Summary: Build environment for usbutils
+Group: contrib
+Requires: %{name} = %{version}
+
+%description devel
+Includes the files used to build applications with usbutils.
+
+%prep
+%setup -q
+
+%build
+%configure
+%make
+
+%install
+%makeinstall
+
+%clean
+%clean_buildroot
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+%{_sbindir}/*
+%{_mandir}/man8/*
+%config %{_datadir}/usb.ids
+%{_libdir}/*.so.*
+%{_libdir}/*.la
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+%files devel
+%defattr(-, root, root)
+%{_prefix}/include/*
+%{_libdir}/*.a
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 0.11-1gd
+- new int tinysofa contrib
+
+* Mon Jun 17 2002 Thomas Sailer <t.sailer at alumni.ethz.ch>
+- rev 0.10
+- Patch from Ambrose Li <a.c.li at ieee.org>
+
+* Fri Nov 23 2001 Thomas Sailer <t.sailer at alumni.ethz.ch>
+- rev 0.9
+- no longer package usbmodules, as it conflicts with hotplug from RedHat 7.2
+
+* Tue Jun 12 2001 Thomas Sailer <t.sailer at alumni.ethz.ch>
+- rev 0.8
+
+* Tue Sep 14 1999 Thomas Sailer <sailer at ife.ee.ethz.ch>
+- Initial build


From svn at tinysofa.org  Sun Feb  6 22:24:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Feb 2005 17:24:24 -0500 (EST)
Subject: [tinysofa-svn] r5846 - in contrib/1.1: . hotplug hotplug/current
	hotplug/current/sources hotplug/current/specs
Message-ID: <20050206222424.00C9F344463@minbar.tinysofa.org>

Author: gda
Date: 2005-02-06 17:24:09 -0500 (Sun, 06 Feb 2005)
New Revision: 5846

Added:
   contrib/1.1/hotplug/
   contrib/1.1/hotplug/current/
   contrib/1.1/hotplug/current/sources/
   contrib/1.1/hotplug/current/sources/hotplug-2004_03_29.tar.gz
   contrib/1.1/hotplug/current/sources/hotplug.init
   contrib/1.1/hotplug/current/specs/
   contrib/1.1/hotplug/current/specs/hotplug.spec
   contrib/1.1/hotplug/pristine/
   contrib/1.1/hotplug/releases/
Log:
new in contrib; something for base?

Added: contrib/1.1/hotplug/current/sources/hotplug-2004_03_29.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/hotplug/current/sources/hotplug-2004_03_29.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/hotplug/current/sources/hotplug.init
===================================================================
--- contrib/1.1/hotplug/current/sources/hotplug.init	2005-02-06 21:34:26 UTC (rev 5845)
+++ contrib/1.1/hotplug/current/sources/hotplug.init	2005-02-06 22:24:09 UTC (rev 5846)
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# hotplug This scripts starts hotpluggable subsystems.
+#
+# chkconfig: - 01 99
+# description:	Starts and stops each hotpluggable subsystem. \
+#		On startup, may simulate hotplug events for devices \
+#		that were present at boot time, before filesystems \
+#		(or other resources) used by hotplug agents were available.
+#
+# $Id: hotplug,v 1.3 2002/12/03 02:01:48 dbrownell Exp $
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# source function library
+. /etc/init.d/functions
+
+case "$1" in
+    start|restart|status)
+	for RC in /etc/hotplug/*.rc
+	do
+	    $RC $1
+	done
+	touch /var/lock/subsys/hotplug
+	;;
+    stop)
+	for RC in /etc/hotplug/*.rc
+        do
+            $RC stop
+        done
+        rm -f /var/lock/subsys/hotplug
+        ;;
+    force-reload)
+	for RC in /etc/hotplug/*.rc
+        do
+            $RC stop
+        done
+	for RC in /etc/hotplug/*.rc
+        do
+            $RC start
+        done
+        rm -f /var/lock/subsys/hotplug
+        ;;
+    condrestart|try-restart)
+	test -f /var/lock/subsys/hotplug && $0 restart || :
+	;;
+    *)
+	echo $"Usage: $0 {start|stop|restart|status|force_reload|condrestart|try-restart}"
+	exit 3
+	;;
+esac


Property changes on: contrib/1.1/hotplug/current/sources/hotplug.init
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/1.1/hotplug/current/specs/hotplug.spec
===================================================================
--- contrib/1.1/hotplug/current/specs/hotplug.spec	2005-02-06 21:34:26 UTC (rev 5845)
+++ contrib/1.1/hotplug/current/specs/hotplug.spec	2005-02-06 22:24:09 UTC (rev 5846)
@@ -0,0 +1,111 @@
+Summary:		Linux Hotplug Scripts
+Name:			hotplug
+Version:		2004_03_29
+Release:		1gd
+Group:			contrib
+License:		GPL
+Url:			http://linux-hotplug.sourceforge.net/
+Source0:		%{name}-%{version}.tar.gz
+Source1:		%{name}.init
+BuildRoot:		%{_tmppath}/%{name}-root
+BuildArchitectures:	noarch
+Prereq:			/sbin/chkconfig
+Requires:		%{name}-base >= %{version}
+%service_requires
+Requires:		usbutils
+
+%package base
+Summary:		Base /sbin/hotplug multiplexer script
+Group:			contrib
+License:		GPL
+
+%description
+This package contains the scripts necessary for hotplug Linux support.
+
+%description base
+This package contains the base /sbin/hotplug script that allows other programs
+to be executed when /sbin/hotplug is called
+
+
+%prep
+%setup -q
+
+#%build
+# Build any compiled programs in the source tree.
+#make all CFLAGS="%optflags"
+
+%install
+make prefix=${RPM_BUILD_ROOT} install
+
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/hotplug
+
+# --
+# The core package contains the directory structure, the main hotplug
+# program, and all the basic infrastructure to make the hotplug process
+# work on the machine.
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%{_initrddir}/*
+%{_sysconfdir}/hotplug/*
+%{_sysconfdir}/hotplug.d/*
+%dir %{_localstatedir}/run/usb
+%dir %{_localstatedir}/log/hotplug
+%{_mandir}/*
+%doc README ChangeLog
+
+%files base
+%defattr(-,root,root)
+/sbin/hotplug
+%dir %{_sysconfdir}/hotplug.d
+
+%post
+%service_post hotplug
+
+%preun
+%service_preun hotplug
+
+%postun
+%service_postun hotplug
+
+%changelog
+* Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 2004_03_29-1gd
+- new in tinysofa contrib
+
+* Tue Mar 26 2002 Greg Kroah-Hartman <greg at kroah.com>
+- moved the fxload program out of the core hotplug package
+
+* Mon Jun 11 2001 Steve Williams <steve at icarus.com>
+- The install process is now in the comon makefile, so that non-
+  rpm installs can work. This spec file thus invokes that install.
+
+* Fri Jun 8 2001 Steve Williams <steve at icarus.com>
+- added the /var/run/usb directory to spec file
+
+* Tue Apr 24 2001 Greg Kroah-Hartman <greg at kroah.com>
+- added the hotplug.8 manpage written by Fumitoshi UKAI <ukai at debian.or.jp>
+
+* Fri Mar 2 2001 Greg Kroah-Hartman <greg at kroah.com>
+- tweaked the post and preun sections to fix problem of hotplug
+  not starting automatically when the package is upgraded.
+
+* Wed Feb 28 2001 Greg Kroah-Hartman <greg at kroah.com>
+- 2001_02_28 release
+
+* Wed Feb 14 2001 Greg Kroah-Hartman <greg at kroah.com>
+- 2001_02_14 release
+
+* Wed Jan 17 2001 Greg Kroah-Hartman <greg at kroah.com>
+- changed specfile based on Chmouel Boudjnah's <chmouel at mandrakesoft.com> comments.
+
+* Tue Jan 16 2001 Greg Kroah-Hartman <greg at kroah.com>
+- tweaked the file locations due to the change in the tarball structure.
+- 2001_01_16 release
+
+* Mon Jan 15 2001 Greg Kroah-Hartman <greg at kroah.com>
+- 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  Mon Feb  7 12:50:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Feb 2005 07:50:39 -0500 (EST)
Subject: [tinysofa-svn] r5847 - contrib/1.1/unace/current/specs
Message-ID: <20050207125039.49234344577@minbar.tinysofa.org>

Author: jh
Date: 2005-02-07 07:50:33 -0500 (Mon, 07 Feb 2005)
New Revision: 5847

Modified:
   contrib/1.1/unace/current/specs/unace.spec
Log:
- add missing defattr

Modified: contrib/1.1/unace/current/specs/unace.spec
===================================================================
--- contrib/1.1/unace/current/specs/unace.spec	2005-02-06 22:24:09 UTC (rev 5846)
+++ contrib/1.1/unace/current/specs/unace.spec	2005-02-07 12:50:33 UTC (rev 5847)
@@ -1,7 +1,7 @@
 Name:         unace
 URL:          http://www.winace.com
 Version:      2.5
-Release: 1ok
+Release: 2jh
 Summary:      ACE archive extractor
 License:      distributable
 Group: contrib
@@ -38,6 +38,7 @@
 chmod 644 licence file_id.diz
 
 %files
+%defattr(-,root,root)
 %ifarch %ix86
 %doc licence file_id.diz
 %else
@@ -46,6 +47,9 @@
 /usr/bin/unace
 
 %changelog
+* Mon Feb  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5-2jh
+- add missing defattr
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 2.5-1ok
 - current (2.5-1ok) integrated as 2.5-1ok
 


From svn at tinysofa.org  Mon Feb  7 17:15:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Feb 2005 12:15:57 -0500 (EST)
Subject: [tinysofa-svn] r5848 - tinysofa/releases/1.2/elfutils/current/specs
Message-ID: <20050207171557.B62613443C4@minbar.tinysofa.org>

Author: jh
Date: 2005-02-07 12:15:35 -0500 (Mon, 07 Feb 2005)
New Revision: 5848

Modified:
   tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec
Log:
- use RPM_OPT_FLAGS


Modified: tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec
===================================================================
--- tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec	2005-02-07 12:50:33 UTC (rev 5847)
+++ tinysofa/releases/1.2/elfutils/current/specs/elfutils.spec	2005-02-07 17:15:35 UTC (rev 5848)
@@ -70,7 +70,7 @@
 %build
 mkdir build-%{_target_platform}
 cd build-%{_target_platform}
-#CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \ # XXX - O3 may cause problems
+CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \
 ../configure \
   --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \


From svn at tinysofa.org  Mon Feb  7 17:59:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Feb 2005 12:59:32 -0500 (EST)
Subject: [tinysofa-svn] r5849 - in contrib/1.1/clamav/current: sources specs
Message-ID: <20050207175932.7C049344549@minbar.tinysofa.org>

Author: gda
Date: 2005-02-07 12:55:36 -0500 (Mon, 07 Feb 2005)
New Revision: 5849

Added:
   contrib/1.1/clamav/current/sources/clamav-0.82.tar.gz
Removed:
   contrib/1.1/clamav/current/sources/clamav-0.81.tar.gz
Modified:
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
new upstream

Deleted: contrib/1.1/clamav/current/sources/clamav-0.81.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/clamav/current/sources/clamav-0.82.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/clamav/current/sources/clamav-0.82.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2005-02-07 17:15:35 UTC (rev 5848)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2005-02-07 17:55:36 UTC (rev 5849)
@@ -1,6 +1,6 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.81
+Version: 0.82
 Release: 1gd
 License: GPL
 Group: contrib
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Mon Feb  7 2005 Gerald Dachs <gda at tinysofa dot org> 0.82-1gd
+- New upstream
+
 * Sat Jan 29 2005 Gerald Dachs <gda at tinysofa dot org> 0.81-1gd
 - New upstream
 


From svn at tinysofa.org  Tue Feb  8 05:35:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Feb 2005 00:35:15 -0500 (EST)
Subject: [tinysofa-svn] 
	r5850 - in tinysofa/releases/1.2/tar/current: sources specs
Message-ID: <20050208053515.4A29C34455D@minbar.tinysofa.org>

Author: jh
Date: 2005-02-08 00:35:00 -0500 (Tue, 08 Feb 2005)
New Revision: 5850

Added:
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003.tar.gz
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- update libarchive to 1.02.003
- flush pipes to avoid broken pipe error messages


Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch	2005-02-07 17:55:36 UTC (rev 5849)
+++ tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch	2005-02-08 05:35:00 UTC (rev 5850)
@@ -0,0 +1,14 @@
+--- ./archive_read_open_file.c.orig	2005-02-07 10:22:23.000000000 +0200
++++ ./archive_read_open_file.c	2005-02-07 11:43:01.000000000 +0200
+@@ -123,7 +123,11 @@
+ 
+ 	(void)a; /* UNUSED */
+ 	/* If a named file was opened, then it needs to be closed. */
++#if 0
+ 	if (*mine->filename != '\0') {
++#else
++	if(1) {
++#endif
+ 		/*
+ 		 * Sometimes, we should flush the input before closing.
+ 		 *   Regular files: faster to just close without flush.

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-07 17:55:36 UTC (rev 5849)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-08 05:35:00 UTC (rev 5850)
@@ -1,3 +1,4 @@
+%define libarchive_version	1.02.003
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
@@ -2,8 +3,9 @@
 Version: 1.01.022
-Release: 2jh
+Release: 3jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
-Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
+Patch1: libarchive-1.02.003-flush.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
@@ -26,15 +28,19 @@
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
 
+pushd libarchive-%{libarchive_version}
+%patch1 -p1 -b .flush~
+popd
 
+
 %build
-pushd libarchive-%{version}
+pushd libarchive-%{libarchive_version}
 %configure --prefix=$PWD
 %make
 popd
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{version}"
-export LDFLAGS="$LDFLAGS -Llibarchive-%{version}"
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{libarchive_version}"
+export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
 %configure
 %make
 
@@ -59,8 +65,12 @@
 
 
 %changelog
+* Mon Feb  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-3jh
+- update libarchive to 1.02.003
+- flush pipes to avoid broken pipe error messages
+
 * Fri Feb  4 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-2jh
-- don't print warning if setlocale returns NULL
+- don't print a warning if setlocale returns NULL
 
 * Sun Jan  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-1jh
 - new upstream


From svn at tinysofa.org  Tue Feb  8 05:57:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Feb 2005 00:57:08 -0500 (EST)
Subject: [tinysofa-svn] r5851 - contrib/1.1/fetchmail/current/specs
Message-ID: <20050208055708.06D79344567@minbar.tinysofa.org>

Author: jh
Date: 2005-02-08 00:57:03 -0500 (Tue, 08 Feb 2005)
New Revision: 5851

Modified:
   contrib/1.1/fetchmail/current/specs/fetchmail.spec
Log:
- add missing defattr

Modified: contrib/1.1/fetchmail/current/specs/fetchmail.spec
===================================================================
--- contrib/1.1/fetchmail/current/specs/fetchmail.spec	2005-02-08 05:35:00 UTC (rev 5850)
+++ contrib/1.1/fetchmail/current/specs/fetchmail.spec	2005-02-08 05:57:03 UTC (rev 5851)
@@ -1,7 +1,7 @@
 Summary: Full-featured POP/IMAP mail retrieval daemon
 Name:    fetchmail
 Version: 6.2.5
-Release: 16gd
+Release: 17jh
 Group: contrib
 URL:     http://www.catb.org/~esr/fetchmail/
 Source:  http://www.catb.org/~esr/fetchmail/%{name}-%{version}.tar.gz
@@ -63,9 +63,13 @@
 %{_mandir}/man1/fetchmail.1*
 
 %files -n fetchmailconf
+%defattr(-,root,root)
 %{_bindir}/fetchmailconf
 
 %changelog
+* Tue Feb  8 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- add missing defattr
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 6.2.5-16gd
 - current (6.2.5-16gd) integrated as 6.2.5-16gd
 


From svn at tinysofa.org  Tue Feb  8 07:50:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Feb 2005 02:50:15 -0500 (EST)
Subject: [tinysofa-svn] 
	r5852 - tinysofa/releases/1.2/cyrus-imapd/current/sources
Message-ID: <20050208075015.8D343344276@minbar.tinysofa.org>

Author: jh
Date: 2005-02-08 02:50:09 -0500 (Tue, 08 Feb 2005)
New Revision: 5852

Modified:
   tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf
Log:
- remove duplicate autocreatequota
- correct a typo


Modified: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf	2005-02-08 05:57:03 UTC (rev 5851)
+++ tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf	2005-02-08 07:50:09 UTC (rev 5852)
@@ -1,6 +1,5 @@
 # server conf
 umask: 077
-autocreatequota: 0
 reject8bit: no
 quotawarn: 90
 timeout: 30
@@ -65,7 +64,7 @@
 # (default = no)
 #autosubscribe_all_sharedfolders: no
 
-# The full path of a file that contains a sieve script.i This script
+# The full path of a file that contains a sieve script. This script
 # automatically becomes a user's initial default sieve filter script. When this
 # option is not defined, no default sieve filter is created. The file must be
 # readable by the cyrus daemon. (default = null)


From svn at tinysofa.org  Tue Feb  8 13:47:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Feb 2005 08:47:43 -0500 (EST)
Subject: [tinysofa-svn] r5853 - tinysofa/releases/1.2/grub/current/sources
Message-ID: <20050208134743.D7D8934447F@minbar.tinysofa.org>

Author: jh
Date: 2005-02-08 08:47:37 -0500 (Tue, 08 Feb 2005)
New Revision: 5853

Modified:
   tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch
Log:
- update the patch slightly


Modified: tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch
===================================================================
--- tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch	2005-02-08 07:50:09 UTC (rev 5852)
+++ tinysofa/releases/1.2/grub/current/sources/grub-0.95-geometry-26kernel.patch	2005-02-08 13:47:37 UTC (rev 5853)
@@ -175,7 +175,7 @@
 +
 +    if(!uname(&uts) && strlen(uts.release) >= 3) {
 +      kernel26_geometry += uts.release[0] > '2';
-+      kernel26_geometry += uts.release[0] >= '2' && uts.release[2] >= '6';
++      kernel26_geometry += uts.release[0] >= '2' && uts.release[1] == '.' && uts.release[2] >= '6';
 +    }
  
      if (ioctl (fd, BLKGETSIZE, &nr))


From svn at tinysofa.org  Tue Feb  8 16:13:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Feb 2005 11:13:50 -0500 (EST)
Subject: [tinysofa-svn] 
	r5854 - tinysofa/releases/1.2/postfix/current/sources
Message-ID: <20050208161350.8B224344422@minbar.tinysofa.org>

Author: jh
Date: 2005-02-08 11:13:43 -0500 (Tue, 08 Feb 2005)
New Revision: 5854

Modified:
   tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.13-sasl-postfix.patch
Log:
- tsl -> tls


Modified: tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.13-sasl-postfix.patch
===================================================================
--- tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.13-sasl-postfix.patch	2005-02-08 13:47:37 UTC (rev 5853)
+++ tinysofa/releases/1.2/postfix/current/sources/postfix-2.0.13-sasl-postfix.patch	2005-02-08 16:13:43 UTC (rev 5854)
@@ -37,9 +37,9 @@
      	pwcheck_method:  auxprop
  
  This will use the SASL password file (default: /etc/sasldb in
-diff -uNr postfix-2.0.13/README_FILES/SASL_README.tsl postfix-2.0.13.bg/README_FILES/SASL_README.tsl
---- postfix-2.0.13/README_FILES/SASL_README.tsl	1970-01-01 01:00:00.000000000 +0100
-+++ postfix-2.0.13.bg/README_FILES/SASL_README.tsl	2003-08-22 00:36:18.000000000 +0200
+diff -uNr postfix-2.0.13/README_FILES/SASL_README.tls postfix-2.0.13.bg/README_FILES/SASL_README.tls
+--- postfix-2.0.13/README_FILES/SASL_README.tls	1970-01-01 01:00:00.000000000 +0100
++++ postfix-2.0.13.bg/README_FILES/SASL_README.tls	2003-08-22 00:36:18.000000000 +0200
 @@ -0,0 +1,39 @@
 +
 +Some Notes on using SASL authentication with Tawie Server Linux
@@ -60,11 +60,11 @@
 +interesting ones:
 +
 +- smtpd_sasl_security_options:
-+    AUTHentication methods to use when tinysofa is not enabled
++    AUTHentication methods to use when TLS is not enabled
 +- smtpd_sasl_tls_security_options:
-+    AUTHentication methods to use when tinysofa is enabled
++    AUTHentication methods to use when TLS is enabled
 +- smtpd_tls_auth_only:
-+    only allow AUTHentication when tinysofa is enabled
++    only allow AUTHentication when TLS is enabled
 +
 +
 +Looks simple, but:


From svn at tinysofa.org  Tue Feb  8 20:13:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Feb 2005 15:13:26 -0500 (EST)
Subject: [tinysofa-svn] r5855 - tinysofa/releases/1.2/bash/current/specs
Message-ID: <20050208201326.305EA3444A2@minbar.tinysofa.org>

Author: jh
Date: 2005-02-08 15:13:19 -0500 (Tue, 08 Feb 2005)
New Revision: 5855

Modified:
   tinysofa/releases/1.2/bash/current/specs/bash.spec
Log:
- BR: autoconf


Modified: tinysofa/releases/1.2/bash/current/specs/bash.spec
===================================================================
--- tinysofa/releases/1.2/bash/current/specs/bash.spec	2005-02-08 16:13:43 UTC (rev 5854)
+++ tinysofa/releases/1.2/bash/current/specs/bash.spec	2005-02-08 20:13:19 UTC (rev 5855)
@@ -59,7 +59,7 @@
 Obsoletes: bash-static <= 2.05.b-15ts
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: perl byacc
+BuildRequires: perl byacc autoconf
 BuildRequires: libtermcap-devel
 
 %description


From svn at tinysofa.org  Wed Feb  9 11:41:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 06:41:49 -0500 (EST)
Subject: [tinysofa-svn] 
	r5856 - tinysofa/releases/1.2/cyrus-imapd/current/sources
Message-ID: <20050209114149.E3F73344548@minbar.tinysofa.org>

Author: jh
Date: 2005-02-09 06:41:43 -0500 (Wed, 09 Feb 2005)
New Revision: 5856

Modified:
   tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf
Log:
- update default config


Modified: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf	2005-02-08 20:13:19 UTC (rev 5855)
+++ tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd.conf	2005-02-09 11:41:43 UTC (rev 5856)
@@ -8,6 +8,13 @@
 sieve_maxscriptsize: 64
 sieve_maxscripts: 5
 
+# This is the hostname visible in the greeting messages of the POP,
+# IMAP and LMTP daemons. If it is unset, then the result returned from
+# gethostname(2) is used. This is also used for sasldb authentication
+# realm.
+#
+#servername: <result returned by gethostname(2)>
+
 # user conf
 postmaster: postmaster
 admins: cyrus
@@ -64,13 +71,6 @@
 # (default = no)
 #autosubscribe_all_sharedfolders: no
 
-# The full path of a file that contains a sieve script. This script
-# automatically becomes a user's initial default sieve filter script. When this
-# option is not defined, no default sieve filter is created. The file must be
-# readable by the cyrus daemon. (default = null)
-#autocreate_sieve_script: /etc/cyrus-imapd/cyrus_sieve_script.txt
-
-
 # Consult the documentation if you wonder how to configure 
 # different authentication methods.
 # If you leave the following line alone, cyrus will try to


From svn at tinysofa.org  Wed Feb  9 12:31:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 07:31:43 -0500 (EST)
Subject: [tinysofa-svn] r5857 - in contrib/1.1/clamav/current: sources specs
Message-ID: <20050209123143.76965344555@minbar.tinysofa.org>

Author: jh
Date: 2005-02-09 07:31:33 -0500 (Wed, 09 Feb 2005)
New Revision: 5857

Modified:
   contrib/1.1/clamav/current/sources/clamd.sh
   contrib/1.1/clamav/current/sources/freshclam.sh
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
- add missing try-restart targets to init scripts

Modified: contrib/1.1/clamav/current/sources/clamd.sh
===================================================================
--- contrib/1.1/clamav/current/sources/clamd.sh	2005-02-09 11:41:43 UTC (rev 5856)
+++ contrib/1.1/clamav/current/sources/clamd.sh	2005-02-09 12:31:33 UTC (rev 5857)
@@ -59,7 +59,7 @@
 	start
 	RETVAL=$?
 	;;
-  condrestart)
+  condrestart|try-restart)
 	test -f /var/lock/subsys/clamd && $0 restart || :
 	RETVAL=$?
 	;;

Modified: contrib/1.1/clamav/current/sources/freshclam.sh
===================================================================
--- contrib/1.1/clamav/current/sources/freshclam.sh	2005-02-09 11:41:43 UTC (rev 5856)
+++ contrib/1.1/clamav/current/sources/freshclam.sh	2005-02-09 12:31:33 UTC (rev 5857)
@@ -70,7 +70,7 @@
   status)
 	status $path
 	;;
-  condrestart)
+  condrestart|try-restart)
   	[ -f /var/lock/subsys/$prog ] && restart || :
 	;;
   *)

Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2005-02-09 11:41:43 UTC (rev 5856)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2005-02-09 12:31:33 UTC (rev 5857)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
 Version: 0.82
-Release: 1gd
+Release: 2jh
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Wed Feb  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.82-2jh
+- add missing try-restart targets to init scripts
+
 * Mon Feb  7 2005 Gerald Dachs <gda at tinysofa dot org> 0.82-1gd
 - New upstream
 


From svn at tinysofa.org  Wed Feb  9 14:52:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 09:52:31 -0500 (EST)
Subject: [tinysofa-svn] 
	r5858 - in tinysofa/releases/1.2/anaconda/current: sources specs
Message-ID: <20050209145231.8F683344427@minbar.tinysofa.org>

Author: jh
Date: 2005-02-09 09:52:22 -0500 (Wed, 09 Feb 2005)
New Revision: 5858

Modified:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- mdadm patch chunksize fix


Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-02-09 12:31:33 UTC (rev 5857)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-02-09 14:52:22 UTC (rev 5858)
@@ -1,5 +1,5 @@
---- anaconda-9.1/fsset.py.mdadm	2005-01-26 08:56:04.000000000 +0200
-+++ anaconda-9.1/fsset.py	2005-01-26 09:07:44.000000000 +0200
+--- anaconda-9.1/fsset.py.mdadm~	2005-02-09 16:23:35.000000000 +0200
++++ anaconda-9.1/fsset.py	2005-02-09 16:26:45.000000000 +0200
 @@ -982,16 +982,40 @@
  
          return raidtab
@@ -45,7 +45,28 @@
              f.close ()
  
          # touch mtab
-@@ -1685,6 +1709,10 @@
+@@ -1640,7 +1664,8 @@
+ 
+     # members is a list of Device based instances that will be
+     # a part of this raid device
+-    def __init__(self, level, members, minor=-1, spares=0, existing=0):
++    def __init__(self, level, members, minor=-1, spares=0, existing=0,
++		chunksize = 64):
+         Device.__init__(self)
+         self.level = level
+         self.members = members
+@@ -1648,6 +1673,10 @@
+         self.numDisks = len(members) - spares
+         self.isSetup = existing
+         self.doLabel = None
++	if chunksize is not None:
++		self.chunksize = chunksize
++	else:
++		self.chunksize = 256
+ 
+         if len(members) < spares:
+             raise RuntimeError, ("you requiested more spare devices "
+@@ -1685,6 +1714,10 @@
              return [ '-R', 'stride=%d' % (self.numDisks * 16) ]
          return []
  
@@ -56,7 +77,7 @@
      def raidTab (self, devPrefix='/dev'):
          entry = ""
          entry = entry + "raiddev		    %s/%s\n" % (devPrefix,
-@@ -1713,18 +1741,21 @@
+@@ -1713,18 +1746,21 @@
          isys.makeDevInode(self.device, node)
  
          if not self.isSetup:

Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-09 12:31:33 UTC (rev 5857)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-09 14:52:22 UTC (rev 5858)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 0.12jh
+Release: 0.13jh
 License: GPL
 Summary: installation program
 Group: development


From svn at tinysofa.org  Wed Feb  9 16:26:41 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 11:26:41 -0500 (EST)
Subject: [tinysofa-svn] 
	r5859 - in contrib/1.1/perl-mail-clamav/current: sources specs
Message-ID: <20050209162641.A09FB344459@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 11:26:30 -0500 (Wed, 09 Feb 2005)
New Revision: 5859

Added:
   contrib/1.1/perl-mail-clamav/current/sources/Mail-ClamAV-0.13.tar.gz
Removed:
   contrib/1.1/perl-mail-clamav/current/sources/Mail-ClamAV-0.11.tar.gz
Modified:
   contrib/1.1/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
new upstream

Deleted: contrib/1.1/perl-mail-clamav/current/sources/Mail-ClamAV-0.11.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-mail-clamav/current/sources/Mail-ClamAV-0.13.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-mail-clamav/current/sources/Mail-ClamAV-0.13.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/1.1/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-02-09 14:52:22 UTC (rev 5858)
+++ contrib/1.1/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2005-02-09 16:26:30 UTC (rev 5859)
@@ -2,8 +2,8 @@
 
 Summary: Perl extension for the clamav virus scanner
 Name: perl-mail-clamav
-Version: 0.11
-Release: 3gd
+Version: 0.13
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %doc Changes INSTALL README
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 0.13-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.11-3gd
 - current (0.11-3gd) integrated as 0.11-3gd
 


From svn at tinysofa.org  Wed Feb  9 19:17:10 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:17:10 -0500 (EST)
Subject: [tinysofa-svn] 
	r5860 - in contrib/1.1: . perl-io-string perl-io-string/current
	perl-io-string/current/sources perl-io-string/current/specs
Message-ID: <20050209191710.5675C344469@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:16:59 -0500 (Wed, 09 Feb 2005)
New Revision: 5860

Added:
   contrib/1.1/perl-io-string/
   contrib/1.1/perl-io-string/current/
   contrib/1.1/perl-io-string/current/sources/
   contrib/1.1/perl-io-string/current/sources/IO-String-1.06.tar.gz
   contrib/1.1/perl-io-string/current/specs/
   contrib/1.1/perl-io-string/current/specs/perl-io-string.spec
   contrib/1.1/perl-io-string/pristine/
   contrib/1.1/perl-io-string/releases/
Log:
new; needed by perl-archive-tar

Added: contrib/1.1/perl-io-string/current/sources/IO-String-1.06.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-io-string/current/sources/IO-String-1.06.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/perl-io-string/current/specs/perl-io-string.spec
===================================================================
--- contrib/1.1/perl-io-string/current/specs/perl-io-string.spec	2005-02-09 16:26:30 UTC (rev 5859)
+++ contrib/1.1/perl-io-string/current/specs/perl-io-string.spec	2005-02-09 19:16:59 UTC (rev 5860)
@@ -0,0 +1,51 @@
+%define perlname IO-String
+
+Summary:The Perl module IO-String
+Name: perl-io-string
+Version: 1.06
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module IO-String.
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc MANIFEST README
+
+%changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.06-1gd
+- new in contrib
+


From svn at tinysofa.org  Wed Feb  9 19:18:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:18:19 -0500 (EST)
Subject: [tinysofa-svn] 
	r5861 - in contrib/1.1/perl-archive-tar/current: sources specs
Message-ID: <20050209191819.A9CB5344469@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:18:08 -0500 (Wed, 09 Feb 2005)
New Revision: 5861

Added:
   contrib/1.1/perl-archive-tar/current/sources/Archive-Tar-1.23.tar.gz
Removed:
   contrib/1.1/perl-archive-tar/current/sources/Archive-Tar-1.10.tar.gz
Modified:
   contrib/1.1/perl-archive-tar/current/specs/perl-archive-tar.spec
Log:
new upstream

Deleted: contrib/1.1/perl-archive-tar/current/sources/Archive-Tar-1.10.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-archive-tar/current/sources/Archive-Tar-1.23.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-archive-tar/current/sources/Archive-Tar-1.23.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-archive-tar/current/specs/perl-archive-tar.spec
===================================================================
--- contrib/1.1/perl-archive-tar/current/specs/perl-archive-tar.spec	2005-02-09 19:16:59 UTC (rev 5860)
+++ contrib/1.1/perl-archive-tar/current/specs/perl-archive-tar.spec	2005-02-09 19:18:08 UTC (rev 5861)
@@ -2,14 +2,15 @@
 
 Summary:The Perl module Archive-Tar.
 Name: perl-archive-tar
-Version: 1.10
-Release: 2gd
+Version: 1.23
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
-Requires: perl = %{perl_version} perl-io-zlib
-BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} perl-io-zlib
+Requires: perl = %{perl_version} perl-io-zlib perl-io-string
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRequires: perl-io-zlib perl-io-string
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
 
@@ -46,6 +47,9 @@
 %doc MANIFEST README
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.23-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.10-2gd
 - current (1.10-2gd) integrated as 1.10-2gd
 


From svn at tinysofa.org  Wed Feb  9 19:23:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:23:12 -0500 (EST)
Subject: [tinysofa-svn] 
	r5862 - in contrib/1.1/perl-convert-uulib/current: sources specs
Message-ID: <20050209192312.AFEEF3443D5@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:22:57 -0500 (Wed, 09 Feb 2005)
New Revision: 5862

Added:
   contrib/1.1/perl-convert-uulib/current/sources/Convert-UUlib-1.04.tar.gz
Removed:
   contrib/1.1/perl-convert-uulib/current/sources/Convert-UUlib-1.03.tar.gz
Modified:
   contrib/1.1/perl-convert-uulib/current/specs/perl-convert-uulib.spec
Log:
new upstream

Deleted: contrib/1.1/perl-convert-uulib/current/sources/Convert-UUlib-1.03.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-convert-uulib/current/sources/Convert-UUlib-1.04.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-convert-uulib/current/sources/Convert-UUlib-1.04.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-convert-uulib/current/specs/perl-convert-uulib.spec
===================================================================
--- contrib/1.1/perl-convert-uulib/current/specs/perl-convert-uulib.spec	2005-02-09 19:18:08 UTC (rev 5861)
+++ contrib/1.1/perl-convert-uulib/current/specs/perl-convert-uulib.spec	2005-02-09 19:22:57 UTC (rev 5862)
@@ -2,8 +2,8 @@
 
 Summary:The Perl module Convert-UUlib.
 Name: perl-convert-uulib
-Version: 1.03
-Release: 2gd
+Version: 1.04
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.04-1gd
+- new upstream version
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.03-2gd
 - current (1.03-2gd) integrated as 1.03-2gd
 


From svn at tinysofa.org  Wed Feb  9 19:28:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:28:51 -0500 (EST)
Subject: [tinysofa-svn] 
	r5863 - in contrib/1.1/perl-io-zlib/current: sources specs
Message-ID: <20050209192851.8793D3443D5@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:28:41 -0500 (Wed, 09 Feb 2005)
New Revision: 5863

Added:
   contrib/1.1/perl-io-zlib/current/sources/IO-Zlib-1.04.tar.gz
Removed:
   contrib/1.1/perl-io-zlib/current/sources/IO-Zlib-1.01.tar.gz
Modified:
   contrib/1.1/perl-io-zlib/current/specs/perl-io-zlib.spec
Log:
new upstream

Deleted: contrib/1.1/perl-io-zlib/current/sources/IO-Zlib-1.01.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-io-zlib/current/sources/IO-Zlib-1.04.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-io-zlib/current/sources/IO-Zlib-1.04.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-io-zlib/current/specs/perl-io-zlib.spec
===================================================================
--- contrib/1.1/perl-io-zlib/current/specs/perl-io-zlib.spec	2005-02-09 19:22:57 UTC (rev 5862)
+++ contrib/1.1/perl-io-zlib/current/specs/perl-io-zlib.spec	2005-02-09 19:28:41 UTC (rev 5863)
@@ -2,8 +2,8 @@
 
 Summary:The Perl module IO-Zlib.
 Name: perl-io-zlib
-Version: 1.01
-Release: 18gd
+Version: 1.04
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %doc ChangeLog MANIFEST README
 
 %changelog
+* Wed Feb  9 2009 Gerald Dachs <gda at tinysofa dot org> 1.04-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.01-18gd
 - current (1.01-18gd) integrated as 1.01-18gd
 


From svn at tinysofa.org  Wed Feb  9 19:33:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:33:18 -0500 (EST)
Subject: [tinysofa-svn] 
	r5864 - in contrib/1.1/perl-digest-perl-md5/current: sources specs
Message-ID: <20050209193318.52DB93443EF@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:33:06 -0500 (Wed, 09 Feb 2005)
New Revision: 5864

Added:
   contrib/1.1/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.8.tar.gz
Removed:
   contrib/1.1/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.6.tar.gz
Modified:
   contrib/1.1/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec
Log:
new upstream

Deleted: contrib/1.1/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.6.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec
===================================================================
--- contrib/1.1/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec	2005-02-09 19:28:41 UTC (rev 5863)
+++ contrib/1.1/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec	2005-02-09 19:33:06 UTC (rev 5864)
@@ -2,8 +2,8 @@
 
 Summary:The Perl module Digest-Perl-MD5.
 Name: perl-digest-perl-md5
-Version: 1.6
-Release: 3gd
+Version: 1.8
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %doc CHANGES INSTALL MANIFEST
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.8-1gd
+- new upstream version
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.6-3gd
 - current (1.6-3gd) integrated as 1.6-3gd
 


From svn at tinysofa.org  Wed Feb  9 19:44:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:44:38 -0500 (EST)
Subject: [tinysofa-svn] 
	r5865 - in contrib/1.1/perl-uri/current: sources specs
Message-ID: <20050209194438.263663443EF@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:44:25 -0500 (Wed, 09 Feb 2005)
New Revision: 5865

Added:
   contrib/1.1/perl-uri/current/sources/URI-1.35.tar.gz
Removed:
   contrib/1.1/perl-uri/current/sources/URI-1.31.tar.gz
Modified:
   contrib/1.1/perl-uri/current/specs/perl-uri.spec
Log:
new upstream

Deleted: contrib/1.1/perl-uri/current/sources/URI-1.31.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-uri/current/sources/URI-1.35.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-uri/current/sources/URI-1.35.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-uri/current/specs/perl-uri.spec
===================================================================
--- contrib/1.1/perl-uri/current/specs/perl-uri.spec	2005-02-09 19:33:06 UTC (rev 5864)
+++ contrib/1.1/perl-uri/current/specs/perl-uri.spec	2005-02-09 19:44:25 UTC (rev 5865)
@@ -2,8 +2,8 @@
 
 Summary: URI - Uniform Resource Identifiers (absolute and relative)
 Name: perl-uri
-Version: 1.31
-Release: 4gd
+Version: 1.35
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %doc Changes README
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.35-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.31-4gd
 - current (1.31-4gd) integrated as 1.31-4gd
 


From svn at tinysofa.org  Wed Feb  9 19:55:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 14:55:28 -0500 (EST)
Subject: [tinysofa-svn] 
	r5866 - in contrib/1.1/perl-html-tagset/current: sources specs
Message-ID: <20050209195528.62C8A3443EF@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 14:55:18 -0500 (Wed, 09 Feb 2005)
New Revision: 5866

Added:
   contrib/1.1/perl-html-tagset/current/sources/HTML-Tagset-3.04.tar.gz
Removed:
   contrib/1.1/perl-html-tagset/current/sources/HTML-Tagset-3.03.tar.gz
Modified:
   contrib/1.1/perl-html-tagset/current/specs/perl-html-tagset.spec
Log:
new upstream

Deleted: contrib/1.1/perl-html-tagset/current/sources/HTML-Tagset-3.03.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-html-tagset/current/sources/HTML-Tagset-3.04.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-html-tagset/current/sources/HTML-Tagset-3.04.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-html-tagset/current/specs/perl-html-tagset.spec
===================================================================
--- contrib/1.1/perl-html-tagset/current/specs/perl-html-tagset.spec	2005-02-09 19:44:25 UTC (rev 5865)
+++ contrib/1.1/perl-html-tagset/current/specs/perl-html-tagset.spec	2005-02-09 19:55:18 UTC (rev 5866)
@@ -2,8 +2,8 @@
 
 Summary: HTML Tagset for perl
 Name: perl-html-tagset
-Version: 3.03
-Release: 18gd
+Version: 3.04
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %doc ChangeLog README
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 3.04-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 3.03-18gd
 - current (3.03-18gd) integrated as 3.03-18gd
 


From svn at tinysofa.org  Wed Feb  9 20:09:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 15:09:55 -0500 (EST)
Subject: [tinysofa-svn] 
	r5867 - in contrib/1.1/perl-test-manifest/current: sources specs
Message-ID: <20050209200955.B7789344463@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 15:09:45 -0500 (Wed, 09 Feb 2005)
New Revision: 5867

Added:
   contrib/1.1/perl-test-manifest/current/sources/Test-Manifest-1.11.tar.gz
Removed:
   contrib/1.1/perl-test-manifest/current/sources/Test-Manifest-0.93.tar.gz
Modified:
   contrib/1.1/perl-test-manifest/current/specs/perl-test-manifest.spec
Log:
new upstream

Deleted: contrib/1.1/perl-test-manifest/current/sources/Test-Manifest-0.93.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-test-manifest/current/sources/Test-Manifest-1.11.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-test-manifest/current/sources/Test-Manifest-1.11.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-test-manifest/current/specs/perl-test-manifest.spec
===================================================================
--- contrib/1.1/perl-test-manifest/current/specs/perl-test-manifest.spec	2005-02-09 19:55:18 UTC (rev 5866)
+++ contrib/1.1/perl-test-manifest/current/specs/perl-test-manifest.spec	2005-02-09 20:09:45 UTC (rev 5867)
@@ -2,7 +2,7 @@
 
 Summary: The Perl module Test-Manifest.
 Name: perl-test-manifest
-Version: 0.93
+Version: 1.11
 Release: 1gd
 License: Artistic, GPL
 Group: contrib
@@ -47,6 +47,9 @@
 %doc Changes
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.11-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.93-1gd
 - current (0.93-1gd) integrated as 0.93-1gd
 


From svn at tinysofa.org  Wed Feb  9 20:24:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 15:24:16 -0500 (EST)
Subject: [tinysofa-svn] r5868 - in contrib/1.1: . perl-business-isbn-data
	perl-business-isbn-data/current
	perl-business-isbn-data/current/sources
	perl-business-isbn-data/current/specs
Message-ID: <20050209202416.6A1E1344463@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 15:24:06 -0500 (Wed, 09 Feb 2005)
New Revision: 5868

Added:
   contrib/1.1/perl-business-isbn-data/
   contrib/1.1/perl-business-isbn-data/current/
   contrib/1.1/perl-business-isbn-data/current/sources/
   contrib/1.1/perl-business-isbn-data/current/sources/Business-ISBN-Data-1.09.tar.gz
   contrib/1.1/perl-business-isbn-data/current/specs/
   contrib/1.1/perl-business-isbn-data/current/specs/perl-business-isbn-data.spec
   contrib/1.1/perl-business-isbn-data/pristine/
   contrib/1.1/perl-business-isbn-data/releases/
Log:
new in contrib

Added: contrib/1.1/perl-business-isbn-data/current/sources/Business-ISBN-Data-1.09.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-business-isbn-data/current/sources/Business-ISBN-Data-1.09.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/perl-business-isbn-data/current/specs/perl-business-isbn-data.spec
===================================================================
--- contrib/1.1/perl-business-isbn-data/current/specs/perl-business-isbn-data.spec	2005-02-09 20:09:45 UTC (rev 5867)
+++ contrib/1.1/perl-business-isbn-data/current/specs/perl-business-isbn-data.spec	2005-02-09 20:24:06 UTC (rev 5868)
@@ -0,0 +1,50 @@
+%define perlname Business-ISBN-Data
+
+Summary: data pack for Business::ISBN
+Name: perl-business-isbn-data
+Version: 1.09
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+data pack for Business::ISBN
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc Changes MANIFEST
+
+%changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.09-1gd
+- new in contrib


From svn at tinysofa.org  Wed Feb  9 20:30:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 15:30:08 -0500 (EST)
Subject: [tinysofa-svn] 
	r5869 - in contrib/1.1/perl-business-isbn/current: sources specs
Message-ID: <20050209203008.4920A3443CF@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 15:29:50 -0500 (Wed, 09 Feb 2005)
New Revision: 5869

Added:
   contrib/1.1/perl-business-isbn/current/sources/Business-ISBN-1.79.tar.gz
Removed:
   contrib/1.1/perl-business-isbn/current/sources/Business-ISBN-1.72.tar.gz
Modified:
   contrib/1.1/perl-business-isbn/current/specs/perl-business-isbn.spec
Log:
new upstream

Deleted: contrib/1.1/perl-business-isbn/current/sources/Business-ISBN-1.72.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-business-isbn/current/sources/Business-ISBN-1.79.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-business-isbn/current/sources/Business-ISBN-1.79.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-business-isbn/current/specs/perl-business-isbn.spec
===================================================================
--- contrib/1.1/perl-business-isbn/current/specs/perl-business-isbn.spec	2005-02-09 20:24:06 UTC (rev 5868)
+++ contrib/1.1/perl-business-isbn/current/specs/perl-business-isbn.spec	2005-02-09 20:29:50 UTC (rev 5869)
@@ -2,18 +2,18 @@
 
 Summary: work with International Standard Book Numbers
 Name: perl-business-isbn
-Version: 1.72
-Release: 2gd
+Version: 1.79
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
-Requires: perl = %{perl_version}
+Requires: perl = %{perl_version} perl-business-isbn
 BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
-BuildRequires: perl-test-manifest
+BuildRequires: perl-test-manifest perl-business-isbn-data
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
-
+ 
 %description
 work with International Standard Book Numbers
 
@@ -47,6 +47,9 @@
 %doc Changes isbns.txt MANIFEST
 
 %changelog
+* Wed Feb  9 2009 tsintegrate <jh at tinysofa dot org> 1.79-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.72-2gd
 - current (1.72-2gd) integrated as 1.72-2gd
 


From svn at tinysofa.org  Wed Feb  9 20:56:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 15:56:43 -0500 (EST)
Subject: [tinysofa-svn] 
	r5870 - in contrib/1.1/perl-mailtools/current: sources specs
Message-ID: <20050209205643.78F2A3443D0@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 15:56:32 -0500 (Wed, 09 Feb 2005)
New Revision: 5870

Added:
   contrib/1.1/perl-mailtools/current/sources/MailTools-1.66.tar.gz
Removed:
   contrib/1.1/perl-mailtools/current/sources/MailTools-1.62.tar.gz
Modified:
   contrib/1.1/perl-mailtools/current/specs/perl-mailtools.spec
Log:
new upstream

Deleted: contrib/1.1/perl-mailtools/current/sources/MailTools-1.62.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-mailtools/current/sources/MailTools-1.66.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-mailtools/current/sources/MailTools-1.66.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-mailtools/current/specs/perl-mailtools.spec
===================================================================
--- contrib/1.1/perl-mailtools/current/specs/perl-mailtools.spec	2005-02-09 20:29:50 UTC (rev 5869)
+++ contrib/1.1/perl-mailtools/current/specs/perl-mailtools.spec	2005-02-09 20:56:32 UTC (rev 5870)
@@ -2,8 +2,8 @@
 
 Summary:The Perl module MailTools.
 Name: perl-mailtools
-Version: 1.62
-Release: 2gd
+Version: 1.66
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %doc ChangeLog README MANIFEST README.demos examples
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.66-1gd
+- new upstream version
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.62-2gd
 - current (1.62-2gd) integrated as 1.62-2gd
 


From svn at tinysofa.org  Wed Feb  9 21:05:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Feb 2005 16:05:50 -0500 (EST)
Subject: [tinysofa-svn] 
	r5871 - in contrib/1.1/perl-net-cidr/current: sources specs
Message-ID: <20050209210550.113763443D0@minbar.tinysofa.org>

Author: gda
Date: 2005-02-09 16:05:40 -0500 (Wed, 09 Feb 2005)
New Revision: 5871

Added:
   contrib/1.1/perl-net-cidr/current/sources/Net-CIDR-0.10.tar.gz
Removed:
   contrib/1.1/perl-net-cidr/current/sources/Net-CIDR-0.09.tar.gz
Modified:
   contrib/1.1/perl-net-cidr/current/specs/perl-net-cidr.spec
Log:
new upstream

Deleted: contrib/1.1/perl-net-cidr/current/sources/Net-CIDR-0.09.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/perl-net-cidr/current/sources/Net-CIDR-0.10.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-net-cidr/current/sources/Net-CIDR-0.10.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/perl-net-cidr/current/specs/perl-net-cidr.spec
===================================================================
--- contrib/1.1/perl-net-cidr/current/specs/perl-net-cidr.spec	2005-02-09 20:56:32 UTC (rev 5870)
+++ contrib/1.1/perl-net-cidr/current/specs/perl-net-cidr.spec	2005-02-09 21:05:40 UTC (rev 5871)
@@ -2,8 +2,8 @@
 
 Summary: Net-CIDR Perl module
 Name: perl-net-cidr
-Version: 0.09
-Release: 3gd
+Version: 0.10
+Release: 1gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %doc Changes README
 
 %changelog
+* Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 0.10-1gd
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.09-3gd
 - current (0.09-3gd) integrated as 0.09-3gd
 


From svn at tinysofa.org  Thu Feb 10 18:38:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Feb 2005 13:38:57 -0500 (EST)
Subject: [tinysofa-svn] 
	r5873 - in tinysofa/releases/1.2/tar/current: sources specs
Message-ID: <20050210183857.B91943441FE@minbar.tinysofa.org>

Author: jh
Date: 2005-02-10 13:38:46 -0500 (Thu, 10 Feb 2005)
New Revision: 5873

Removed:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003.tar.gz
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- update to 1.02.005

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.01.022.tar.gz
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch	2005-02-10 15:51:24 UTC (rev 5872)
+++ tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003-flush.patch	2005-02-10 18:38:46 UTC (rev 5873)
@@ -1,14 +0,0 @@
---- ./archive_read_open_file.c.orig	2005-02-07 10:22:23.000000000 +0200
-+++ ./archive_read_open_file.c	2005-02-07 11:43:01.000000000 +0200
-@@ -123,7 +123,11 @@
- 
- 	(void)a; /* UNUSED */
- 	/* If a named file was opened, then it needs to be closed. */
-+#if 0
- 	if (*mine->filename != '\0') {
-+#else
-+	if(1) {
-+#endif
- 		/*
- 		 * Sometimes, we should flush the input before closing.
- 		 *   Regular files: faster to just close without flush.

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.003.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-10 15:51:24 UTC (rev 5872)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-10 18:38:46 UTC (rev 5873)
@@ -1,15 +1,15 @@
-%define libarchive_version	1.02.003
+%define libarchive_version	1.02.005
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.01.022
+Version: 1.02.005
 Release: 3jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
-Patch1: libarchive-1.02.003-flush.patch
+Patch1: bsdtar-1.02.005-dirent.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -27,12 +27,9 @@
 %prep
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
+%patch1 -p1 -b .dirent~
 
-pushd libarchive-%{libarchive_version}
-%patch1 -p1 -b .flush~
-popd
 
-
 %build
 pushd libarchive-%{libarchive_version}
 %configure --prefix=$PWD
@@ -65,6 +62,9 @@
 
 
 %changelog
+* Thu Feb 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.005-1jh
+- update to 1.02.005
+
 * Mon Feb  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-3jh
 - update libarchive to 1.02.003
 - flush pipes to avoid broken pipe error messages


From svn at tinysofa.org  Thu Feb 10 18:39:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Feb 2005 13:39:31 -0500 (EST)
Subject: [tinysofa-svn] r5874 - tinysofa/releases/1.2/tar/current/sources
Message-ID: <20050210183931.26A92344315@minbar.tinysofa.org>

Author: jh
Date: 2005-02-10 13:39:16 -0500 (Thu, 10 Feb 2005)
New Revision: 5874

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.005.tar.gz
Log:
- sources


Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch	2005-02-10 18:38:46 UTC (rev 5873)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch	2005-02-10 18:39:16 UTC (rev 5874)
@@ -0,0 +1,13 @@
+diff -u bsdtar-1.02.005.orig/tree.c bsdtar-1.02.005/tree.c
+--- bsdtar-1.02.005.orig/tree.c	2005-02-09 04:35:40.000000000 +0200
++++ bsdtar-1.02.005/tree.c	2005-02-10 18:09:25.000000000 +0200
+@@ -103,7 +103,9 @@
+ #define hasLstat 32 /* The lst entry is set. */
+ 
+ 
++#if 0
+ #define HAVE_DIRENT_D_NAMLEN 1
++#endif
+ #ifdef HAVE_DIRENT_D_NAMLEN
+ /* BSD extension; avoids need for a strlen() call. */
+ #define D_NAMELEN(dp)	(dp)->d_namlen

Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.005.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.005.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Thu Feb 10 21:47:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Feb 2005 16:47:14 -0500 (EST)
Subject: [tinysofa-svn] r5875 - tinysofa/releases/1.2/release/current/specs
Message-ID: <20050210214714.6455F55C26C@minbar.tinysofa.org>

Author: jh
Date: 2005-02-10 16:46:04 -0500 (Thu, 10 Feb 2005)
New Revision: 5875

Modified:
   tinysofa/releases/1.2/release/current/specs/release.spec
Log:
- 1.2 actually


Modified: tinysofa/releases/1.2/release/current/specs/release.spec
===================================================================
--- tinysofa/releases/1.2/release/current/specs/release.spec	2005-02-10 18:39:16 UTC (rev 5874)
+++ tinysofa/releases/1.2/release/current/specs/release.spec	2005-02-10 21:46:04 UTC (rev 5875)
@@ -1,11 +1,11 @@
-%define release_name development
+%define release_name 1.2-test1
 %define vendor tinysofa
 %define product classic server
 
 Summary: tinysofa release file
 Name: release
 Version: 1.1.99
-Release: 0jh
+Release: 1jh
 Epoch: 2
 License: GPL
 Group: main


From svn at tinysofa.org  Sat Feb 12 07:27:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 02:27:59 -0500 (EST)
Subject: [tinysofa-svn] 
	r5878 - in tinysofa/releases/1.2/cpio/current: sources specs
Message-ID: <20050212072759.D37CF344515@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 02:27:47 -0500 (Sat, 12 Feb 2005)
New Revision: 5878

Removed:
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-bug56346.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-freebsd.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-i18n-0.1.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-lfs.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-rh.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-time.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5.tar.gz
Modified:
   tinysofa/releases/1.2/cpio/current/specs/cpio.spec
Log:
- update to 2.6 with fix for CAN-1999-1572

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-bug56346.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-bug56346.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-bug56346.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,99 +0,0 @@
-diff -Naur cpio-2.4.2.orig/copyin.c cpio-2.4.2/copyin.c
---- cpio-2.4.2.orig/copyin.c	Wed Aug  8 17:55:32 2001
-+++ cpio-2.4.2/copyin.c	Wed Aug  8 18:02:04 2001
-@@ -34,6 +34,7 @@
- static void defer_copyin ();
- static void create_defered_links ();
- static void create_final_defers ();
-+static struct deferment *remove_last_defered_link ();
- 
- /* Return 16-bit integer I with the bytes swapped.  */
- #define swab_short(i) ((((i) << 8) & 0xff00) | (((i) >> 8) & 0x00ff))
-@@ -513,6 +514,28 @@
- 	    }
- 	}
- 
-+      if (skip_file && file_hdr.c_nlink > 1 && (archive_format == arf_newascii
-+	  || archive_format == arf_crcascii) && file_hdr.c_filesize > 0)
-+	{
-+	  /* see if we have a defered link for this file, and if so,
-+	     use it to instantiate this file */
-+	  struct deferment *defered_header;
-+
-+	  defered_header = remove_last_defered_link(&file_hdr);
-+	  if (defered_header)
-+	    {
-+	      /* restore the old file header (name only!) */
-+	      
-+	      free(file_hdr.c_name);
-+	      file_hdr.c_name = (char *)
-+		xmalloc(strlen(defered_header->header.c_name) + 1);
-+	      strcpy(file_hdr.c_name, defered_header->header.c_name);
-+	      free_deferment(defered_header);
-+	      
-+	      skip_file = FALSE;
-+	    }
-+	}
-+
-       if (skip_file)
- 	{
- 	  tape_toss_input (in_file_des, file_hdr.c_filesize);
-@@ -1284,6 +1307,58 @@
- 	  d = d->next;
- 	}
-     }
-+}
-+
-+/* We're about to skip a file that was not selected to be
-+   copied in by whatever patterns were supplied. However,
-+   this file is multiply linked, and we want to check to see
-+   if we are supposed to copy in any of its links. If we find
-+   one, remove it from the list and return it. I could also
-+   probably return the first header found... */
-+
-+static struct deferment * 
-+remove_last_defered_link (file_hdr)
-+  struct new_cpio_header *file_hdr;
-+{
-+  struct deferment *d, *d_prev, *d_last, *d_last_prev;
-+  int	ino;
-+  int 	maj;
-+  int   min;
-+
-+  ino = file_hdr->c_ino;
-+  maj = file_hdr->c_dev_maj;
-+  min = file_hdr->c_dev_min;
-+  d = deferments;
-+
-+  d_last = NULL;
-+  d_prev = NULL;
-+
-+  while (d != NULL)
-+    {
-+      if ( (d->header.c_ino == ino) && (d->header.c_dev_maj == maj)
-+	  && (d->header.c_dev_min == min) )
-+	{
-+	  d_last = d;
-+	  d_last_prev = d_prev;
-+	}
-+
-+      d_prev = d;
-+      d = d->next;
-+    }
-+
-+  if (d_last)
-+    {
-+      if (d_last_prev == NULL)
-+	{
-+	  deferments = d_last->next;
-+	}
-+      else
-+	{
-+	  d_last_prev->next = d_last->next;
-+	}
-+    }
-+
-+  return d_last;
- }
- 
- /* If we had a multiply linked file that really was empty then we would

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-freebsd.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-freebsd.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.4.2-freebsd.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,392 +0,0 @@
---- cpio-2.4.2/copyin.c.fbsd	Mon Oct  1 13:50:04 2001
-+++ cpio-2.4.2/copyin.c	Mon Oct  1 13:50:05 2001
-@@ -13,6 +13,13 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+#if ((defined(BSD) && (BSD >= 199306)) || defined(__GLIBC__))
-+#define HAVE_STRFTIME
-+#include <ctype.h>
-+#endif
- #include "filetypes.h"
- #include "system.h"
- #include "cpiohdr.h"
-@@ -28,6 +38,9 @@
- #ifndef	FNM_PATHNAME
- #include <fnmatch.h>
- #endif
-+#if defined(HAVE_STRFTIME)
-+#include <langinfo.h>
-+#endif
- 
- /* Debian hack to fix a bug in the --sparse option.  This bug has been
-    reported to "bug-gnu-utils at prep.ai.mit.edu".  (96/7/10) -BEM */
-@@ -969,13 +982,24 @@
- 		  break;
- 		}
- 	      
--	      res = mknod (file_hdr.c_name, file_hdr.c_mode,
--			makedev (file_hdr.c_rdev_maj, file_hdr.c_rdev_min));
-+#ifdef CP_IFIFO
-+	      if ((file_hdr.c_mode & CP_IFMT) == CP_IFIFO)
-+		res = mkfifo (file_hdr.c_name, file_hdr.c_mode);
-+	      else
-+#endif
-+		res = mknod (file_hdr.c_name, file_hdr.c_mode,
-+		      makedev (file_hdr.c_rdev_maj, file_hdr.c_rdev_min));
- 	      if (res < 0 && create_dir_flag)
- 		{
- 		  create_all_directories (file_hdr.c_name);
--		  res = mknod (file_hdr.c_name, file_hdr.c_mode,
--			makedev (file_hdr.c_rdev_maj, file_hdr.c_rdev_min));
-+#ifdef CP_IFIFO
-+		  if ((file_hdr.c_mode & CP_IFMT) == CP_IFIFO)
-+		    res = mkfifo (file_hdr.c_name, file_hdr.c_mode);
-+		  else
-+#endif
-+		    res = mknod (file_hdr.c_name, file_hdr.c_mode,
-+				 makedev (file_hdr.c_rdev_maj,
-+					  file_hdr.c_rdev_min));
- 		}
- 	      if (res < 0)
- 		{
-@@ -1087,12 +1111,31 @@
-   char mbuf[11];
-   char tbuf[40];
-   time_t when;
-+  char *ptbuf;
-+#ifdef HAVE_STRFTIME
-+  static int d_first = -1;
-+#endif
- 
-   mode_string (file_hdr->c_mode, mbuf);
-   mbuf[10] = '\0';
- 
-   /* Get time values ready to print.  */
-   when = file_hdr->c_mtime;
-+#ifdef HAVE_STRFTIME
-+#ifdef __FreeBSD__
-+  if (d_first < 0)
-+	d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
-+#else
-+  d_first = 0;
-+#endif
-+  if (current_time - when > 6L * 30L * 24L * 60L * 60L
-+      || current_time - when < 0L)
-+	ptbuf = d_first ? "%e %b  %Y" : "%b %e  %Y";
-+  else
-+	ptbuf = d_first ? "%e %b %R" : "%b %e %R";
-+  strftime(tbuf, sizeof(tbuf), ptbuf, localtime(&when));
-+  ptbuf = tbuf;
-+#else
-   strcpy (tbuf, ctime (&when));
-   if (current_time - when > 6L * 30L * 24L * 60L * 60L
-       || current_time - when < 0L)
-@@ -1102,8 +1145,10 @@
-       strcpy (tbuf + 11, tbuf + 19);
-     }
-   tbuf[16] = '\0';
-+  ptbuf = tbuf + 4;
-+#endif
- 
--  printf ("%s %3u ", mbuf, file_hdr->c_nlink);
-+  printf ("%s %3lu ", mbuf, file_hdr->c_nlink);
- 
- #ifndef __MSDOS__
-   if (numeric_uid)
-@@ -1117,13 +1162,12 @@
- 
-   if ((file_hdr->c_mode & CP_IFMT) == CP_IFCHR
-       || (file_hdr->c_mode & CP_IFMT) == CP_IFBLK)
--    printf ("%3u, %3u ", file_hdr->c_rdev_maj,
--	    file_hdr->c_rdev_min);
-+    printf ("%3lu, %3lu ", file_hdr->c_rdev_maj, file_hdr->c_rdev_min);
-   else
- #endif
-     printf ("%8lu ", file_hdr->c_filesize);
- 
--  printf ("%s ", tbuf + 4);
-+  printf ("%s ", ptbuf);
- 
-   print_name_with_quoting (file_hdr->c_name);
-   if (link_name)
-@@ -1179,6 +1223,9 @@
- 	  break;
- 
- 	default:
-+#if ((defined(BSD) && BSD >= 199306) || defined(__GLIBC__))
-+	  if (isprint(c))
-+#else
- 	  if (c > 040 &&
- #ifdef __MSDOS__
- 	      c < 0377 && c != 0177
-@@ -1186,6 +1233,7 @@
- 	      c < 0177
- #endif
- 	    )
-+#endif
- 	    putchar (c);
- 	  else
- 	    printf ("\\%03o", (unsigned int) c);
---- cpio-2.4.2/copyout.c.fbsd	Mon Oct  1 13:50:04 2001
-+++ cpio-2.4.2/copyout.c	Mon Oct  1 13:51:21 2001
-@@ -36,6 +36,7 @@
- static void writeout_final_defers();
- static void writeout_defered_file ();
- static void check_for_changed_file ();
-+static int check_rdev ();
- 
- /* Write out header FILE_HDR, including the file name, to file
-    descriptor OUT_DES.  */
-@@ -294,8 +295,32 @@
- 	  file_hdr.c_uid = file_stat.st_uid;
- 	  file_hdr.c_gid = file_stat.st_gid;
- 	  file_hdr.c_nlink = file_stat.st_nlink;
--	  file_hdr.c_rdev_maj = major (file_stat.st_rdev);
--	  file_hdr.c_rdev_min = minor (file_stat.st_rdev);
-+
-+	  /* The rdev is meaningless except for block and character
-+	     special files (POSIX standard) and perhaps fifos and
-+	     sockets.  Clear it for other types of files so that
-+	     check_rdev() doesn't reject files just because stat()
-+	     put garbage in st_rdev and so that the output doesn't
-+	     depend on the garbage.  */
-+	  switch (file_hdr.c_mode & CP_IFMT)
-+	    {
-+	      case CP_IFBLK:
-+	      case CP_IFCHR:
-+#ifdef CP_IFIFO
-+	      case CP_IFIFO:
-+#endif
-+#ifdef CP_IFSOCK
-+	      case CP_IFSOCK:
-+#endif
-+		file_hdr.c_rdev_maj = major (file_stat.st_rdev);
-+		file_hdr.c_rdev_min = minor (file_stat.st_rdev);
-+		break;
-+	      default:
-+	      	file_hdr.c_rdev_maj = 0;
-+		file_hdr.c_rdev_min = 0;
-+		break;
-+	    }
-+
- 	  file_hdr.c_mtime = file_stat.st_mtime;
- 	  file_hdr.c_filesize = file_stat.st_size;
- 	  file_hdr.c_chksum = 0;
-@@ -339,6 +364,23 @@
- 	      continue;
- 	    }
- 
-+	  switch (check_rdev (&file_hdr))
-+	    {
-+	      case 1:
-+		error (0, 0, "%s not dumped: major number would be truncated",
-+		       file_hdr.c_name);
-+		continue;
-+	      case 2:
-+		error (0, 0, "%s not dumped: minor number would be truncated",
-+		       file_hdr.c_name);
-+		continue;
-+	      case 4:
-+		error (0, 0, "%s not dumped: device number would be truncated",
-+		       file_hdr.c_name);
-+		continue;
-+	    }
-+
-+
- 	  /* Copy the named file to the output.  */
- 	  switch (file_hdr.c_mode & CP_IFMT)
- 	    {
-@@ -822,6 +864,102 @@
-   return;
- }
- 
-+
-+static int
-+check_rdev (file_hdr)
-+     struct new_cpio_header *file_hdr;
-+{
-+  if (archive_format == arf_newascii || archive_format == arf_crcascii)
-+    {
-+      if ((file_hdr->c_rdev_maj & 0xFFFFFFFF) != file_hdr->c_rdev_maj)
-+        return 1;
-+      if ((file_hdr->c_rdev_min & 0xFFFFFFFF) != file_hdr->c_rdev_min)
-+        return 2;
-+    }
-+  else if (archive_format == arf_oldascii || archive_format == arf_hpoldascii)
-+    {
-+#ifndef __MSDOS__
-+      dev_t rdev;
-+
-+      rdev = makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min);
-+      if (archive_format == arf_oldascii)
-+	{
-+	  if ((rdev & 0xFFFF) != rdev)
-+	    return 4;
-+	}
-+      else
-+	{
-+	  switch (file_hdr->c_mode & CP_IFMT)
-+	    {
-+	      case CP_IFCHR:
-+	      case CP_IFBLK:
-+#ifdef CP_IFSOCK
-+	      case CP_IFSOCK:
-+#endif
-+#ifdef CP_IFIFO
-+	      case CP_IFIFO:
-+#endif
-+		/* We could handle one more bit if longs are >= 33 bits.  */
-+		if ((rdev & 037777777777) != rdev)
-+		  return 4;
-+		break;
-+	      default:
-+		if ((rdev & 0xFFFF) != rdev)
-+		  return 4;
-+		break;
-+	    }
-+	}
-+#endif
-+    }
-+  else if (archive_format == arf_tar || archive_format == arf_ustar)
-+    {
-+      /* The major and minor formats are limited to 7 octal digits in ustar
-+	 format, and to_oct () adds a gratuitous trailing blank to further
-+	 limit the format to 6 octal digits.  */
-+      if ((file_hdr->c_rdev_maj & 0777777) != file_hdr->c_rdev_maj)
-+        return 1;
-+      if ((file_hdr->c_rdev_min & 0777777) != file_hdr->c_rdev_min)
-+        return 2;
-+    }
-+  else
-+    {
-+#ifndef __MSDOS__
-+      dev_t rdev;
-+
-+      rdev = makedev (file_hdr->c_rdev_maj, file_hdr->c_rdev_min);
-+      if (archive_format != arf_hpbinary)
-+	{
-+	  if ((rdev & 0xFFFF) != rdev)
-+	return 4;
-+    }
-+  else
-+    {
-+      switch (file_hdr->c_mode & CP_IFMT)
-+	{
-+	  case CP_IFCHR:
-+	  case CP_IFBLK:
-+#ifdef CP_IFSOCK
-+	  case CP_IFSOCK:
-+#endif
-+#ifdef CP_IFIFO
-+	  case CP_IFIFO:
-+#endif
-+	    if ((rdev & 0xFFFFFFFF) != rdev)
-+	      return 4;
-+	    file_hdr->c_filesize = rdev;
-+	    rdev = makedev (0, 1);
-+	    break;
-+	  default:
-+	    if ((rdev & 0xFFFF) != rdev)
-+	      return 4;
-+	    break;
-+	}
-+    }
-+#endif
-+  }
-+  return 0;
-+}
-+
- static void
- check_for_changed_file (name, header)
-      char *name;
---- cpio-2.4.2/copypass.c.fbsd	Mon Oct  1 13:50:05 2001
-+++ cpio-2.4.2/copypass.c	Mon Oct  1 13:50:05 2001
-@@ -311,13 +311,23 @@
- 
- 	  if (link_res < 0)
- 	    {
--	      res = mknod (output_name.ds_string, in_file_stat.st_mode,
--			   in_file_stat.st_rdev);
-+#ifdef S_ISFIFO
-+	      if (S_ISFIFO (in_file_stat.st_mode))
-+		res = mkfifo (output_name.ds_string, in_file_stat.st_mode);
-+	      else
-+#endif
-+		res = mknod (output_name.ds_string, in_file_stat.st_mode,
-+			     in_file_stat.st_rdev);
- 	      if (res < 0 && create_dir_flag)
- 		{
- 		  create_all_directories (output_name.ds_string);
--		  res = mknod (output_name.ds_string, in_file_stat.st_mode,
--			       in_file_stat.st_rdev);
-+#ifdef S_ISFIFO
-+		  if (S_ISFIFO (in_file_stat.st_mode))
-+		    res = mkfifo (output_name.ds_string, in_file_stat.st_mode);
-+		  else
-+#endif
-+		    res = mknod (output_name.ds_string, in_file_stat.st_mode,
-+				 in_file_stat.st_rdev);
- 		}
- 	      if (res < 0)
- 		{
---- cpio-2.4.2/main.c.fbsd	Mon Oct  1 13:50:05 2001
-+++ cpio-2.4.2/main.c	Mon Oct  1 13:50:05 2001
-@@ -19,7 +19,13 @@
- #include <stdio.h>
- #include <getopt.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+#if (defined(BSD) && (BSD >= 199306)) || defined(__GLIBC__)
-+#include <locale.h>
-+#endif
- #include "filetypes.h"
- #include "system.h"
- #include "cpiohdr.h"
-@@ -508,13 +516,16 @@
-   bzero (zeros_512, 512);
- }
- 
--void
-+int
- main (argc, argv)
-      int argc;
-      char *argv[];
- {
-   program_name = argv[0];
--  umask (0);
-+
-+#if (defined(BSD) && (BSD >= 199306)) || defined(__GLIBC__)
-+  (void) setlocale (LC_ALL, "");
-+#endif
- 
- #ifdef __TURBOC__
-   _fmode = O_BINARY;		/* Put stdin and stdout in binary mode.  */
-@@ -525,6 +536,7 @@
- #endif
- 
-   process_args (argc, argv);
-+  umask (0);
- 
-   initialize_buffers ();
- 
---- cpio-2.4.2/util.c.fbsd	Mon Oct  1 13:50:05 2001
-+++ cpio-2.4.2/util.c	Mon Oct  1 13:50:05 2001
-@@ -883,9 +883,9 @@
-     fprintf (tty_out, "%s%d%s", new_media_message_with_number, reel_number,
- 	     new_media_message_after_number);
-   else if (archive_name)
--    fprintf (tty_out, "Found end of tape.  Load next tape and press RETURN. ");
-+    fprintf (tty_out, "Found end of volume.  Load next volume and press RETURN. ");
-   else
--    fprintf (tty_out, "Found end of tape.  To continue, type device/file name when ready.\n");
-+    fprintf (tty_out, "Found end of volume.  To continue, type device/file name when ready.\n");
- 
-   fflush (tty_out);
- 

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-i18n-0.1.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-i18n-0.1.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-i18n-0.1.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,20 +0,0 @@
-diff -upN cpio-2.5.orig/main.c cpio-2.5/main.c
---- cpio-2.5.orig/main.c	Thu Aug  8 12:24:05 2002
-+++ cpio-2.5/main.c	Thu Aug  8 12:25:45 2002
-@@ -21,6 +21,7 @@
- 
- #include <stdio.h>
- #include <getopt.h>
-+#include <locale.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "filetypes.h"
-@@ -511,6 +512,8 @@ main (argc, argv)
-      int argc;
-      char *argv[];
- {
-+  setlocale (LC_ALL, "");
-+
-   program_name = argv[0];
-   umask (0);
- 

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-lfs.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-lfs.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-lfs.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,66 +0,0 @@
---- cpio-2.5/util.c.lfs	2004-10-14 16:15:23.000000000 -0500
-+++ cpio-2.5/util.c	2004-10-14 16:21:36.000000000 -0500
-@@ -441,10 +441,10 @@
- copy_files_tape_to_disk (in_des, out_des, num_bytes)
-      int in_des;
-      int out_des;
--     long num_bytes;
-+     off_t num_bytes;
- {
--  long size;
--  long k;
-+  off_t size;
-+  off_t k;
- 
-   while (num_bytes > 0)
-     {
-@@ -474,13 +474,13 @@
- copy_files_disk_to_tape (in_des, out_des, num_bytes, filename)
-      int in_des;
-      int out_des;
--     long num_bytes;
-+     off_t num_bytes;
-      char *filename;
- {
--  long size;
--  long k;
-+  off_t size;
-+  off_t k;
-   int rc;
--  long original_num_bytes;
-+  off_t original_num_bytes;
- 
-   original_num_bytes = num_bytes;
- 
-@@ -524,12 +524,12 @@
- copy_files_disk_to_disk (in_des, out_des, num_bytes, filename)
-      int in_des;
-      int out_des;
--     long num_bytes;
-+     off_t num_bytes;
-      char *filename;
- {
--  long size;
--  long k;
--  long original_num_bytes;
-+  off_t size;
-+  off_t k;
-+  off_t original_num_bytes;
-   int rc;
- 
-   original_num_bytes = num_bytes;
---- cpio-2.5/extern.h.lfs	2004-10-14 16:18:34.000000000 -0500
-+++ cpio-2.5/extern.h	2004-10-14 16:20:43.000000000 -0500
-@@ -164,9 +164,9 @@
- void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes));
- int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes));
- void tape_toss_input P_((int in_des, long num_bytes));
--void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes));
--void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename));
--void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename));
-+void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes));
-+void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename));
-+void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename));
- void warn_if_file_changed P_((char *file_name, unsigned long old_file_size,
-                               unsigned long old_file_mtime));
- void create_all_directories P_((char *name));

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,11 +0,0 @@
---- cpio-2.5/configure.lr	2003-09-12 06:26:31.000000000 -0600
-+++ cpio-2.5/configure	2003-09-12 06:27:20.000000000 -0600
-@@ -1940,7 +1940,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lnsl  $LIBS"
-+LIBS="-lXXXnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1945 "configure"
- #include "confdefs.h"

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-rh.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-rh.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-rh.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,98 +0,0 @@
---- cpio-2.5/cpio.1.rh	2002-11-18 12:23:12.000000000 -0500
-+++ cpio-2.5/cpio.1	2002-11-18 12:24:08.000000000 -0500
-@@ -154,7 +154,8 @@
- Set the I/O block size to BLOCK-SIZE * 512 bytes.
- .TP
- .I "\-c"
--Use the old portable (ASCII) archive format.
-+Identical to "-H newc", use the new (SVR4) portable format.
-+If you wish the old portable (ASCII) archive format, use "-H odc" instead.
- .TP
- .I "\-C IO-SIZE, \-\-io-size=IO-SIZE"
- Set the I/O block size to IO-SIZE bytes.
---- cpio-2.5/main.c.rh	2002-11-18 12:22:36.000000000 -0500
-+++ cpio-2.5/main.c	2002-11-18 12:30:03.000000000 -0500
-@@ -172,6 +172,7 @@
- 	case 'c':		/* Use the old portable ASCII format.  */
- 	  if (archive_format != arf_unknown)
- 	    usage (stderr, 2);
-+#define	SVR4_COMPAT
- #ifdef SVR4_COMPAT
- 	  archive_format = arf_newascii; /* -H newc.  */
- #else
-@@ -531,5 +532,5 @@
-   if (archive_des >= 0 && rmtclose (archive_des) == -1)
-     error (1, errno, "error closing archive");
- 
--  exit (0);
-+  exit (error_count != 0);
- }
---- cpio-2.5/Makefile.in.rh	2002-11-18 12:28:14.000000000 -0500
-+++ cpio-2.5/Makefile.in	2002-11-18 12:28:40.000000000 -0500
-@@ -81,7 +81,8 @@
- infodir = @infodir@
- 
- # Where to put the Unix-style manual pages.
--mandir = @mandir@/man1
-+mandir = @mandir@
-+man1dir = $(mandir)/man1
- # Extension (not including `.') for the Unix-style manual page filenames.
- manext = 1
- 
-@@ -126,16 +127,16 @@
- 	$(INSTALL_PROGRAM) cpio $(bindir)/$(binprefix)cpio
- 	test ! -f mt || $(INSTALL_PROGRAM) mt $(bindir)/$(binprefix)mt
- 	-test ! -f rmt || $(INSTALL_PROGRAM) rmt $(libexecdir)/rmt
--	-$(INSTALL_DATA) $(srcdir)/cpio.1 $(mandir)/$(manprefix)cpio.$(manext)
--	-test ! -f mt || $(INSTALL_DATA) $(srcdir)/mt.1 $(mandir)/$(manprefix)mt.$(manext)
-+	-$(INSTALL_DATA) $(srcdir)/cpio.1 $(man1dir)/$(manprefix)cpio.$(manext)
-+	-test ! -f mt || $(INSTALL_DATA) $(srcdir)/mt.1 $(man1dir)/$(manprefix)mt.$(manext)
- 
- installdirs:
--	$(srcdir)/mkinstalldirs $(bindir) $(libexecdir) $(mandir) $(infodir)
-+	$(srcdir)/mkinstalldirs $(bindir) $(libexecdir) $(man1dir) $(infodir)
- 
- uninstall::
- 	cd $(bindir); rm -f $(binprefix)cpio $(binprefix)mt
- 	-rm -f $(libexecdir)/rmt
--	cd $(mandir); rm -f $(manprefix)cpio.$(manext) $(manprefix)mt.$(manext)
-+	cd $(man1dir); rm -f $(manprefix)cpio.$(manext) $(manprefix)mt.$(manext)
- 
- check:
- 	@echo No tests are supplied.
---- cpio-2.5/extern.h.rh	2002-11-18 12:29:24.000000000 -0500
-+++ cpio-2.5/extern.h	2002-11-18 12:30:03.000000000 -0500
-@@ -85,6 +85,8 @@
- extern char *program_name;
- extern int (*xstat) ();
- extern void (*copy_function) ();
-+
-+extern unsigned int error_count;
- 
- #if __STDC__ || defined(__MSDOS__)
- # define P_(s) s
---- cpio-2.5/error.c.rh	2002-11-18 12:29:36.000000000 -0500
-+++ cpio-2.5/error.c	2002-11-18 12:30:03.000000000 -0500
-@@ -46,6 +46,10 @@
- /* This variable is incremented each time `error' is called.  */
- unsigned int error_message_count;
- 
-+/* This variable is incremented each time `error' is called and
-+   errnum is not zero.  */
-+unsigned int error_count;
-+
- /* If NULL, error will flush stdout, then print on stderr the program
-    name, a colon and a space.  Otherwise, error will call this
-    function without parameters instead.  */
-@@ -122,7 +126,10 @@
-   ++error_message_count;
- 
-   if (errnum)
--    fprintf (stderr, ": %s", strerror (errnum));
-+    {
-+      fprintf (stderr, ": %s", strerror (errnum));
-+      error_count++;
-+    }
-   putc ('\n', stderr);
-   fflush (stderr);
-   if (status)

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-time.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-time.patch	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-time.patch	2005-02-12 07:27:47 UTC (rev 5878)
@@ -1,11 +0,0 @@
---- cpio-2.5/tar.c.time	2001-12-06 04:55:34.000000000 +0000
-+++ cpio-2.5/tar.c	2004-11-09 10:55:36.541496352 +0000
-@@ -431,7 +431,7 @@
-      register char *where;
- {
-   --digits;			/* Leave the trailing NUL slot alone.  */
--  where[--digits] = ' ';	/* Put in the space, though.  */
-+  /*where[--digits] = ' ';*/	/* Put in the space, though.  */
- 
-   /* Produce the digits -- at least one.  */
-   do

Deleted: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/cpio/current/specs/cpio.spec
===================================================================
--- tinysofa/releases/1.2/cpio/current/specs/cpio.spec	2005-02-12 07:06:33 UTC (rev 5877)
+++ tinysofa/releases/1.2/cpio/current/specs/cpio.spec	2005-02-12 07:27:47 UTC (rev 5878)
@@ -3,21 +3,18 @@
 
 Summary: A GNU archiving program.
 Name: cpio
-Version: 2.5
-Release: 12ts
+Version: 2.6
+Release: 1jh
 License: GPL
 Group: main
-URL: ftp://ftp.gnu.org/pub/gnu/cpio/
-Source: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.tar.gz
-Patch0: cpio-2.5-rh.patch
-Patch10: cpio-2.4.2-freebsd.patch
-Patch11: cpio-2.4.2-bug56346.patch
-Patch12: cpio-2.5-i18n-0.1.patch
+URL: http://www.gnu.org/software/cpio/
+Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.gz
+Patch0: cpio-2.6-rh.patch
 Patch13: cpio-2.5-nolibnsl.patch
-Patch14: cpio-2.5-lfs.patch
-Patch15: cpio-2.5-time.patch
-#info_requires
-BuildRequires: texinfo
+Patch14: cpio-2.6-lfs.patch
+Patch16: cpio-2.6-lstat.patch
+Patch17: cpio-2.6-umask.patch
+BuildRequires: texinfo autoconf
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -38,13 +35,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .rh
-#%patch10 -p1 -b .fbsd
-#%patch11 -p1 -b .multilink
-%patch12 -p1 -b .i18n
 %patch13 -p1 -b .nolibnsl
 %patch14 -p1 -b .lfs
-%patch15 -p1 -b .time
+%patch16 -p1 -b .lstat
+%patch17 -p1 -b .umask
 
+autoheader
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" %configure
@@ -54,11 +50,10 @@
 %install
 %makeinstall
 
-#install_info cpio.texi
-
 # delete unpackaged files
 cd %{buildroot}
 rm -f .%{_bindir}/mt .%{_mandir}/man1/mt.1 ./%{_libexecdir}/rmt
+rm -fr .%{_datadir}/locale
 cd -
 %nuke_info
 
@@ -67,22 +62,17 @@
 %clean_buildroot
 
 
-#post
-#info_post
-
-#postun
-#info_postun
-
-
 %files
 %defattr(-,root,root)
 %doc README NEWS
 %{_bindir}/*
 %{_mandir}/man*/*
-#{_htmldir}/%{name}
 
 
 %changelog
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6-1jh
+- update to 2.6 with fix for CAN-1999-1572
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 2.5-12ts
 - current (2.5-12jh) integrated as 2.5-12ts for release 1.1-U3
 


From svn at tinysofa.org  Sat Feb 12 07:28:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 02:28:43 -0500 (EST)
Subject: [tinysofa-svn] r5879 - tinysofa/releases/1.2/cpio/current/sources
Message-ID: <20050212072843.B32FF344517@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 02:28:21 -0500 (Sat, 12 Feb 2005)
New Revision: 5879

Added:
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lfs.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lstat.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-rh.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-umask.patch
   tinysofa/releases/1.2/cpio/current/sources/cpio-2.6.tar.gz
Log:
- add sources


Added: tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch	2005-02-12 07:27:47 UTC (rev 5878)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.5-nolibnsl.patch	2005-02-12 07:28:21 UTC (rev 5879)
@@ -0,0 +1,11 @@
+--- cpio-2.5/configure.nolibnsl	2004-09-08 11:43:38.000000000 +0000
++++ cpio-2.5/configure	2004-11-04 12:44:10.093187568 +0000
+@@ -13564,7 +13564,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
+ /* confdefs.h.  */
+ _ACEOF

Added: tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lfs.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lfs.patch	2005-02-12 07:27:47 UTC (rev 5878)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lfs.patch	2005-02-12 07:28:21 UTC (rev 5879)
@@ -0,0 +1,142 @@
+--- cpio-2.6/src/extern.h.lfs	2004-09-08 10:49:57.000000000 +0000
++++ cpio-2.6/src/extern.h	2005-01-14 14:10:09.006784175 +0000
+@@ -161,13 +161,13 @@
+ void tape_empty_output_buffer P_((int out_des));
+ void disk_empty_output_buffer P_((int out_des));
+ void swahw_array P_((char *ptr, int count));
+-void tape_buffered_write P_((char *in_buf, int out_des, long num_bytes));
++void tape_buffered_write P_((char *in_buf, int out_des, off_t num_bytes));
+ void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes));
+ int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes));
+ void tape_toss_input P_((int in_des, long num_bytes));
+-void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes));
+-void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename));
+-void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename));
++void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes));
++void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename));
++void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename));
+ void warn_if_file_changed P_((char *file_name, unsigned long old_file_size,
+                               unsigned long old_file_mtime));
+ void create_all_directories P_((char *name));
+--- cpio-2.6/src/util.c.lfs	2004-09-08 10:44:49.000000000 +0000
++++ cpio-2.6/src/util.c	2005-01-14 14:30:33.448133098 +0000
+@@ -207,7 +207,7 @@
+    Exit with an error if end of file is reached.  */
+ 
+ static int
+-disk_fill_input_buffer (int in_des, int num_bytes)
++disk_fill_input_buffer (int in_des, off_t num_bytes)
+ {
+   in_buff = input_buffer;
+   num_bytes = (num_bytes < DISK_IO_BLOCK_SIZE) ? num_bytes : DISK_IO_BLOCK_SIZE;
+@@ -227,9 +227,9 @@
+    When `out_buff' fills up, flush it to file descriptor OUT_DES.  */
+ 
+ void
+-tape_buffered_write (char *in_buf, int out_des, long num_bytes)
++tape_buffered_write (char *in_buf, int out_des, off_t num_bytes)
+ {
+-  register long bytes_left = num_bytes;	/* Bytes needing to be copied.  */
++  register off_t bytes_left = num_bytes;	/* Bytes needing to be copied.  */
+   register long space_left;	/* Room left in output buffer.  */
+ 
+   while (bytes_left > 0)
+@@ -254,9 +254,9 @@
+    When `out_buff' fills up, flush it to file descriptor OUT_DES.  */
+ 
+ void
+-disk_buffered_write (char *in_buf, int out_des, long num_bytes)
++disk_buffered_write (char *in_buf, int out_des, off_t num_bytes)
+ {
+-  register long bytes_left = num_bytes;	/* Bytes needing to be copied.  */
++  register off_t bytes_left = num_bytes;	/* Bytes needing to be copied.  */
+   register long space_left;	/* Room left in output buffer.  */
+ 
+   while (bytes_left > 0)
+@@ -407,9 +407,9 @@
+ write_nuls_to_file (long num_bytes, int out_des, 
+                     void (*writer) (char *in_buf, int out_des, long num_bytes))
+ {
+-  long	blocks;
++  off_t	blocks;
+   long	extra_bytes;
+-  long	i;
++  off_t	i;
+ 
+   blocks = num_bytes / 512;
+   extra_bytes = num_bytes % 512;
+@@ -428,10 +428,10 @@
+    NUM_BYTES is the number of bytes to copy.  */
+ 
+ void
+-copy_files_tape_to_disk (int in_des, int out_des, long num_bytes)
++copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes)
+ {
+-  long size;
+-  long k;
++  off_t size;
++  off_t k;
+ 
+   while (num_bytes > 0)
+     {
+@@ -458,13 +458,13 @@
+    NUM_BYTES is the number of bytes to copy.  */
+ 
+ void
+-copy_files_disk_to_tape (int in_des, int out_des, long num_bytes,
++copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes,
+ 			 char *filename)
+ {
+-  long size;
+-  long k;
++  off_t size;
++  off_t k;
+   int rc;
+-  long original_num_bytes;
++  off_t original_num_bytes;
+ 
+   original_num_bytes = num_bytes;
+ 
+@@ -476,10 +476,10 @@
+ 	  num_bytes : DISK_IO_BLOCK_SIZE))
+ 	  {
+ 	    if (rc > 0)
+-	      error (0, 0, _("File %s shrunk by %ld bytes, padding with zeros"),
++	      error (0, 0, _("File %s shrunk by %lld bytes, padding with zeros"),
+ 				filename, num_bytes);
+ 	    else
+-	      error (0, 0, _("Read error at byte %ld in file %s, padding with zeros"),
++	      error (0, 0, _("Read error at byte %lld in file %s, padding with zeros"),
+ 			original_num_bytes - num_bytes, filename);
+ 	    write_nuls_to_file (num_bytes, out_des, tape_buffered_write);
+ 	    break;
+@@ -505,12 +505,12 @@
+    NUM_BYTES is the number of bytes to copy.  */
+ 
+ void
+-copy_files_disk_to_disk (int in_des, int out_des, long num_bytes,
++copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes,
+ 			 char *filename)
+ {
+-  long size;
+-  long k;
+-  long original_num_bytes;
++  off_t size;
++  off_t k;
++  off_t original_num_bytes;
+   int rc;
+ 
+   original_num_bytes = num_bytes;
+@@ -520,10 +520,10 @@
+ 	if (rc = disk_fill_input_buffer (in_des, num_bytes))
+ 	  {
+ 	    if (rc > 0)
+-	      error (0, 0, _("File %s shrunk by %ld bytes, padding with zeros"),
++	      error (0, 0, _("File %s shrunk by %lld bytes, padding with zeros"),
+ 				filename, num_bytes);
+ 	    else
+-	      error (0, 0, _("Read error at byte %ld in file %s, padding with zeros"),
++	      error (0, 0, _("Read error at byte %lld in file %s, padding with zeros"),
+ 			original_num_bytes - num_bytes, filename);
+ 	    write_nuls_to_file (num_bytes, out_des, disk_buffered_write);
+ 	    break;

Added: tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lstat.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lstat.patch	2005-02-12 07:27:47 UTC (rev 5878)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-lstat.patch	2005-02-12 07:28:21 UTC (rev 5879)
@@ -0,0 +1,11 @@
+--- cpio-2.6/configure.ac.lstat	2004-12-20 10:46:30.000000000 +0000
++++ cpio-2.6/configure.ac	2005-01-17 11:47:22.000000000 +0000
+@@ -92,7 +92,7 @@
+   AC_CONFIG_LINKS(src/fnmatch.h:headers/fnmatch.h)
+ fi
+ 
+-AC_CHECK_FUNCS(lchown endpwent endgrent)
++AC_CHECK_FUNCS(lchown endpwent endgrent lstat)
+ AC_FUNC_VPRINTF
+ AC_FUNC_ALLOCA
+ AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"])

Added: tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-rh.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-rh.patch	2005-02-12 07:27:47 UTC (rev 5878)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-rh.patch	2005-02-12 07:28:21 UTC (rev 5879)
@@ -0,0 +1,22 @@
+--- cpio-2.5.90/doc/cpio.info.rh	2004-02-27 12:42:01.000000000 +0000
++++ cpio-2.5.90/doc/cpio.info	2004-11-04 14:40:57.000000000 +0000
+@@ -261,7 +261,8 @@
+      Set the I/O block size to BLOCK-SIZE * 512 bytes.
+ 
+ `-c'
+-     Use the old portable (ASCII) archive format.
++     Identical to "-H newc", use the new (SVR4) portable format.
++     If you wish the old portable (ASCII) archive format, use "-H odc" instead.
+ 
+ `-C IO-SIZE, --io-size=IO-SIZE'
+      Set the I/O block size to IO-SIZE bytes.
+--- cpio-2.5.90/src/main.c.rh	2004-09-08 11:41:42.000000000 +0000
++++ cpio-2.5.90/src/main.c	2004-11-05 11:09:59.869355664 +0000
+@@ -302,6 +302,7 @@
+     case 'c':		/* Use the old portable ASCII format.  */
+       if (archive_format != arf_unknown)
+ 	USAGE_ERROR ((0, 0, _("Archive format multiply defined")));
++#define SVR4_COMPAT
+ #ifdef SVR4_COMPAT
+       archive_format = arf_newascii; /* -H newc.  */
+ #else

Added: tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-umask.patch
===================================================================
--- tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-umask.patch	2005-02-12 07:27:47 UTC (rev 5878)
+++ tinysofa/releases/1.2/cpio/current/sources/cpio-2.6-umask.patch	2005-02-12 07:28:21 UTC (rev 5879)
@@ -0,0 +1,20 @@
+--- cpio-2.6/src/main.c.umask	2005-01-24 14:24:41.281975935 +0000
++++ cpio-2.6/src/main.c	2005-01-24 14:38:59.127437814 +0000
+@@ -741,8 +741,7 @@
+   textdomain (PACKAGE);
+ 
+   program_name = argv[0];
+-  umask (0);
+-
++  
+ #ifdef __TURBOC__
+   _fmode = O_BINARY;		/* Put stdin and stdout in binary mode.  */
+ #endif
+@@ -752,6 +751,7 @@
+ #endif
+ 
+   process_args (argc, argv);
++  umask (0);
+ 
+   initialize_buffers ();
+ 

Added: tinysofa/releases/1.2/cpio/current/sources/cpio-2.6.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/cpio/current/sources/cpio-2.6.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Sat Feb 12 12:44:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 07:44:23 -0500 (EST)
Subject: [tinysofa-svn] 
	r5880 - in tinysofa/releases/1.2/kudzu/current: sources specs
Message-ID: <20050212124423.5671C344559@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 07:44:08 -0500 (Sat, 12 Feb 2005)
New Revision: 5880

Added:
   tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch
Modified:
   tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec
Log:
- add a patch for an use after free bug

Added: tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch
===================================================================
--- tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch	2005-02-12 07:28:21 UTC (rev 5879)
+++ tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch	2005-02-12 12:44:08 UTC (rev 5880)
@@ -0,0 +1,20 @@
+--- kudzu-1.1.22/kudzu.c.free	2005-02-12 14:21:16.000000000 +0200
++++ kudzu-1.1.22/kudzu.c	2005-02-12 14:22:47.000000000 +0200
+@@ -1017,7 +1017,7 @@
+ 		}
+ 		if (!devname || !hwaddr) continue;
+ 		tmpdev = calloc(1,sizeof(struct netdev));
+-		tmpdev->dev = devname;
++		tmpdev->dev = strdup(devname);
+ 		strncpy(tmpdev->hwaddr,hwaddr,32);
+ 		if (netdevs) {
+ 			tmpdev->next = netdevs; 
+@@ -1035,7 +1035,7 @@
+ 			if (!strcasecmp((char *)dev->classprivate,
+ 					tmpdev->hwaddr)) {
+ 				free(dev->device);
+-				dev->device = strdup(tmpdev->dev);
++				dev->device = tmpdev->dev;
+ 				/* Gratuitious overload of a field;
+ 				 * mark this device name as 'seen' */
+ 				tmpdev->bus = BUS_PCI;

Modified: tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec
===================================================================
--- tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec	2005-02-12 07:28:21 UTC (rev 5879)
+++ tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec	2005-02-12 12:44:08 UTC (rev 5880)
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.1.22
-Release: 2ts
+Release: 3jh
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: main
@@ -9,6 +9,7 @@
 Source2: kudzu.init
 Patch0: kudzu-1.1.22.tinysofa.patch
 Patch1: kudzu-1.1.22-link-slang.patch
+Patch2: kudzu-1.1.22-free.patch
 Requires: hwdata
 Obsoletes: rhs-hwdiag setconsole
 Prereq: modutils >= 2.3.11-5, chkconfig
@@ -37,6 +38,7 @@
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .free~
 
 
 %build
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.22-3jh
+- add a patch for an use after free bug
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.1.22-2ts
 - current (1.1.22-2jh) integrated as 1.1.22-2ts for release 1.1
 


From svn at tinysofa.org  Sat Feb 12 12:50:10 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 07:50:10 -0500 (EST)
Subject: [tinysofa-svn] 
	r5881 - in tinysofa/releases/1.2/kudzu/current: sources specs
Message-ID: <20050212125010.24E46344392@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 07:49:55 -0500 (Sat, 12 Feb 2005)
New Revision: 5881

Added:
   tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22.9.tar.gz
Removed:
   tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch
   tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22.tar.gz
Modified:
   tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec
Log:
- new upstream


Deleted: tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch
===================================================================
--- tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch	2005-02-12 12:44:08 UTC (rev 5880)
+++ tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-free.patch	2005-02-12 12:49:55 UTC (rev 5881)
@@ -1,20 +0,0 @@
---- kudzu-1.1.22/kudzu.c.free	2005-02-12 14:21:16.000000000 +0200
-+++ kudzu-1.1.22/kudzu.c	2005-02-12 14:22:47.000000000 +0200
-@@ -1017,7 +1017,7 @@
- 		}
- 		if (!devname || !hwaddr) continue;
- 		tmpdev = calloc(1,sizeof(struct netdev));
--		tmpdev->dev = devname;
-+		tmpdev->dev = strdup(devname);
- 		strncpy(tmpdev->hwaddr,hwaddr,32);
- 		if (netdevs) {
- 			tmpdev->next = netdevs; 
-@@ -1035,7 +1035,7 @@
- 			if (!strcasecmp((char *)dev->classprivate,
- 					tmpdev->hwaddr)) {
- 				free(dev->device);
--				dev->device = strdup(tmpdev->dev);
-+				dev->device = tmpdev->dev;
- 				/* Gratuitious overload of a field;
- 				 * mark this device name as 'seen' */
- 				tmpdev->bus = BUS_PCI;

Added: tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22.9.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec
===================================================================
--- tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec	2005-02-12 12:44:08 UTC (rev 5880)
+++ tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec	2005-02-12 12:49:55 UTC (rev 5881)
@@ -1,6 +1,6 @@
 Name: kudzu
-Version: 1.1.22
-Release: 3jh
+Version: 1.1.22.9
+Release: 1jh
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: main
@@ -9,7 +9,6 @@
 Source2: kudzu.init
 Patch0: kudzu-1.1.22.tinysofa.patch
 Patch1: kudzu-1.1.22-link-slang.patch
-Patch2: kudzu-1.1.22-free.patch
 Requires: hwdata
 Obsoletes: rhs-hwdiag setconsole
 Prereq: modutils >= 2.3.11-5, chkconfig
@@ -38,7 +37,6 @@
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .free~
 
 
 %build
@@ -91,8 +89,8 @@
 
 
 %changelog
-* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.22-3jh
-- add a patch for an use after free bug
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.22.9-1jh
+- new upstream
 
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.1.22-2ts
 - current (1.1.22-2jh) integrated as 1.1.22-2ts for release 1.1


From svn at tinysofa.org  Sat Feb 12 14:04:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 09:04:56 -0500 (EST)
Subject: [tinysofa-svn] 
	r5882 - in tinysofa/releases/1.2/anaconda/current: sources specs
Message-ID: <20050212140456.00F9B3445EB@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 09:04:44 -0500 (Sat, 12 Feb 2005)
New Revision: 5882

Added:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-en-only.patch
Modified:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- usbdevfs -> usbfs change
- minor upd-instroot script update
- use English as an languaga


Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-en-only.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-en-only.patch	2005-02-12 12:49:55 UTC (rev 5881)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-en-only.patch	2005-02-12 14:04:44 UTC (rev 5882)
@@ -0,0 +1,29 @@
+diff -urN anaconda-9.1.en/loader2/lang.c anaconda-9.1/loader2/lang.c
+--- anaconda-9.1.en/loader2/lang.c	2005-02-12 14:06:07.000000000 +0200
++++ anaconda-9.1/loader2/lang.c	2005-02-12 14:13:07.000000000 +0200
+@@ -368,10 +368,12 @@
+     else
+         choice = english;
+ 
++#if 0
+     newtWinMenu(_("Choose a Language"),
+                 _("What language would you like to use during the "
+                   "installation process?"), 40, 5, 5, 8,
+                 langs, &choice, _("OK"), NULL);
++#endif
+ 
+     langPicked = langs[choice];
+     for (i = 0; i < numLanguages; i++) {
+diff -urN anaconda-9.1.en/textw/language_text.py anaconda-9.1/textw/language_text.py
+--- anaconda-9.1.en/textw/language_text.py	2005-02-12 14:06:07.000000000 +0200
++++ anaconda-9.1/textw/language_text.py	2005-02-12 14:11:13.000000000 +0200
+@@ -24,6 +24,9 @@
+ 
+ class LanguageWindow:
+     def __call__(self, screen, textInterface, instLanguage):
++
++        return INSTALL_OK
++
+         languages = instLanguage.available ()
+ 
+         current = instLanguage.getCurrent()

Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-02-12 12:49:55 UTC (rev 5881)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-02-12 14:04:44 UTC (rev 5882)
@@ -10,3 +10,12 @@
  
      # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly
      f = open(instPath + "/etc/mtab", "w+")
+@@ -1032,7 +1035,7 @@
+ 		    
+                 unmountUSB = 0
+                 try:
+-                    isys.mount('/usbdevfs', instPath+'/proc/bus/usb', 'usbdevfs')
++                    isys.mount('/usbdevfs', instPath+'/proc/bus/usb', 'usbfs')
+                     unmountUSB = 1
+                 except:
+                     log("Mount of /proc/bus/usb in chroot failed")

Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch	2005-02-12 12:49:55 UTC (rev 5881)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch	2005-02-12 14:04:44 UTC (rev 5882)
@@ -401,6 +401,15 @@
  usr/share/vte/termcap/xterm
  usr/share/zoneinfo/zone.tab
  EOF
+@@ -750,7 +620,7 @@
+ 
+ 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 
++#ln -s /tmp $DESTGR/var/lib/xkb 
+ 
+ #
+ # concat KEEPFILEGR and KEEPFILERESCUE lists
 @@ -828,10 +698,10 @@
  rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/lib{GLcore,glx,pex5}*
  
@@ -511,7 +520,13 @@
  echo "Creating debug dir"
  for p in $DEST $DESTGR ; do
      mkdir -p $p/usr/lib/debug
-@@ -1093,6 +909,6 @@
+@@ -1088,11 +904,11 @@
+    if [ $NEEDGR ]; then
+        # Xserver needs a place to put the compiled xkb maps.
+        rm -rf $DESTGR/usr/X11R6/lib/X11/xkb/compiled
+-       ln -s /tmp $DESTGR/usr/X11R6/lib/X11/xkb/compiled
++       #ln -s /tmp $DESTGR/usr/X11R6/lib/X11/xkb/compiled
+    fi
  
     if [ -n "$NEEDGR" ]; then
      cd $ORIGDIR

Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-12 12:49:55 UTC (rev 5881)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-12 14:04:44 UTC (rev 5882)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 0.14jh
+Release: 0.16jh
 License: GPL
 Summary: installation program
 Group: development
@@ -33,6 +33,7 @@
 Patch16: anaconda-9.1-modprobe.conf.patch
 Patch17: anaconda-9.1-mdadm.patch
 Patch18: anaconda-9.1-grsecurity.patch
+Patch19: anaconda-9.1-en-only.patch
 # booty patches
 Patch100: booty-0.38-tinysofa.patch
 Patch101: booty-0.38-tinysofa-splash.patch
@@ -94,6 +95,7 @@
 %patch16 -p1 -b .modprobe.conf~
 %patch17 -p1 -b .mdadm~
 %patch18 -p1
+%patch19 -p1 -b .en-only~
 
 # rhpl and booty use originally python 2.3
 # anaconda uses orginally python 2.2


From svn at tinysofa.org  Sat Feb 12 20:56:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 15:56:33 -0500 (EST)
Subject: [tinysofa-svn] 
	r5883 - in tinysofa/releases/1.2: arpwatch/current/specs
	libpcap/current/specs tcpdump/current/specs ucarp/current/specs
Message-ID: <20050212205633.82E1F3445D6@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 15:56:15 -0500 (Sat, 12 Feb 2005)
New Revision: 5883

Modified:
   tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec
   tinysofa/releases/1.2/libpcap/current/specs/libpcap.spec
   tinysofa/releases/1.2/tcpdump/current/specs/tcpdump.spec
   tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec
Log:
- split libpcap development filed to -devel subpackage


Modified: tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec
===================================================================
--- tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec	2005-02-12 14:04:44 UTC (rev 5882)
+++ tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec	2005-02-12 20:56:15 UTC (rev 5883)
@@ -9,7 +9,7 @@
 Patch0: arpwatch-Makefile-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %service_requires
-BuildRequires: libpcap
+BuildRequires: libpcap-devel
 
 %description
 The arpwatch package contains arpwatch and arpsnmp.  Arpwatch and

Modified: tinysofa/releases/1.2/libpcap/current/specs/libpcap.spec
===================================================================
--- tinysofa/releases/1.2/libpcap/current/specs/libpcap.spec	2005-02-12 14:04:44 UTC (rev 5882)
+++ tinysofa/releases/1.2/libpcap/current/specs/libpcap.spec	2005-02-12 20:56:15 UTC (rev 5883)
@@ -1,6 +1,6 @@
 Name: libpcap
 Version: 0.8.3
-Release: 4ts
+Release: 5jh
 License: BSD
 Summary: A system-independent interface for user-level packet capture.
 Source: http://www.tcpdump.org/release/libpcap-%{version}.tar.gz
@@ -21,7 +21,16 @@
 Install libpcap if you need to do low-level network traffic monitoring
 on your network.
 
+%package devel
+Summary: Header files and libraries for libpcap development
+Group: development
+Requires: %{name} = %{version}-%{release}
 
+%description devel
+The zlib-devel package contains the header files and libraries needed
+to develop programs that use the pcap packet capture library.
+
+
 %prep
 %setup -q
 
@@ -36,7 +45,7 @@
 
 export MAJOR=$(echo %{version} | awk -F. '{ print $1 }')
 export MINOR=$(echo %{version} | awk -F. '{ print $2 }')
-%{__cc} -Wl,-soname,libpcap.so.0 -shared -fpic -o libpcap.so.$MAJOR.$MINOR *.o
+%{__cc} -Wl,-soname,libpcap.so.$MAJOR -shared -fpic -o libpcap.so.$MAJOR.$MINOR *.o
 
 
 %install
@@ -57,16 +66,29 @@
 %clean_buildroot
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root)
 %doc README README.linux CHANGES TODO
+%attr(755,root,root) %{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root)
+%attr(644,root,root) %{_libdir}/*.a
+%attr(755,root,root) %{_libdir}/*.so
 %{_includedir}/pcap
-%attr(644,root,root) %{_libdir}/*.a
-%attr(755,root,root) %{_libdir}/*.so*
 %{_mandir}/man3/pcap.3*
 
 
 %changelog
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.8.3-5jh
+- run ldconfig
+- split devel files
+
 * Tue Sep 21 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - spec cleanup
 

Modified: tinysofa/releases/1.2/tcpdump/current/specs/tcpdump.spec
===================================================================
--- tinysofa/releases/1.2/tcpdump/current/specs/tcpdump.spec	2005-02-12 14:04:44 UTC (rev 5882)
+++ tinysofa/releases/1.2/tcpdump/current/specs/tcpdump.spec	2005-02-12 20:56:15 UTC (rev 5883)
@@ -5,7 +5,7 @@
 License: BSD
 Group: main
 Source: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
-BuildRequires: libpcap >= 0.8.1
+BuildRequires: libpcap-devel
 Conflicts: kernel < 2.2.20
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -27,7 +27,7 @@
 CFLAGS="$RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20 -I%{_includedir}/pcap" \
 %configure --enable-ipv6
 
-%make 
+%make LIBS="-lpcap"
 
 
 %install
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- ensure that libpcap is linked dynamically
+
 * Tue Sep 21 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - spec cleanup
 

Modified: tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec
===================================================================
--- tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec	2005-02-12 14:04:44 UTC (rev 5882)
+++ tinysofa/releases/1.2/ucarp/current/specs/ucarp.spec	2005-02-12 20:56:15 UTC (rev 5883)
@@ -10,7 +10,7 @@
 Source2: vip-001.conf.example
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %service_requires
-BuildRequires: libpcap, gettext
+BuildRequires: libpcap-devel, gettext
 
 %description
 UCARP allows a couple of hosts to share common virtual IP addresses in order


From svn at tinysofa.org  Sat Feb 12 21:16:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 16:16:17 -0500 (EST)
Subject: [tinysofa-svn] 
	r5884 - in tinysofa/releases/1.2/glib/current: sources specs
Message-ID: <20050212211617.83BA83443C3@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 16:15:31 -0500 (Sat, 12 Feb 2005)
New Revision: 5884

Added:
   tinysofa/releases/1.2/glib/current/sources/glib-2.6.2.tar.bz2
Removed:
   tinysofa/releases/1.2/glib/current/sources/glib-2.6.1.tar.bz2
Modified:
   tinysofa/releases/1.2/glib/current/specs/glib.spec
Log:
- 2.6.2

Deleted: tinysofa/releases/1.2/glib/current/sources/glib-2.6.1.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/glib/current/sources/glib-2.6.2.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/glib/current/sources/glib-2.6.2.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/glib/current/specs/glib.spec
===================================================================
--- tinysofa/releases/1.2/glib/current/specs/glib.spec	2005-02-12 20:56:15 UTC (rev 5883)
+++ tinysofa/releases/1.2/glib/current/specs/glib.spec	2005-02-12 21:15:31 UTC (rev 5884)
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions.
 Name: glib
-Version: 2.6.1
-Release: 1ts
+Version: 2.6.2
+Release: 1jh
 License: LGPL
 Group: main
 Source: glib-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.2-1jh
+- 2.6.2
+
 * Wed Jan 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.1-1jh
 - 2.6.1
 


From svn at tinysofa.org  Sat Feb 12 21:49:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 16:49:44 -0500 (EST)
Subject: [tinysofa-svn] r5885 - tinysofa/releases/1.2/arpwatch/current/specs
Message-ID: <20050212214944.6C8AD34456A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 16:49:38 -0500 (Sat, 12 Feb 2005)
New Revision: 5885

Modified:
   tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec
Log:
- ensure that libpcap is linked dynamically

Modified: tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec
===================================================================
--- tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec	2005-02-12 21:15:31 UTC (rev 5884)
+++ tinysofa/releases/1.2/arpwatch/current/specs/arpwatch.spec	2005-02-12 21:49:38 UTC (rev 5885)
@@ -29,16 +29,23 @@
 
 %build
 %configure
-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcap" ./configure \
-	--prefix=%{_prefix} --mandir=%{_mandir}
-make MANDEST=%{_mandir} ARPDIR=/var/spool/arpwatch
+CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcap" %configure
 
+%make \
+	MANDEST=%{_mandir} \
+	ARPDIR=/var/spool/arpwatch \
+	LIBS="-lpcap -lresolv"
 
+
 %install
-mkdir -p $RPM_BUILD_ROOT/var/spool/arpwatch
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
-make install install-man DESTDIR=$RPM_BUILD_ROOT MANDEST=%{_mandir} \
+%{__mkdir_p} \
+	$RPM_BUILD_ROOT/var/spool/arpwatch \
+	$RPM_BUILD_ROOT%{_sbindir} \
+	$RPM_BUILD_ROOT%{_mandir}/man8
+
+make install install-man \
+	DESTDIR=$RPM_BUILD_ROOT \
+	MANDEST=%{_mandir} \
 	ARPDIR=/var/spool/arpwatch
 
 for n in arp2ethers massagevendor; do
@@ -69,10 +76,10 @@
 %files
 %defattr(-,root,root)
 %doc CHANGES README
-%{_prefix}/sbin/arpwatch
-%{_prefix}/sbin/arpsnmp
-%{_prefix}/share/man/man8/arpwatch.8*
-%{_prefix}/share/man/man8/arpsnmp.8*
+%{_sbindir}/arpwatch
+%{_sbindir}/arpsnmp
+%{_mandir}/man8/arpwatch.8*
+%{_mandir}/man8/arpsnmp.8*
 %{_initrddir}/arpwatch
 %dir    /var/spool/arpwatch
 %config /var/spool/arpwatch/arp.dat
@@ -83,6 +90,9 @@
 
 
 %changelog
+* Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- ensure that libpcap is linked dynamically
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.1a13-2ts
 - current (2.1a13-2jh) integrated as 2.1a13-2ts for release 1.1
 


From svn at tinysofa.org  Sat Feb 12 21:53:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 16:53:21 -0500 (EST)
Subject: [tinysofa-svn] r5886 - tinysofa/releases/1.2/glibc/current/specs
Message-ID: <20050212215321.C4FED344580@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 16:53:15 -0500 (Sat, 12 Feb 2005)
New Revision: 5886

Modified:
   tinysofa/releases/1.2/glibc/current/specs/glibc.spec
Log:
- bump up the release


Modified: tinysofa/releases/1.2/glibc/current/specs/glibc.spec
===================================================================
--- tinysofa/releases/1.2/glibc/current/specs/glibc.spec	2005-02-12 21:49:38 UTC (rev 5885)
+++ tinysofa/releases/1.2/glibc/current/specs/glibc.spec	2005-02-12 21:53:15 UTC (rev 5886)
@@ -9,7 +9,7 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: 2.3.4
-Release: 1jh
+Release: 2jh
 License: LGPL
 Group: main
 %define glibcsrcdir %{name}-%{glibcdate}


From svn at tinysofa.org  Sat Feb 12 22:24:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 17:24:01 -0500 (EST)
Subject: [tinysofa-svn] 
	r5887 - in tinysofa/releases/1.2/tar/current: sources specs
Message-ID: <20050212222401.871A93445C8@minbar.tinysofa.org>

Author: jh
Date: 2005-02-12 17:23:52 -0500 (Sat, 12 Feb 2005)
New Revision: 5887

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- fix large files support


Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch	2005-02-12 21:53:15 UTC (rev 5886)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch	2005-02-12 22:23:52 UTC (rev 5887)
@@ -0,0 +1,11 @@
+--- ./tree.c.platform~	2005-02-13 00:05:06.000000000 +0200
++++ ./tree.c	2005-02-13 00:13:34.000000000 +0200
+@@ -38,6 +38,8 @@
+  * regular dir or via fchdir(2) for a symlink).
+  */
+ 
++#include "bsdtar_platform.h"
++
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <errno.h>

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-12 21:53:15 UTC (rev 5886)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-12 22:23:52 UTC (rev 5887)
@@ -10,6 +10,7 @@
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
 Patch1: bsdtar-1.02.005-dirent.patch
+Patch2: bsdtar-1.02.005-platform.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,16 +29,18 @@
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
 %patch1 -p1 -b .dirent~
+%patch2 -p1 -b .platform~
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{libarchive_version}"
+export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
+
 pushd libarchive-%{libarchive_version}
 %configure --prefix=$PWD
 %make
 popd
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{libarchive_version}"
-export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
 %configure
 %make
 


From svn at tinysofa.org  Sat Feb 12 22:50:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Feb 2005 17:50:58 -0500 (EST)
Subject: [tinysofa-svn] r5888 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050212225058.15DB53443B2@minbar.tinysofa.org>

Author: gda
Date: 2005-02-12 17:50:52 -0500 (Sat, 12 Feb 2005)
New Revision: 5888

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
exchanged dovecot with cyrus

Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-12 22:23:52 UTC (rev 5887)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-12 22:50:52 UTC (rev 5888)
@@ -450,14 +450,14 @@
 
   <group>
     <id>imap-server</id>
-    <name>IMAP Server (dovecot)</name>
+    <name>IMAP Server (cyrus)</name>
     <description>These packages allow you to configure an IMAP server.</description>
     <uservisible>true</uservisible>
     <grouplist>
-      <groupreq>base</groupreq>
+      <groupreq>extra</groupreq>
     </grouplist>
     <packagelist>
-      <packagereq type="default">dovecot</packagereq>
+      <packagereq type="default">cyrus-imapd</packagereq>
     </packagelist>
   </group>
 


From svn at tinysofa.org  Sun Feb 13 11:27:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 06:27:03 -0500 (EST)
Subject: [tinysofa-svn] r5899 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050213112703.2C47D344398@minbar.tinysofa.org>

Author: gda
Date: 2005-02-13 06:26:58 -0500 (Sun, 13 Feb 2005)
New Revision: 5899

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
small fix

Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-13 11:24:00 UTC (rev 5898)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-13 11:26:58 UTC (rev 5899)
@@ -455,7 +455,7 @@
     <description>These packages allow you to configure an IMAP server.</description>
     <uservisible>true</uservisible>
     <grouplist>
-      <groupreq>extra</groupreq>
+      <groupreq>base</groupreq>
     </grouplist>
     <packagelist>
       <packagereq type="mandatory">cyrus-imapd</packagereq>



From svn at tinysofa.org  Sun Feb 13 08:04:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 03:04:24 -0500 (EST)
Subject: [tinysofa-svn] r5890 - tinysofa/releases/1.2/setarch/current/sources
Message-ID: <20050213080424.57F11344514@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 03:04:16 -0500 (Sun, 13 Feb 2005)
New Revision: 5890

Added:
   tinysofa/releases/1.2/setarch/current/sources/setarch-1.7.tar.gz
Removed:
   tinysofa/releases/1.2/setarch/current/sources/setarch-1.4.tar.gz
Log:
- update to 1.7


Deleted: tinysofa/releases/1.2/setarch/current/sources/setarch-1.4.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/setarch/current/sources/setarch-1.7.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/setarch/current/sources/setarch-1.7.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



From svn at tinysofa.org  Sun Feb 13 13:38:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 08:38:39 -0500 (EST)
Subject: [tinysofa-svn] r5902 - in contrib/1.1: . bluefish bluefish/current
	bluefish/current/sources bluefish/current/specs
Message-ID: <20050213133839.A896434439F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-13 08:37:57 -0500 (Sun, 13 Feb 2005)
New Revision: 5902

Added:
   contrib/1.1/bluefish/
   contrib/1.1/bluefish/current/
   contrib/1.1/bluefish/current/sources/
   contrib/1.1/bluefish/current/sources/bluefish-1.0-only_firefox.patch
   contrib/1.1/bluefish/current/sources/bluefish-1.0.tar.bz2
   contrib/1.1/bluefish/current/sources/bluefish_desktop_icon.patch
   contrib/1.1/bluefish/current/specs/
   contrib/1.1/bluefish/current/specs/bluefish.spec
   contrib/1.1/bluefish/pristine/
   contrib/1.1/bluefish/releases/
Log:
new in contrib

Added: contrib/1.1/bluefish/current/sources/bluefish-1.0-only_firefox.patch
===================================================================
--- contrib/1.1/bluefish/current/sources/bluefish-1.0-only_firefox.patch	2005-02-13 13:35:16 UTC (rev 5901)
+++ contrib/1.1/bluefish/current/sources/bluefish-1.0-only_firefox.patch	2005-02-13 13:37:57 UTC (rev 5902)
@@ -0,0 +1,19 @@
+--- bluefish-1.0/src/rcfile.c.orig	2005-02-09 13:49:24.998246584 +0100
++++ bluefish-1.0/src/rcfile.c	2005-02-09 13:57:53.534937256 +0100
+@@ -493,15 +493,7 @@
+ 	if (main_v->props.browsers == NULL) {
+ 		/* if the user does not have browsers --> set them to defaults values */
+ 		gchar **arr;
+-		arr = array_from_arglist(_("Galeon"), "galeon -x %s&",NULL);
+-		main_v->props.browsers = g_list_append(main_v->props.browsers,arr);
+-		arr = array_from_arglist(_("Mozilla"), "mozilla -remote 'openURL(%s, new-window)' || mozilla %s&",NULL);
+-		main_v->props.browsers = g_list_append(main_v->props.browsers,arr);
+-		arr = array_from_arglist(_("Opera"), "opera -remote 'openURL(%s,new-window)' || opera %s&",NULL);
+-		main_v->props.browsers = g_list_append(main_v->props.browsers,arr);
+-		arr = array_from_arglist(_("Netscape"), "/usr/lib/netscape/477/communicator/communicator-smotif %s&",NULL);
+-		main_v->props.browsers = g_list_append(main_v->props.browsers,arr);
+-		arr = array_from_arglist(_("Gnome default"), "gnome-moz-remote --newwin %s&",NULL);
++		arr = array_from_arglist(_("Firefox"), "firefox -x %s&",NULL);
+ 		main_v->props.browsers = g_list_append(main_v->props.browsers,arr);
+ 	}
+ 	{

Added: contrib/1.1/bluefish/current/sources/bluefish-1.0.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/bluefish/current/sources/bluefish-1.0.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/bluefish/current/sources/bluefish_desktop_icon.patch
===================================================================
--- contrib/1.1/bluefish/current/sources/bluefish_desktop_icon.patch	2005-02-13 13:35:16 UTC (rev 5901)
+++ contrib/1.1/bluefish/current/sources/bluefish_desktop_icon.patch	2005-02-13 13:37:57 UTC (rev 5902)
@@ -0,0 +1,11 @@
+--- data/bluefish.desktop.in    2004-11-25 08:45:22.000000000 +0100
++++ data/bluefish.desktop.in_diff       2004-12-28 15:45:37.477460912 +0100
+@@ -2,7 +2,7 @@
+ Name=Bluefish Editor
+ Comment=Web Development Editor
+ Exec=bluefish -n
+-Icon=ICONDIR/bluefish-icon.png
++Icon=bluefish-icon.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;

Added: contrib/1.1/bluefish/current/specs/bluefish.spec
===================================================================
--- contrib/1.1/bluefish/current/specs/bluefish.spec	2005-02-13 13:35:16 UTC (rev 5901)
+++ contrib/1.1/bluefish/current/specs/bluefish.spec	2005-02-13 13:37:57 UTC (rev 5902)
@@ -0,0 +1,81 @@
+%define icewm_menu 1
+
+Summary:	A GTK2 web development application for experienced users.
+Name:		bluefish
+Version:	1.0
+Release:	1gd
+Source:		ftp://ftp.ratisbona.com/pub/bluefish/snapshots/%{name}-%{version}.tar.bz2
+Patch0:		bluefish_desktop_icon.patch
+Patch1:		bluefish-1.0-only_firefox.patch
+URL:		http://bluefish.openoffice.nl
+License:	GPL
+Group:          contrib
+Requires:	gtk pcre aspell
+BuildRequires:  gtk-devel pcre-devel
+BuildRequires:  aspell-devel gettext
+
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+%description
+Bluefish is a GTK+ HTML editor for the experienced web designer or
+programmer. It is not finished yet, but already a very powerful site
+creating environment. Bluefish has extended support for programming
+dynamic and interactive websites, there is for example a lot of PHP
+support.
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p0
+%patch1 -p1
+
+%build
+%configure --disable-update-databases \
+	   --with-freedesktop_org-mime=/usr/share/mime \
+	   --with-gnome2_4-mime=/usr/share/mime-info \
+	   --with-freedesktop_org-menu=/usr/share/applications
+%make
+
+%install
+make install DESTDIR=%{buildroot}
+
+%find_lang %{name}
+
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Bluefish"                  bluefish-icon.png bluefish
+__EOF__
+%endif
+
+
+%clean
+%clean_buildroot
+
+%files -f %{name}.lang
+%defattr(-,root, root)
+%doc AUTHORS COPYING INSTALL README TODO
+%{_bindir}/bluefish
+%{_datadir}/bluefish
+%{_datadir}/applications/*.desktop
+%{_datadir}/mime/*
+%{_datadir}/mime-info/*
+%{_datadir}/pixmaps/*.png
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
+
+
+%changelog
+* Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 1.0-1gd
+- new in tinysofa contrib
+
+* Wed Jan 12 2005 Matthias Haase <matthias_haase at bennewitz.com>
+- Rebuild for version 1.0
+
+* Fri Jan 07 2005 Matthias Haase <matthias_haase at bennewitz.com>
+- Automatic build - snapshot of 2005-01-06
+
+* Tue Feb 18 2003 Matthias Haase <matthias_haase at bennewitz.com>
+- Rebuild for version 0.9
+- Added Makefile patch to support DESTDIR.
+- Thanks to Matthias Saou <matthias.saou at est.une.marmotte.net> for the patch



From svn at tinysofa.org  Sun Feb 13 09:26:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 04:26:54 -0500 (EST)
Subject: [tinysofa-svn] r5893 - in tinysofa/releases/1.2/hdparm/current:
	sources specs
Message-ID: <20050213092654.CFD2C344414@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 04:26:39 -0500 (Sun, 13 Feb 2005)
New Revision: 5893

Added:
   tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8-help.patch
   tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8.tar.gz
   tinysofa/releases/1.2/hdparm/current/sources/hdparm-sysconfig
Removed:
   tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.5-renamevar.patch
   tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.5.tar.gz
   tinysofa/releases/1.2/hdparm/current/sources/hdparm.init
   tinysofa/releases/1.2/hdparm/current/sources/hdparm.sysconfig
Modified:
   tinysofa/releases/1.2/hdparm/current/specs/hdparm.spec
Log:
- hdparm 5.8
- improve initscripts compatibility


Deleted: tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.5-renamevar.patch
===================================================================
--- tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.5-renamevar.patch	2005-02-13 09:07:01 UTC (rev 5892)
+++ tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.5-renamevar.patch	2005-02-13 09:26:39 UTC (rev 5893)
@@ -1,31 +0,0 @@
---- 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;

Deleted: tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.5.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8-help.patch
===================================================================
--- tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8-help.patch	2005-02-13 09:07:01 UTC (rev 5892)
+++ tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8-help.patch	2005-02-13 09:26:39 UTC (rev 5893)
@@ -0,0 +1,13 @@
+diff -urN hdparm-5.8/hdparm.c hdparm-5.8_new/hdparm.c
+--- hdparm-5.8/hdparm.c	2004-11-04 04:18:24.000000000 +0100
++++ hdparm-5.8_new/hdparm.c	2005-01-03 11:25:17.695836919 +0100
+@@ -1418,6 +1418,9 @@
+ 				get_IDentity = 2;
+ 				continue;
+ 			}
++			if (0 == strcmp(p, "--help")) {
++				usage_error(0);
++			}
+ 			if (!*++p)
+ 				usage_error(1);
+ 			while ((c = *p++)) {

Added: tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/hdparm/current/sources/hdparm-5.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.2/hdparm/current/sources/hdparm-sysconfig
===================================================================
--- tinysofa/releases/1.2/hdparm/current/sources/hdparm-sysconfig	2005-02-13 09:07:01 UTC (rev 5892)
+++ tinysofa/releases/1.2/hdparm/current/sources/hdparm-sysconfig	2005-02-13 09:26:39 UTC (rev 5893)
@@ -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/releases/1.2/hdparm/current/sources/hdparm.init
===================================================================
--- tinysofa/releases/1.2/hdparm/current/sources/hdparm.init	2005-02-13 09:07:01 UTC (rev 5892)
+++ tinysofa/releases/1.2/hdparm/current/sources/hdparm.init	2005-02-13 09:26:39 UTC (rev 5893)
@@ -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/releases/1.2/hdparm/current/sources/hdparm.sysconfig
===================================================================
--- tinysofa/releases/1.2/hdparm/current/sources/hdparm.sysconfig	2005-02-13 09:07:01 UTC (rev 5892)
+++ tinysofa/releases/1.2/hdparm/current/sources/hdparm.sysconfig	2005-02-13 09:26:39 UTC (rev 5893)
@@ -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 <paramters>
-##
-## Sample
-# /dev/hda -W0 -d1 -c1 -m16

Modified: tinysofa/releases/1.2/hdparm/current/specs/hdparm.spec
===================================================================
--- tinysofa/releases/1.2/hdparm/current/specs/hdparm.spec	2005-02-13 09:07:01 UTC (rev 5892)
+++ tinysofa/releases/1.2/hdparm/current/specs/hdparm.spec	2005-02-13 09:26:39 UTC (rev 5893)
@@ -1,104 +1,108 @@
+%define _sbindir	/sbin
 Summary: A utility for displaying and/or setting hard disk parameters.
 Name: hdparm
-Version: 5.5
-Release: 3jh
+Version: 5.8
+Release: 1jh
 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
+Source1: hdparm-sysconfig
+Patch0:	hdparm-5.8-help.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: sed
 ExcludeArch: s390 s390x
-PreReq: chkconfig
 
 %description
 Hdparm is a useful system utility for setting (E)IDE hard drive
 parameters.  For example, hdparm can be used to tweak hard drive
 performance and to spin down hard drives for power conservation.
 
+
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1 -b .help~
 
+
 %build
-perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g" Makefile
-make
+sed -i -e "s,-O2,$RPM_OPT_FLAGS,g" Makefile
+%make
 
+
 %install
-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
-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%{_initrddir}/hdparm
+%{__mkdir_p} \
+	%{buildroot}%{_sbindir} \
+	%{buildroot}%{_mandir}/man8 \
+	%{buildroot}%{_sysconfdir}/sysconfig
 
+install -s -m 755 hdparm %{buildroot}%{_sbindir}/hdparm
+install -m 644 hdparm.8 %{buildroot}%{_mandir}/man8
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/harddisks
+
+
 %clean
 %clean_buildroot
 
-%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
-%{_initrddir}/hdparm
-/sbin/hdparm
+%config(noreplace) %{_sysconfdir}/sysconfig/harddisks
+%{_sbindir}/hdparm
 %{_mandir}/man8/hdparm.8*
 
+
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 5.5-2ts
-- current (5.5-2jh) integrated as 5.5-2ts for release 1.1
+* Sun Feb 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 5.8-1jh
+- tinysofa
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 5.5-1ts
-- current (5.5-1ok) integrated as 5.5-1ts for release 1.0-U1
+* Mon Jan 03 2005 Karsten Hopp <karsten at redhat.de> 5.8-2 
+- add --help option (#143916)
 
-* Thu May 13 2004 Omar Kilani <omar at tinysofa dot org> 5.5-1ok
-- New Upstream.
+* Fri Nov 26 2004 Karsten Hopp <karsten at redhat.de> 5.8-1 
+- update
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 5.4-8tr
-- Big rebuild
+* Tue Sep 21 2004 Than Ngo <than at redhat.com> 5.7-2
+- rebuilt
 
-* Wed Nov 19 2003 Erlend Midttun <erlendbm at trustix dot com> 5.4-4tr
-- Can't really see how disabling write caching can be dangerous,
-  but I've added a warning to the sysconfig file.
+* Mon Sep 06 2004 Karsten Hopp <karsten at redhat.de> 5.7-1 
+- update to latest stable version
 
-* Mon Jul 07 2003 Goetz Bock <bock at trustix dot org> 5.4-3bg
-- removed suggestion of (DANGEROUS) parameter in sysconfig file
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri Jul  4 2003 Erlend Midttun <erlendbm at trustix dot com> 5.4-2tr
-- Rebuilt with -tr.
+* Thu Feb 19 2004 Karsten Hopp <karsten at redhat.de> 5.5-1 
+- update to latest stable version
+- rename variable to avoid name clash with readahead function
 
-* Thu Jul  3 2003 Goetz Bock <bock at trustix dot org> 5.4-1bg
-- new upstream: 5.4
-- small changes to the init script
-- fixed %postun to %preun
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 5.2-7tr
-- Big rebuild
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Apr 29 2003 Erlend Midttun <erlendbm at trustix dot com> 5.2-6em
-- Fixed init script.
+* Wed Jun 04 2003 Karsten Hopp <karsten at redhat.de> 5.4-2
+- rebuild
 
-* Wed Apr  9 2003 Gerald Dachs <gda at trustix dot org> 5.2-5gd
-- Added PreReq on chkconfig
+* Wed Jun 04 2003 Karsten Hopp <karsten at redhat.de> 5.4-1
+- update
+- #92057
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 5.2-4em
-- Rebuilt against glibc 2.3.2.
+* Wed Apr 23 2003 Karsten Hopp <karsten at redhat.de> 5.3-2
+- rebuild
 
-* Tue Sep  3 2002 Roland Kruse <rolandk at trustix dot com>
-- Initial version for TSL:
-- fixed group
+* Wed Apr 23 2003 Karsten Hopp <karsten at redhat.de> 5.3-1
+- update to 5.3
+- add comment to /etc/sysconfig/harddisks
 
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 5.2-3
+- rebuild on all arches
+
+* Tue Nov 19 2002 Tim Powers <timp at redhat.com>
+- rebuild on all arches
+
 * Wed Jun 26 2002 Karsten Hopp <karsten at redhat.de>
 - update to 5.2 with the following fixes:
  - v5.2 compile fixes for 2.5.xx
@@ -107,4 +111,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. ]
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Fri Feb 22 2002 Karsten Hopp <karsten at redhat.de>
+- bump version for 8.0
+
+* Fri Feb 22 2002 Karsten Hopp <karsten at redhat.de>
+- rebuild in new environment
+
+* Wed Jan 23 2002 Karsten Hopp <karsten at redhat.de> (4.6-1)
+- Update to 4.6
+
+* Mon Oct 01 2001 Karsten Hopp <karsten at redhat.de>
+- fix name of doc file  (#54137)
+
+* Fri Jul 20 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- exclude s390,s390x
+
+* Mon Jun 25 2001 Karsten Hopp <karsten at redhat.de>
+- update to version 4.1
+- update URL
+
+* Wed Jul 19 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- disable readahead (#14268)
+- add comment in /etc/sysconfig/harddisks about possible extra parameters
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Wed Jul 12 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- disable 32 bit interfacing (#13730)
+
+* Tue Jun 27 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- use %%{_tmppath}
+- add /etc/sysconfig/harddisks, a new file for hardisk 
+  optimization parameters
+
+* Mon Jun 18 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- FHSify
+
+* Sun Apr  9 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- Fix compilation with kernel 2.3.*
+
+* Thu Feb 17 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- 3.9
+- handle RPM_OPT_FLAGS
+
+* Thu Feb 17 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- 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 <notting at redhat.com>
+- build as non-root user (#6458)
+
+* Fri Feb  4 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- deal with RPM compressing man pages
+
+* Fri Nov 19 1999 Bernhard Rosenkraenzer <bero at redhat.com>
+- 3.6
+
+* Thu Aug 12 1999 Cristian Gafton <gafton at redhat.com>
+- version 3.5
+
+* Wed Mar 24 1999 Cristian Gafton <gafton at redhat.com>
+- added patches from UP
+
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+- auto rebuild in the new build environment (release 4)
+
+* Tue Dec 29 1998 Cristian Gafton <gafton at redhat.com>
+- build for 6.0
+
+* Fri Apr 24 1998 Prospector System <bugs at redhat.com>
+- translations modified for de, fr, tr
+
+* Wed Apr 08 1998 Erik Troan <ewt at redhat.com>
+- updated to 3.3
+- build rooted
+
+* Fri Oct 31 1997 Donnie Barnes <djb at redhat.com>
+- fixed spelling error in summary
+
+* Mon Jun 02 1997 Erik Troan <ewt at redhat.com>
+- built against glibc
+



From svn at tinysofa.org  Sun Feb 13 11:16:02 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 06:16:02 -0500 (EST)
Subject: [tinysofa-svn] r5896 - contrib/1.1/sylpheed/current/specs
Message-ID: <20050213111602.A4604344271@minbar.tinysofa.org>

Author: gda
Date: 2005-02-13 06:15:56 -0500 (Sun, 13 Feb 2005)
New Revision: 5896

Modified:
   contrib/1.1/sylpheed/current/specs/sylpheed.spec
Log:
added epoch

Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec
===================================================================
--- contrib/1.1/sylpheed/current/specs/sylpheed.spec	2005-02-13 11:01:44 UTC (rev 5895)
+++ contrib/1.1/sylpheed/current/specs/sylpheed.spec	2005-02-13 11:15:56 UTC (rev 5896)
@@ -1,7 +1,8 @@
 Summary: a GTK+ based, lightweight, and fast e-mail client
 Name: sylpheed
+Epoch: 1
 Version: 1.0.0
-Release: 1gd
+Release: 2gd
 Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Copyright: GPL
 URL: http://sylpheed.good-day.net/
@@ -56,6 +57,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.0-2gd
+- added Epoch
+
 * Tue Dec 28 2004 Gerald Dachs <gda at tinysofa dot org> 1.0.0-1gd
 - 1.0.0
 



From svn at tinysofa.org  Sun Feb 13 08:05:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 03:05:03 -0500 (EST)
Subject: [tinysofa-svn] r5891 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050213080503.ABD2234454A@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 03:04:58 -0500 (Sun, 13 Feb 2005)
New Revision: 5891

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
- add grsecurity
- add sasl packages to cyrus group
- keep dovecot group too


Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-13 08:04:16 UTC (rev 5890)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-13 08:04:58 UTC (rev 5891)
@@ -105,6 +105,7 @@
       <packagereq type="mandatory">fcron</packagereq>     
       <packagereq type="mandatory">file</packagereq>     
       <packagereq type="mandatory">gnupg</packagereq>
+      <packagereq type="default">grsecurity</packagereq>
       <packagereq type="default">hdparm</packagereq>
       <packagereq type="default">kudzu</packagereq>
       <packagereq type="default">less</packagereq>
@@ -449,19 +450,38 @@
   </group>
 
   <group>
-    <id>imap-server</id>
-    <name>IMAP Server (cyrus)</name>
+    <id>cyrus-imap-server</id>
+    <name>IMAP Server (Cyrus IMAPD)</name>
     <description>These packages allow you to configure an IMAP server.</description>
     <uservisible>true</uservisible>
     <grouplist>
       <groupreq>extra</groupreq>
     </grouplist>
     <packagelist>
-      <packagereq type="default">cyrus-imapd</packagereq>
+      <packagereq type="mandatory">cyrus-imapd</packagereq>
+      <packagereq type="mandatory">cyrus-sasl</packagereq>
+      <packagereq type="default">cyrus-sasl-md5</packagereq>
+      <packagereq type="default">cyrus-sasl-otp</packagereq>
+      <packagereq type="default">cyrus-sasl-plain</packagereq>
+      <packagereq type="default">cyrus-sasl-sql</packagereq>
+      <packagereq type="default">cyrus-sasl-utils</packagereq>
     </packagelist>
   </group>
 
   <group>
+    <id>dovecot-imap-server</id>
+    <name>IMAP Server (dovecot)</name>
+    <description>These packages allow you to configure an IMAP server.</description>
+    <uservisible>true</uservisible>
+    <grouplist>
+      <groupreq>extra</groupreq>
+    </grouplist>
+    <packagelist>
+      <packagereq type="default">dovecot</packagereq>
+    </packagelist>
+  </group>
+
+  <group>
     <id>dhcp-server</id>
     <name>DHCP Server (ISC DHCP)</name>
     <description>These packages allow you to configure the ISC DHCP server.</description>
@@ -593,7 +613,8 @@
       <name>Servers</name>
       <subcategories>
         <subcategory>appletalk-server</subcategory>
-        <subcategory>imap-server</subcategory>
+        <subcategory>cyrus-imap-server</subcategory>
+        <subcategory>dovecot-imap-server</subcategory>
         <subcategory>ssh-server</subcategory>
         <subcategory>ldap-server</subcategory>
         <subcategory>tftp-server</subcategory>



From svn at tinysofa.org  Sun Feb 13 09:07:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 04:07:09 -0500 (EST)
Subject: [tinysofa-svn] r5892 - in contrib/1.1/tinysofa-utils/current:
	sources specs
Message-ID: <20050213090709.05CCE3443CF@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 04:07:01 -0500 (Sun, 13 Feb 2005)
New Revision: 5892

Added:
   contrib/1.1/tinysofa-utils/current/sources/rel.sh
Modified:
   contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec
Log:
- add classic server 1.2 release script rel.sh

Added: contrib/1.1/tinysofa-utils/current/sources/rel.sh
===================================================================
--- contrib/1.1/tinysofa-utils/current/sources/rel.sh	2005-02-13 08:04:58 UTC (rev 5891)
+++ contrib/1.1/tinysofa-utils/current/sources/rel.sh	2005-02-13 09:07:01 UTC (rev 5892)
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# tinysofa classic server release script
+#
+# Jaakko Heinonen <jh at tinysofa.org> & Omar Kilani <omar at tinysofa dot org>
+#
+
+ARCH=`uname -m | sed -e 's/i.86/i586/'`
+distname="classic-1.2-test1"
+release="1.1.99"
+
+comps="$1"
+cdroot="$2"
+rpms="$3"
+srpms="$4"
+target="$5"
+
+usage() {
+	cat << __EOF__
+usage: $0 comps cd-root rpms srpms target
+__EOF__
+}
+
+create_isos() {
+	arch="$ARCH"
+	bootimg="isolinux/isolinux.bin"
+	bootcat="isolinux/boot.cat"
+	myname="tinysofa <http://www.tinysofa.org/>"
+	mkisopts="-R -J -T"
+	bootopts="-no-emul-boot -boot-load-size 4 -boot-info-table"
+	isoname="$distname.$arch.iso"
+
+	mkisofs $mkisopts $bootopts \
+	-V "tinysofa $release" \
+	-A "tinysofa $release" \
+	-P "$myname" \
+	-p "$myname" \
+	-b "$bootimg" \
+	-c "$bootcat" \
+	-x lost+found \
+	-o "$isoname" \
+	"$PWD/$arch"
+
+	/usr/lib/anaconda-runtime/implantisomd5 "$isoname"
+	/usr/lib/anaconda-runtime/checkisomd5 --verbose "$isoname"
+
+	mkisofs $mkisopts \
+	-V "tinysofa $release" \
+	-A "tinysofa $release" \
+	-P "$myname" \
+	-p "$myname" \
+	-x lost+found \
+	-o "$distname".src.iso \
+	"$PWD/srpms.os"
+}
+
+fixperms() {
+	find "$@" -type f -print0|xargs -0 chmod 644 --
+	find "$@" -type d -print0|xargs -0 chmod 755 --
+}
+
+if [ ! -f "$comps" -o -z "$rpms" -o -z "$srpms" ]; then
+	usage
+	exit 1
+fi
+
+if [ -d "$target" ]; then
+	echo "Target already exists"
+	exit 1
+fi
+
+mkdir -p "$target"/{srpms.os,$ARCH/tinysofa/{base,rpms.os}}
+cp "$comps" "$target/$ARCH/tinysofa/base/"
+cp -a "$cdroot"/* "$target"/$ARCH
+
+cp "$rpms"/*.rpm "$target"/$ARCH/tinysofa/rpms.os/
+cp "$srpms"/*.rpm "$target"/srpms.os/
+
+pushd "$target"
+echo "Signing packages"
+
+rpm --resign $ARCH/tinysofa/rpms.os/*.rpm srpms.os/*.rpm
+
+pkgorder=`mktemp /tmp/pkgorder.XXXXXXXX`
+rm -rf $ARCH/{buildinstall*,images,isolinux,.discinfo}
+/usr/lib/anaconda-runtime/genhdlist --withnumbers $PWD/$ARCH
+/usr/lib/anaconda-runtime/buildinstall \
+	--pkgorder "$pkgorder" \
+	--version "$release" \
+	--product "tinysofa classic server" \
+	--release "$distname" \
+	"$PWD/$ARCH"
+/usr/lib/anaconda-runtime/genhdlist \
+	--withnumbers \
+	--fileorder "$pkgorder" \
+	"$PWD/$ARCH"
+
+rm -f "$pkgorder"
+
+/usr/bin/genbasedir --bloat -s --meta=all $PWD/$ARCH/tinysofa
+
+fixperms "$PWD/$ARCH" "$PWD/srpms.os"
+
+create_isos
+chmod 644 *.iso
+chmod 755 .
+popd


Property changes on: contrib/1.1/tinysofa-utils/current/sources/rel.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec
===================================================================
--- contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec	2005-02-13 08:04:58 UTC (rev 5891)
+++ contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec	2005-02-13 09:07:01 UTC (rev 5892)
@@ -1,6 +1,6 @@
 Name: tinysofa-utils
 Version: 2.0
-Release: 7jh
+Release: 8jh
 URL: http://www.tinysofa.org
 Summary: tinysofa utilities
 Source1: tsbuild
@@ -12,13 +12,16 @@
 Source7: tsmakesrpm
 Source8: tsmkdir
 Source9: tsrpmbuild
+Source10: rel.sh
 License: GPL
 Group: contrib
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: coreutils
 Requires: rpm python
-# for tsrelease
+# for tsrelease (swup requirements should be removed for 1.2)
 Requires: anaconda-runtime mkisofs gnupg rdfgen apt
+
+Requires: mktemp
 BuildArch: noarch
 
 %description
@@ -42,6 +45,8 @@
 install -m755 %{SOURCE8} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsmkdir
 install -m755 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsrpmbuild
 
+install -m755 %{SOURCE10} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/rel.sh
+
 %clean
 %clean_buildroot
 
@@ -51,6 +56,9 @@
 %{_datadir}/tinysofa-utils/*
 
 %changelog
+* Sun Feb 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.0-8jh
+- add classic server 1.2 release script rel.sh
+
 * Tue Sep 28 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0-6jh
 - add unpackrpm, tsmakesrpm, tsmkdir and tsrpmbuild
 



From svn at tinysofa.org  Sun Feb 13 11:24:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 06:24:06 -0500 (EST)
Subject: [tinysofa-svn] r5898 - tinysofa/releases/1.2/dovecot/current/specs
Message-ID: <20050213112406.948363443BB@minbar.tinysofa.org>

Author: gda
Date: 2005-02-13 06:24:00 -0500 (Sun, 13 Feb 2005)
New Revision: 5898

Modified:
   tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec
Log:
changed group to extra

Modified: tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec
===================================================================
--- tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec	2005-02-13 11:23:43 UTC (rev 5897)
+++ tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec	2005-02-13 11:24:00 UTC (rev 5898)
@@ -1,9 +1,9 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 0.99.13
-Release: 1ts
+Release: 2gd
 License: GPL
-Group: main
+Group: extra
 Source: %{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 0.99.13-2gd
+- changed group to extra
+
 * Mon Jan 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.99.13-1jh
 - 0.99.13
 



From svn at tinysofa.org  Sun Feb 13 13:35:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 08:35:35 -0500 (EST)
Subject: [tinysofa-svn] r5901 - in tinysofa/releases/1.2/tar/current:
	sources specs
Message-ID: <20050213133535.3D12D34439D@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 08:35:16 -0500 (Sun, 13 Feb 2005)
New Revision: 5901

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.006.tar.gz
Removed:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.005.tar.gz
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- 1.02.006

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch	2005-02-13 12:33:46 UTC (rev 5900)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-dirent.patch	2005-02-13 13:35:16 UTC (rev 5901)
@@ -1,13 +0,0 @@
-diff -u bsdtar-1.02.005.orig/tree.c bsdtar-1.02.005/tree.c
---- bsdtar-1.02.005.orig/tree.c	2005-02-09 04:35:40.000000000 +0200
-+++ bsdtar-1.02.005/tree.c	2005-02-10 18:09:25.000000000 +0200
-@@ -103,7 +103,9 @@
- #define hasLstat 32 /* The lst entry is set. */
- 
- 
-+#if 0
- #define HAVE_DIRENT_D_NAMLEN 1
-+#endif
- #ifdef HAVE_DIRENT_D_NAMLEN
- /* BSD extension; avoids need for a strlen() call. */
- #define D_NAMELEN(dp)	(dp)->d_namlen

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch	2005-02-13 12:33:46 UTC (rev 5900)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005-platform.patch	2005-02-13 13:35:16 UTC (rev 5901)
@@ -1,11 +0,0 @@
---- ./tree.c.platform~	2005-02-13 00:05:06.000000000 +0200
-+++ ./tree.c	2005-02-13 00:13:34.000000000 +0200
-@@ -38,6 +38,8 @@
-  * regular dir or via fchdir(2) for a symlink).
-  */
- 
-+#include "bsdtar_platform.h"
-+
- #include <sys/stat.h>
- #include <dirent.h>
- #include <errno.h>

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.005.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.005.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.006.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.006.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-13 12:33:46 UTC (rev 5900)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-13 13:35:16 UTC (rev 5901)
@@ -1,16 +1,14 @@
-%define libarchive_version	1.02.005
+%define libarchive_version	1.02.006
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.005
-Release: 3jh
+Version: 1.02.006
+Release: 1jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
-Patch1: bsdtar-1.02.005-dirent.patch
-Patch2: bsdtar-1.02.005-platform.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,8 +26,6 @@
 %prep
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
-%patch1 -p1 -b .dirent~
-%patch2 -p1 -b .platform~
 
 
 %build
@@ -65,6 +61,9 @@
 
 
 %changelog
+* Sun Feb 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.006-1jh
+- 1.02.006
+
 * Thu Feb 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.005-1jh
 - update to 1.02.005
 



From svn at tinysofa.org  Sun Feb 13 11:23:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 06:23:48 -0500 (EST)
Subject: [tinysofa-svn] r5897 -
	tinysofa/releases/1.2/cyrus-imapd/current/specs
Message-ID: <20050213112348.78EB434437E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-13 06:23:43 -0500 (Sun, 13 Feb 2005)
New Revision: 5897

Modified:
   tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
changed group to main

Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-13 11:15:56 UTC (rev 5896)
+++ tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-13 11:23:43 UTC (rev 5897)
@@ -1,9 +1,9 @@
 Summary: A high-performance mail store with IMAP and POP3 support.
 Name: cyrus-imapd
 Version: 2.2.10
-Release: 5jh
+Release: 6gd
 License: BSD
-Group: extra
+Group: main
 URL: http://asg.web.cmu.edu/cyrus/imapd/
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
 Source1: cyrus-README
@@ -291,6 +291,9 @@
 
 
 %changelog
+* Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.10-6gd
+- changed group to main
+
 * Thu Feb 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.2.10-5jh
 - updated versions of the autosieve and autocreate patches
 



From svn at tinysofa.org  Sun Feb 13 17:33:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 12:33:19 -0500 (EST)
Subject: [tinysofa-svn] r5903 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050213173319.BF0A73444FE@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 12:33:15 -0500 (Sun, 13 Feb 2005)
New Revision: 5903

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
- fix groupreq


Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-13 13:37:57 UTC (rev 5902)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-13 17:33:15 UTC (rev 5903)
@@ -474,7 +474,7 @@
     <description>These packages allow you to configure an IMAP server.</description>
     <uservisible>true</uservisible>
     <grouplist>
-      <groupreq>extra</groupreq>
+      <groupreq>base</groupreq>
     </grouplist>
     <packagelist>
       <packagereq type="default">dovecot</packagereq>



From svn at tinysofa.org  Sun Feb 13 20:35:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 15:35:43 -0500 (EST)
Subject: [tinysofa-svn] r5904 - in tinysofa/releases/1.2/anaconda/current:
	sources specs
Message-ID: <20050213203543.1C8BF3445AE@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 15:35:34 -0500 (Sun, 13 Feb 2005)
New Revision: 5904

Added:
   tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-ide-scsi.patch
Modified:
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- don't use ide-scsi emulation on 2.6


Added: tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-ide-scsi.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-ide-scsi.patch	2005-02-13 17:33:15 UTC (rev 5903)
+++ tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-ide-scsi.patch	2005-02-13 20:35:34 UTC (rev 5904)
@@ -0,0 +1,17 @@
+--- ./bootloaderInfo.py.ide-scsi	2005-02-13 22:32:57.000000000 +0200
++++ ./bootloaderInfo.py	2005-02-13 22:33:34.000000000 +0200
+@@ -1100,14 +1100,6 @@
+                 self.upgradeGrub(instRoot, fsset, bl, langs, kernelList,
+                                  chainList, defaultDev, justConfig)
+ 
+-            # and the hacks continue.  with 2.6, ide-scsi isn't used
+-            # anymore (#116622)
+-            import isys	 
+-            cdrw = isys.ideCdRwList()
+-            torem = []
+-            for device in cdrw:
+-                torem.append("%s=ide-scsi" %(device,))
+-                
+             for fn in ("/etc/lilo.conf", "/boot/grub/grub.conf",
+                        "/etc/lilo.conf.anaconda"):
+                 if not os.path.exists(instRoot + fn):

Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-13 17:33:15 UTC (rev 5903)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-13 20:35:34 UTC (rev 5904)
@@ -40,6 +40,7 @@
 Patch102: booty-0.40-tinysofa-xfs.patch
 Patch103: booty-0.40-tinysofa-xfs-fix.patch
 Patch104: booty-0.40-bootloader.patch
+Patch105: booty-0.40-ide-scsi.patch
 # rhpl patches
 Patch200: rhpl-0.145-tinysofa-keytables.patch
 # common patches
@@ -112,6 +113,7 @@
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
 popd
 
 pushd rhpl-%{rhpl_version}



From svn at tinysofa.org  Sun Feb 13 20:41:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Feb 2005 15:41:36 -0500 (EST)
Subject: [tinysofa-svn] r5905 - in tinysofa/releases/1.2/grsecurity/current:
	sources specs
Message-ID: <20050213204136.4E4D434454D@minbar.tinysofa.org>

Author: jh
Date: 2005-02-13 15:41:28 -0500 (Sun, 13 Feb 2005)
New Revision: 5905

Added:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050213.tar
Removed:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050127.tar
Modified:
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- update policies


Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050127.tar
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050213.tar
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050213.tar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-13 20:35:34 UTC (rev 5904)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-13 20:41:28 UTC (rev 5905)
@@ -1,4 +1,4 @@
-%define policies_date	20050127
+%define policies_date	20050213
 Summary: grsecurity user space utilities and policies
 Name: grsecurity
 Version: 2.1.1



From svn at tinysofa.org  Mon Feb 14 18:13:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 14 Feb 2005 13:13:08 -0500 (EST)
Subject: [tinysofa-svn] r5906 - tinysofa/releases/1.2/cpio/current/specs
Message-ID: <20050214181308.419BB3443C4@minbar.tinysofa.org>

Author: jh
Date: 2005-02-14 13:13:02 -0500 (Mon, 14 Feb 2005)
New Revision: 5906

Modified:
   tinysofa/releases/1.2/cpio/current/specs/cpio.spec
Log:
- bump up release


Modified: tinysofa/releases/1.2/cpio/current/specs/cpio.spec
===================================================================
--- tinysofa/releases/1.2/cpio/current/specs/cpio.spec	2005-02-13 20:41:28 UTC (rev 5905)
+++ tinysofa/releases/1.2/cpio/current/specs/cpio.spec	2005-02-14 18:13:02 UTC (rev 5906)
@@ -4,7 +4,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 1jh
+Release: 2jh
 License: GPL
 Group: main
 URL: http://www.gnu.org/software/cpio/



From svn at tinysofa.org  Mon Feb 14 20:04:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 14 Feb 2005 15:04:43 -0500 (EST)
Subject: [tinysofa-svn] r5907 - contrib/1.1/tinysofa-utils/current/specs
Message-ID: <20050214200443.E56B434454F@minbar.tinysofa.org>

Author: jh
Date: 2005-02-14 15:03:56 -0500 (Mon, 14 Feb 2005)
New Revision: 5907

Modified:
   contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec
Log:
- require rpm-python


Modified: contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec
===================================================================
--- contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec	2005-02-14 18:13:02 UTC (rev 5906)
+++ contrib/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec	2005-02-14 20:03:56 UTC (rev 5907)
@@ -17,7 +17,7 @@
 Group: contrib
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: coreutils
-Requires: rpm python
+Requires: rpm python rpm-python
 # for tsrelease (swup requirements should be removed for 1.2)
 Requires: anaconda-runtime mkisofs gnupg rdfgen apt
 



From svn at tinysofa.org  Mon Feb 14 20:59:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 14 Feb 2005 15:59:51 -0500 (EST)
Subject: [tinysofa-svn] r5908 - in tinysofa/releases/1.2/squid/current:
	sources specs
Message-ID: <20050214205951.08EC7344568@minbar.tinysofa.org>

Author: jh
Date: 2005-02-14 15:58:46 -0500 (Mon, 14 Feb 2005)
New Revision: 5908

Added:
   tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE8-dns_assert.patch
Modified:
   tinysofa/releases/1.2/squid/current/specs/squid.spec
Log:
-  DNS assert DOS fix

Added: tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE8-dns_assert.patch
===================================================================
--- tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE8-dns_assert.patch	2005-02-14 20:03:56 UTC (rev 5907)
+++ tinysofa/releases/1.2/squid/current/sources/squid-2.5.STABLE8-dns_assert.patch	2005-02-14 20:58:46 UTC (rev 5908)
@@ -0,0 +1,77 @@
+Index: squid/src/comm.c
+diff -c squid/src/comm.c:1.324.2.4 squid/src/comm.c:1.324.2.5
+*** squid/src/comm.c:1.324.2.4	Mon Sep 27 12:17:39 2004
+--- squid/src/comm.c	Sat Feb 12 22:53:56 2005
+***************
+*** 411,418 ****
+  	cs->S.sin_family = AF_INET;
+  	cs->S.sin_addr = cs->in_addr;
+  	cs->S.sin_port = htons(cs->port);
+- 	if (Config.onoff.log_fqdn)
+- 	    fqdncache_gethostbyaddr(cs->S.sin_addr, FQDN_LOOKUP_IF_MISS);
+      }
+      switch (comm_connect_addr(fd, &cs->S)) {
+      case COMM_INPROGRESS:
+--- 411,416 ----
+Index: squid/src/fqdncache.c
+diff -c squid/src/fqdncache.c:1.149.2.5 squid/src/fqdncache.c:1.149.2.6
+*** squid/src/fqdncache.c:1.149.2.5	Tue Dec  7 16:40:57 2004
+--- squid/src/fqdncache.c	Sat Feb 12 22:53:56 2005
+***************
+*** 303,309 ****
+  	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+! 	f->names[f->name_count++] = xstrndup(answers[k].rdata, answers[k].rdlength);
+  	if (ttl == 0 || answers[k].ttl < ttl)
+  	    ttl = answers[k].ttl;
+  	if (f->name_count >= FQDN_MAX_NAMES)
+--- 303,311 ----
+  	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+! 	if (!answers[k].rdata[0])
+! 	    continue;
+! 	f->names[f->name_count++] = xstrdup(answers[k].rdata);
+  	if (ttl == 0 || answers[k].ttl < ttl)
+  	    ttl = answers[k].ttl;
+  	if (f->name_count >= FQDN_MAX_NAMES)
+Index: squid/src/ipcache.c
+diff -c squid/src/ipcache.c:1.236.2.5 squid/src/ipcache.c:1.236.2.6
+*** squid/src/ipcache.c:1.236.2.5	Tue Dec  7 16:40:57 2004
+--- squid/src/ipcache.c	Sat Feb 12 22:53:56 2005
+***************
+*** 338,343 ****
+--- 338,347 ----
+  	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
++ 	if (answers[k].rdlength != 4) {
++ 	    debug(14, 1) ("ipcacheParse: Invalid IP address in response to '%s'\n", name);
++ 	    continue;
++ 	}
+  	na++;
+      }
+      if (na == 0) {
+***************
+*** 353,361 ****
+  	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+  	if (ttl == 0 || ttl > answers[k].ttl)
+  	    ttl = answers[k].ttl;
+- 	assert(answers[k].rdlength == 4);
+  	xmemcpy(&i->addrs.in_addrs[j++], answers[k].rdata, 4);
+  	debug(14, 3) ("ipcacheParse: #%d %s\n",
+  	    j - 1,
+--- 357,366 ----
+  	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
++ 	if (answers[k].rdlength != 4)
++ 	    continue;
+  	if (ttl == 0 || ttl > answers[k].ttl)
+  	    ttl = answers[k].ttl;
+  	xmemcpy(&i->addrs.in_addrs[j++], answers[k].rdata, 4);
+  	debug(14, 3) ("ipcacheParse: #%d %s\n",
+  	    j - 1,

Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec
===================================================================
--- tinysofa/releases/1.2/squid/current/specs/squid.spec	2005-02-14 20:03:56 UTC (rev 5907)
+++ tinysofa/releases/1.2/squid/current/specs/squid.spec	2005-02-14 20:58:46 UTC (rev 5908)
@@ -4,7 +4,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE7
-Release: 7jh
+Release: 8jh
 Epoch: 0
 License: GPL
 Group: extra
@@ -31,6 +31,7 @@
 Patch14: squid-2.5.STABLE7-oversize_reply_headers.patch
 Patch15: squid-2.5.STABLE7-empty_acls.patch
 Patch16: squid-2.5.STABLE7-dothost.patch
+Patch17: squid-2.5.STABLE8-dns_assert.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: logrotate coreutils /usr/bin/find
@@ -70,6 +71,7 @@
 %patch14 -p1 -b .oversize_reply_headers
 %patch15 -p1 -b .empty_acls
 %patch16 -p1 -b .dothost
+%patch17 -p1 -b .dns_assert
 
 
 %build
@@ -295,6 +297,9 @@
 
 
 %changelog
+* Mon Feb 14 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE7-7jh
+-  DNS assert DOS fix
+
 * Tue Feb  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE7-6jh
 - fix oversized reply header handling security issue
 - add squid-2.5.STABLE7-response_splitting.patch



From svn at tinysofa.org  Mon Feb 14 21:01:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 14 Feb 2005 16:01:03 -0500 (EST)
Subject: [tinysofa-svn] r5909 - in tinysofa/releases/1.2/syslinux/current:
	sources specs
Message-ID: <20050214210103.76FDF34430B@minbar.tinysofa.org>

Author: jh
Date: 2005-02-14 15:59:12 -0500 (Mon, 14 Feb 2005)
New Revision: 5909

Added:
   tinysofa/releases/1.2/syslinux/current/sources/syslinux-2.11.tar.bz2
Removed:
   tinysofa/releases/1.2/syslinux/current/sources/syslinux-2.10.tar.bz2
Modified:
   tinysofa/releases/1.2/syslinux/current/specs/syslinux.spec
Log:
- 2.11

Deleted: tinysofa/releases/1.2/syslinux/current/sources/syslinux-2.10.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/syslinux/current/sources/syslinux-2.11.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/syslinux/current/sources/syslinux-2.11.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/syslinux/current/specs/syslinux.spec
===================================================================
--- tinysofa/releases/1.2/syslinux/current/specs/syslinux.spec	2005-02-14 20:58:46 UTC (rev 5908)
+++ tinysofa/releases/1.2/syslinux/current/specs/syslinux.spec	2005-02-14 20:59:12 UTC (rev 5909)
@@ -1,6 +1,6 @@
 Summary: Kernel loader which uses a FAT or iso9660 filesystem or a PXE network
 Name:    syslinux
-Version: 2.10
+Version: 2.11
 Release: 2jh
 License: GPL
 Group: extra
@@ -33,9 +33,9 @@
 
 
 %build
-make DATE="$(echo `date +%%m-%%d-%%Y` tinysofa build)" \
+make "DATE=\"`date +%%m-%%d-%%Y` tinysofa build\"" \
      CC="gcc %{?no_stack_protector}" clean
-make DATE="$(echo `date +%%m-%%d-%%Y` tinysofa build)" \
+make DATE="\"`date +%%m-%%d-%%Y` tinysofa build\"" \
      CC="gcc %{?no_stack_protector}" installer
 mv syslinux syslinux-mtools
 mv syslinux-nomtools syslinux
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Feb 14 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.11-1jh
+- 2.11
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 2.10-1ts
 - current (2.10-1jh) integrated as 2.10-1ts for release 1.1-U3
 



From svn at tinysofa.org  Tue Feb 15 17:00:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Feb 2005 12:00:31 -0500 (EST)
Subject: [tinysofa-svn] r5910 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050215170031.495C3344315@minbar.tinysofa.org>

Author: jh
Date: 2005-02-15 12:00:25 -0500 (Tue, 15 Feb 2005)
New Revision: 5910

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
- remove php-xmlrpc


Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-14 20:59:12 UTC (rev 5909)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-15 17:00:25 UTC (rev 5910)
@@ -597,7 +597,6 @@
       <packagereq type="optional">php-mysql</packagereq>
       <packagereq type="optional">php-ncurses</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
-      <packagereq type="optional">php-xmlrpc</packagereq>
     </packagelist>
   </group>
 



From svn at tinysofa.org  Tue Feb 15 18:20:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Feb 2005 13:20:07 -0500 (EST)
Subject: [tinysofa-svn] r5911 - in tinysofa/releases/1.2/grsecurity/current:
	sources specs
Message-ID: <20050215182007.50464344285@minbar.tinysofa.org>

Author: jh
Date: 2005-02-15 13:19:56 -0500 (Tue, 15 Feb 2005)
New Revision: 5911

Added:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050215.tar
Removed:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050213.tar
Modified:
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- update policies


Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050213.tar
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050215.tar
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050215.tar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-15 17:00:25 UTC (rev 5910)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-15 18:19:56 UTC (rev 5911)
@@ -1,4 +1,4 @@
-%define policies_date	20050213
+%define policies_date	20050215
 Summary: grsecurity user space utilities and policies
 Name: grsecurity
 Version: 2.1.1
@@ -20,7 +20,7 @@
 %description
 grsecurity aims to be a complete security system for Linux kernel.
 %{name} package provides utilities to performs several tasks for the
-Role-Based Access Control (RBAC) system including authenticated via a
+Role-Based Access Control (RBAC) system including authentication via a
 password to the kernel and parsing rules to be passed to the kernel.
 
 



From svn at tinysofa.org  Tue Feb 15 18:29:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Feb 2005 13:29:49 -0500 (EST)
Subject: [tinysofa-svn] r5912 - tinysofa/releases/1.2/nfs-utils/current/specs
Message-ID: <20050215182949.C2131344307@minbar.tinysofa.org>

Author: jh
Date: 2005-02-15 13:29:44 -0500 (Tue, 15 Feb 2005)
New Revision: 5912

Modified:
   tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec
Log:
- modutils -> module-init-tools


Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec
===================================================================
--- tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec	2005-02-15 18:19:56 UTC (rev 5911)
+++ tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec	2005-02-15 18:29:44 UTC (rev 5912)
@@ -84,7 +84,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: portmap >= 4.0, sed, gawk
 PreReq: coreutils, grep
-Requires: modutils >= 2.4.26-9
+Requires: module-init-tools
 BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57
 BuildRequires: tcp_wrappers-devel gcc-c++ openldap-devel cyrus-sasl-devel
 %service_requires



From svn at tinysofa.org  Tue Feb 15 19:19:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Feb 2005 14:19:52 -0500 (EST)
Subject: [tinysofa-svn] r5913 - in tinysofa/releases/1.2/kudzu/current:
	sources specs
Message-ID: <20050215191952.E187A344315@minbar.tinysofa.org>

Author: jh
Date: 2005-02-15 14:19:43 -0500 (Tue, 15 Feb 2005)
New Revision: 5913

Added:
   tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-kernel26.patch
Modified:
   tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec
Log:
- add a patch for 2.6 kernel

Added: tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-kernel26.patch
===================================================================
--- tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-kernel26.patch	2005-02-15 18:29:44 UTC (rev 5912)
+++ tinysofa/releases/1.2/kudzu/current/sources/kudzu-1.1.22-kernel26.patch	2005-02-15 19:19:43 UTC (rev 5913)
@@ -0,0 +1,401 @@
+--- ./usb.c.kernel26~	2004-04-01 08:03:01.000000000 +0300
++++ ./usb.c	2005-02-15 20:55:56.000000000 +0200
+@@ -139,9 +139,9 @@
+ {
+ 	int fd;
+ 	char *b, *buf, *tmp, *ptr;
+-	unsigned int vend, dev;
++	unsigned int vend = 0, dev;
+ 	struct usbdesc tmpdev;
+-	char *vendor;
++	char *vendor = NULL;
+ 	struct utsname utsbuf;
+ 	char path[256];
+ 
+@@ -158,11 +158,22 @@
+ 		snprintf(path,255,"/lib/modules/%s/modules.usbmap", utsbuf.release);
+ 	}
+ 	fd = open(path, O_RDONLY);
++        if (fd < 0) {
++            fd = open("/modules/modules.usbmap",O_RDONLY);
++            if (fd < 0) {
++                fd = open("./modules.usbmap",O_RDONLY);
++                if (fd < 0)
++                    return 0;
++            }
++        }
++
+ 	if (fd >= 0) {
+ 		char *drv;
+ 		int vid, did;
+ 		
+ 		b = buf = bufFromFd(fd);
++                if (!buf) return 0;
++
+ 		while (*buf) {
+  			ptr = buf;
+ 			while (*ptr && *ptr != '\n')
+@@ -223,6 +234,7 @@
+ 		}
+ 	}
+ 	b = buf = bufFromFd(fd);
++        if (!buf) return -1;
+ 
+ 	while (*buf) {
+ 		ptr = buf;
+@@ -353,7 +365,6 @@
+ 	}
+ }
+ 
+-
+ static void parseDescriptorLine(char *line, struct usbDevice *usbdev)
+ {
+ 	usbdev->usbclass = atoi(&line[30]);
+@@ -362,27 +373,32 @@
+ 	usbdev->type =
+ 		usbToKudzu(usbdev->usbclass, usbdev->usbsubclass,
+ 			   usbdev->usbprotocol);
+-	if (usbdev->type == CLASS_MOUSE) {
+-		free(usbdev->driver);
+-		if (usbdev->device)
+-			free(usbdev->device);
+-		usbdev->driver = strdup("mousedev");
++	if (usbdev->device) {
++		free(usbdev->device);
++		usbdev->device = NULL;
++	}
++	free(usbdev->driver);
++
++	switch (usbdev->type) {
++	case CLASS_MOUSE:
++		usbdev->driver = strdup("genericwheelusb");
+ 		usbdev->device = strdup("input/mice");
+-	}
+-	if (usbdev->type == CLASS_KEYBOARD) {
+-		free(usbdev->driver);
++		break;
++	case CLASS_KEYBOARD:
+ 		usbdev->driver = strdup("keybdev");
+ 		usbdev->type = CLASS_KEYBOARD;
+-	}
+-	if (usbdev->type == CLASS_FLOPPY ||
+-	    usbdev->type == CLASS_CDROM ||
+-	    usbdev->type == CLASS_HD) {
+-		free(usbdev->driver);
++		break;
++	case CLASS_FLOPPY:
++	case CLASS_CDROM:
++	case CLASS_HD:
+ 		usbdev->driver = strdup("usb-storage");
+-	}
+-	if (usbdev->type == CLASS_AUDIO) {
+-		free(usbdev->driver);
+-		usbdev->driver = strdup("audio");
++		break;
++	case CLASS_AUDIO:
++		usbdev->driver = strdup("snd-usb-audio");
++		break;
++	default:
++		usbdev->driver = strdup("unknown");
++		break;
+ 	}
+ }
+ 
+@@ -485,6 +501,11 @@
+ 		if (usbdev->type == CLASS_OTHER)
+ 			usbdev->type = CLASS_NETWORK;
+ 	}
++	if (strcasestr(usbdev->desc,"Wacom") &&
++	    usbdev->type == CLASS_MOUSE) {
++		free(usbdev->driver);
++		usbdev->driver = strdup("wacom");
++	}
+ 		
+ 	if (usbdev->type & probeClass) {
+ 		usbdev->next = devlist;
+@@ -495,6 +516,27 @@
+ 	*devlistptr = devlist;
+ }
+ 
++static int
++usbDeviceIgnore (struct usbDevice *usbdev, const char *line)
++{
++	int proto, alt;
++
++	if (usbdev != NULL) {
++		/* If the Proto is different, it's a different device */
++		proto = atoi(&line[52]);
++		if (proto != usbdev->usbprotocol) {
++			return 0;
++		}
++	}
++
++	/* Alt needs to be '0' */
++	alt = atoi(&line[15]);
++	if (alt != 0) {
++		return 1;
++	}
++
++	return 0;
++}
+ 
+ struct device *usbProbe(enum deviceClass probeClass, int probeFlags,
+ 			struct device *devlist)
+@@ -526,8 +568,8 @@
+ 		}
+ 		probeMods = malloc(2 * sizeof(struct module));
+ 		probeMods[0].name = NULL;
+-		cf = readConfModules("/etc/modules.conf");
+-		if (cf && (alias = getAlias(cf, "usb-controller"))
++		cf = readConfModules("/etc/modprobe.conf");
++		if (cf && (alias = getAlias(cf, "usb-controller"))
+ 		    && !loadModule(alias)) {
+ 			probeMods[0].name = strdup(alias);
+ 			probeMods[0].loaded = 1;
+@@ -570,6 +612,10 @@
+ 				parseTopologyLine(line, usbdev);
+ 				break;
+ 			case 'I':
++				if (usbDeviceIgnore (usbdev, line) != 0) {
++					break;
++				}
++				/* Interface number > 0 */
+ 				if (atoi(line+8) > 0) {
+ 					if (usbdev != NULL) {
+ 						tmpdev = usbNewDevice(usbdev);
+--- ./modules.c.kernel26~	2002-11-13 22:12:06.000000000 +0200
++++ ./modules.c	2005-02-15 20:55:56.000000000 +0200
+@@ -9,7 +9,7 @@
+  *
+  */
+ 
+-/* Handle stuff in /etc/modules.conf. */
++/* Handle stuff in /etc/modprobe.conf. */
+ 
+ #include <ctype.h>
+ #include <fcntl.h>
+@@ -386,26 +386,55 @@
+ 	long usecount;
+ };
+ 
++static char * modNameMunge(char * mod) {
++	unsigned int i;
++
++	for (i = 0; mod[i]; i++) {
++		if (mod[i] == '-')
++			mod[i] = '_';
++	}
++	return mod;
++}
++
+ int isLoaded(char *module) {
+-	struct module_info mi;
+-	int tmp;
+-	return !syscall(SYS_query_module,module,QM_INFO,&mi,sizeof(mi),&tmp);
++	FILE *pm;
++        char * mod = NULL;
++	char line[256];
++	char path[256];
++	
++	pm = fopen("/proc/modules", "r");
++	if (!pm)
++		return 0;
++
++	mod = strdup(module);
++	mod = modNameMunge(mod);
++	snprintf(path,255,"%s ", mod);
++	while (fgets(line, sizeof(line),pm)) {
++		if (!strncmp(line,path,strlen(path))) {
++			free(mod);
++			fclose(pm);
++			return 1;
++		}
++	}
++	free(mod);
++	fclose(pm);
++	return 0;
+ }
+ 
+ int loadModule(char *module) {
+-	char *args[] = { "/sbin/modprobe", NULL, NULL };
++	char *args[] = { "/sbin/modprobe", "-s", "-q", NULL, NULL };
+ 	if (isLoaded(module)) {
+ 		return -1;
+ 	} else {
+-		args[1] = module;
++		args[3] = module;
+ 		return runModuleCommand(args);
+ 	}
+ }
+ 
+ int removeModule(char *module) {
+-	char *args[] = { "/sbin/modprobe", "-r", NULL, NULL };
++	char *args[] = { "/sbin/modprobe", "-q", "-r", NULL, NULL };
+ 	if (isLoaded(module)) {
+-		args[2] = module;
++		args[3] = module;
+ 		return runModuleCommand(args);
+ 	} else {
+ 		return -1;
+--- ./module_upgrade.c.kernel26~	2003-04-16 22:49:17.000000000 +0300
++++ ./module_upgrade.c	2005-02-15 20:55:56.000000000 +0200
+@@ -123,13 +123,37 @@
+ 
+ 	readModlist();
+ 	
+-	cf = readConfModules("/etc/modules.conf");
++	cf = readConfModules("/etc/modprobe.conf");
+ 	if (!cf)
+ 	  return 0;
+         /* thrown in here for lack of any place better. */
+ 	if ((aliasfoo = getAlias(cf, "sound"))) {
+ 		removeAlias(cf,"sound",CM_REPLACE);
+-		addAlias(cf,"sound-slot-0", aliasfoo, CM_REPLACE);
++		addAlias(cf,"snd-card-0", aliasfoo, CM_REPLACE);
++		changed++;
++	}
++	for (x = 0; ; x++) {
++		char path[256];
++		snprintf(alias, 64, "sound-slot-%d", x);
++		aliasfoo = getAlias(cf,alias);
++		if (!aliasfoo)
++			break;
++		removeAlias(cf,alias,CM_REPLACE);
++		snprintf(alias, 64, "snd-card-%d",x);
++		addAlias(cf,alias, aliasfoo, CM_REPLACE);
++		snprintf(path,256,"options snd-card-%d index=%d",x,x);
++		addLine(cf,path,CM_REPLACE);
++		snprintf(path,256,"install %s /sbin/modprobe --ignore-install %s && /usr/sbin/alsactl restore >/dev/null 2>&1 || :", aliasfoo, aliasfoo);
++		addLine(cf,path,CM_REPLACE);
++		snprintf(path,256,"remove %s { /usr/sbin/alsactl store >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",aliasfoo, aliasfoo);
++		addLine(cf,path,CM_REPLACE);
++		snprintf(path,256,"post-install sound-slot-%d /bin/aumix-minimal -f /etc/.aumixrc -L >/dev/null 2>&1 || :", x);
++		removeLine(cf,path,CM_REPLACE);
++		snprintf(path,256,"pre-remove sound-slot-%d /bin/aumix-minimal -f /etc/.aumixrc -S >/dev/null 2>&1 || :", x);
++		removeLine(cf,path,CM_REPLACE);
++		openlog("kudzu",0,LOG_USER);
++		syslog(LOG_NOTICE,"changed sound-slot-%d alias to snd-card-%d, adjusted mixer calls", x, x);
++		closelog();
+ 		changed++;
+ 	}
+ 	if ((aliasfoo = getAlias(cf, "midi"))) {
+@@ -188,10 +212,30 @@
+ 			}
+ 			break;
+ 		 case CLASS_AUDIO:
+-			while ( (rc = isAliased(cf,"sound-slot-",l->name)) != -1) {
++			while ( (rc = isAliased(cf,"snd-card-",l->name)) != -1) {
+ 				if (x == rc) break;
+ 				x = rc;
+-				snprintf(alias, 64, "sound-slot-%d",x);
++				snprintf(alias, 64, "snd-card-%d",x);
++				for (tmpdev = devs[0]; tmpdev; tmpdev = tmpdev->next)
++				  for (i=0; l->newnames[i]; i++)
++				    if (!strcmp(l->newnames[i], tmpdev->driver)) {
++					    addAlias(cf,alias, tmpdev->driver, CM_REPLACE);
++					    changed++;
++					    openlog("kudzu",0,LOG_USER);
++					    syslog(LOG_NOTICE,"changed %s alias from %s to %s",
++						   alias,l->name, tmpdev->driver);
++					    closelog();
++				    }
++			}
++			break;
++		 case CLASS_USB:
++			while ( (rc = isAliased(cf,"usb-controller",l->name)) != -1) {
++				if (x == rc) break;
++				x = rc;
++				if (x)
++				  snprintf(alias, 64, "usb-controller%d",x);
++				else
++				  snprintf(alias, 64, "usb-controller");
+ 				for (tmpdev = devs[0]; tmpdev; tmpdev = tmpdev->next)
+ 				  for (i=0; l->newnames[i]; i++)
+ 				    if (!strcmp(l->newnames[i], tmpdev->driver)) {
+@@ -210,7 +254,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		writeConfModules(cf, "/etc/modules.conf");
++		writeConfModules(cf, "/etc/modprobe.conf");
+ 	}
+ 	return 0;
+ }
+--- ./scsi.c.kernel26~	2003-10-17 23:30:38.000000000 +0300
++++ ./scsi.c	2005-02-15 20:58:23.000000000 +0200
+@@ -185,10 +185,10 @@
+ static void scsiFindDeviceNames(struct scsiDevice * devlist, int forceSeq) {
+     struct scsiDevice * dev;
+     int rc;
++    int genericNum = 0;
+     char devName[50], gdevName[50];
+ 
+     if (forceSeq) {
+-	int genericNum = 0;
+ 	int driveNum = 0;
+ 	int tapeNum = 0;
+ 	int cdromNum = 0;
+@@ -336,8 +336,9 @@
+ 	    
+ 	probeMods = malloc(2 * sizeof(struct module));
+ 	probeMods[0].name = NULL;
+-	cf = readConfModules("/etc/modules.conf");
+-	if (cf && (alias = getAlias(cf,"scsi_hostadapter")) && !loadModule(alias)) {
++	cf = readConfModules("/etc/modprobe.conf");
++	if (cf && (alias = getAlias(cf, "usb-controller"))
++	    && !loadModule(alias)) {
+ 		probeMods[0].name = strdup(alias);
+ 		free(alias);
+ 		probeMods[0].loaded = 1;
+@@ -385,7 +386,7 @@
+ 	    
+ 	    switch (state) {
+ 	     case SCSISCSI_TOP:
+-		if (strcmp("Attached devices: ", start)) {
++		if (strncmp("Attached devices:", start, 17)) {
+ 		    goto out;
+  		}
+ 		state = SCSISCSI_HOST;
+--- ./usb.h.kernel26~	2003-07-03 07:29:27.000000000 +0300
++++ ./usb.h	2005-02-15 20:55:56.000000000 +0200
+@@ -13,6 +13,7 @@
+ #define _KUDZU_USB_H
+ 
+ #include "device.h"
++#include "kudzu.h"
+ 
+ struct usbDevice {
+         /* common fields */
+--- ./kudzu.8.kernel26~	2003-02-13 22:43:25.000000000 +0200
++++ ./kudzu.8	2005-02-15 20:55:56.000000000 +0200
+@@ -21,9 +21,9 @@
+ .B kudzu
+ attempts to determine what devices have already been configured,
+ by looking at
+-.I /etc/modules.conf,
++.I /etc/modprobe.conf,
+ .I /etc/sysconfig/network-scripts/, and 
+-.I /etc/X11/XF86Config.
++.I /etc/X11/xorg.conf.
+ 
+ .SH OPTIONS
+ .TP
+@@ -77,7 +77,7 @@
+ Configuration for the boot-time hardware probe. Set 'SAFE' to something
+ other than 'no' to force only safe probes.
+ .TP
+-.I /etc/modules.conf
++.I /etc/modprobe.conf
+ Module configuration file.
+ .TP
+ .I /etc/sysconfig/network-scripts/ifcfg-*
+--- ./modules.h.kernel26~	2002-11-13 22:12:06.000000000 +0200
++++ ./modules.h	2005-02-15 20:55:56.000000000 +0200
+@@ -58,6 +58,7 @@
+  *   alias eth2 tulip
+  */
+ int isAliased(struct confModules *cf, char *alias, char *module);
++int isLoaded(char *module);
+ int getLogLevel();
+ void setLogLevel(int level);
+ int loadModule(char *module);

Modified: tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec
===================================================================
--- tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec	2005-02-15 18:29:44 UTC (rev 5912)
+++ tinysofa/releases/1.2/kudzu/current/specs/kudzu.spec	2005-02-15 19:19:43 UTC (rev 5913)
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.1.22.9
-Release: 1jh
+Release: 2jh
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: main
@@ -9,9 +9,10 @@
 Source2: kudzu.init
 Patch0: kudzu-1.1.22.tinysofa.patch
 Patch1: kudzu-1.1.22-link-slang.patch
+Patch2: kudzu-1.1.22-kernel26.patch
 Requires: hwdata
 Obsoletes: rhs-hwdiag setconsole
-Prereq: modutils >= 2.3.11-5, chkconfig
+Prereq: module-init-tools, chkconfig
 BuildPrereq: pciutils-devel python-devel newt-devel
 BuildRequires: gettext python slang-devel
 %ifarch %{ix86}
@@ -35,8 +36,9 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .slang~
+%patch1 -p1 -b .tinysofa~
+%patch2 -p1 -b .kernel26~
 
 
 %build
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Tue Feb 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.22.9-2jh
+- add a patch for 2.6 kernel
+
 * Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.22.9-1jh
 - new upstream
 



From svn at tinysofa.org  Tue Feb 15 19:28:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Feb 2005 14:28:06 -0500 (EST)
Subject: [tinysofa-svn] r5914 - in tinysofa/releases/1.2/tar/current:
	sources specs
Message-ID: <20050215192806.6F82B34437F@minbar.tinysofa.org>

Author: jh
Date: 2005-02-15 14:27:54 -0500 (Tue, 15 Feb 2005)
New Revision: 5914

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006-malloc.patch
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- revert bsdtar sources back to 1.01.022

Copied: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz (from rev 5800, tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz)

Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006-malloc.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006-malloc.patch	2005-02-15 19:19:43 UTC (rev 5913)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006-malloc.patch	2005-02-15 19:27:54 UTC (rev 5914)
@@ -0,0 +1,24 @@
+--- bsdtar-1.02.006/tree.c.malloc~	2005-02-13 01:43:21.000000000 +0200
++++ bsdtar-1.02.006/tree.c	2005-02-13 16:19:08.000000000 +0200
+@@ -147,6 +147,10 @@
+ 	struct tree_entry *te;
+ 
+ 	te = malloc(sizeof(*te));
++	if(te == NULL) {
++		perror("No Memory");
++		exit(1);
++	}
+ 	memset(te, 0, sizeof(*te));
+ 	te->next = t->stack;
+ 	t->stack = te;
+@@ -193,6 +197,10 @@
+ 	struct tree *t;
+ 
+ 	t = malloc(sizeof(*t));
++	if(t == NULL) {
++		perror("No Memory");
++		exit(1);
++	}
+ 	memset(t, 0, sizeof(*t));
+ 	tree_append(t, path, strlen(path));
+ 	t->initialDirFd = open(".", O_RDONLY);

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-15 19:19:43 UTC (rev 5913)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-15 19:27:54 UTC (rev 5914)
@@ -2,13 +2,14 @@
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.006
+Version: 1.01.022
 Release: 1jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
+Patch1: bsdtar-1.02.006-malloc.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
+###%patch1 -p1 -b .malloc~
 
 
 %build
@@ -61,8 +63,12 @@
 
 
 %changelog
+* Tue Feb 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-4jh
+- revert bsdtar sources back to 1.01.022
+
 * Sun Feb 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.006-1jh
 - 1.02.006
+- add malloc patch
 
 * Thu Feb 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.005-1jh
 - update to 1.02.005



From svn at tinysofa.org  Wed Feb 16 15:15:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 10:15:08 -0500 (EST)
Subject: [tinysofa-svn] r5915 - tinysofa/releases/1.2/bind/current/specs
Message-ID: <20050216151508.9E187344275@minbar.tinysofa.org>

Author: jh
Date: 2005-02-16 10:15:00 -0500 (Wed, 16 Feb 2005)
New Revision: 5915

Modified:
   tinysofa/releases/1.2/bind/current/specs/bind.spec
Log:
- remove duplicate files


Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec
===================================================================
--- tinysofa/releases/1.2/bind/current/specs/bind.spec	2005-02-15 19:27:54 UTC (rev 5914)
+++ tinysofa/releases/1.2/bind/current/specs/bind.spec	2005-02-16 15:15:00 UTC (rev 5915)
@@ -432,12 +432,16 @@
 %{_sbindir}/rndc-confgen
 # chroot stuff
 %defattr(0640,root,root,0755)
-%{jail}
-%attr(0755,named,named) %{jail}%{_localstatedir}/named
+%dir %{jail}
+%dir %{jail}/dev
+%dir %{jail}%{_localstatedir}
+%dir %{jail}%{_localstatedir}/run
+%dir %attr(0755,named,named) %{jail}%{_localstatedir}/named
 %attr(0640,named,named) %{jail}%{_localstatedir}/named/named.ca
 %attr(0640,named,named) %{jail}%{_localstatedir}/named/named.local
 %attr(0755,named,named) %dir %{jail}%{_localstatedir}/run/named
 %attr(0750,named,named) %dir %{jail}%{_localstatedir}/named/dump
+%{jail}%{_sysconfdir}
 
 %files libs
 %defattr(755,root,root)



From svn at tinysofa.org  Wed Feb 16 18:13:27 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:13:27 -0500 (EST)
Subject: [tinysofa-svn] r5916 - contrib/1.2
Message-ID: <20050216181327.C561334439D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:13:19 -0500 (Wed, 16 Feb 2005)
New Revision: 5916

Added:
   contrib/1.2/abiword/
Log:
builds with tcs 1.2

Copied: contrib/1.2/abiword (from rev 5915, contrib/1.1/abiword)



From svn at tinysofa.org  Wed Feb 16 18:16:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:16:08 -0500 (EST)
Subject: [tinysofa-svn] r5917 - contrib/1.2
Message-ID: <20050216181608.002643443F2@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:16:00 -0500 (Wed, 16 Feb 2005)
New Revision: 5917

Added:
   contrib/1.2/aspell/
Log:
builds with tcs 1.2

Copied: contrib/1.2/aspell (from rev 5916, contrib/1.1/aspell)



From svn at tinysofa.org  Wed Feb 16 18:17:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:17:50 -0500 (EST)
Subject: [tinysofa-svn] r5918 - contrib/1.2
Message-ID: <20050216181750.EBC6934441D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:17:43 -0500 (Wed, 16 Feb 2005)
New Revision: 5918

Added:
   contrib/1.2/atk/
Log:
builds with tcs 1.2

Copied: contrib/1.2/atk (from rev 5917, contrib/1.1/atk)



From svn at tinysofa.org  Wed Feb 16 18:23:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:23:54 -0500 (EST)
Subject: [tinysofa-svn] r5919 - contrib/1.2
Message-ID: <20050216182354.B77B1344475@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:23:48 -0500 (Wed, 16 Feb 2005)
New Revision: 5919

Added:
   contrib/1.2/bluefish/
Log:
builds with tcs 1.2

Copied: contrib/1.2/bluefish (from rev 5918, contrib/1.1/bluefish)



From svn at tinysofa.org  Wed Feb 16 18:24:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:24:25 -0500 (EST)
Subject: [tinysofa-svn] r5920 - contrib/1.2
Message-ID: <20050216182425.3A656344475@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:24:17 -0500 (Wed, 16 Feb 2005)
New Revision: 5920

Added:
   contrib/1.2/clamav/
Log:
builds with tcs 1.2

Copied: contrib/1.2/clamav (from rev 5919, contrib/1.1/clamav)



From svn at tinysofa.org  Wed Feb 16 18:25:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:25:09 -0500 (EST)
Subject: [tinysofa-svn] r5921 - contrib/1.2
Message-ID: <20050216182509.A2A15344475@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:25:04 -0500 (Wed, 16 Feb 2005)
New Revision: 5921

Removed:
   contrib/1.2/clamav/
Log:
has changed



From svn at tinysofa.org  Wed Feb 16 18:25:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:25:38 -0500 (EST)
Subject: [tinysofa-svn] r5922 - contrib/1.2
Message-ID: <20050216182538.83661344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:25:30 -0500 (Wed, 16 Feb 2005)
New Revision: 5922

Added:
   contrib/1.2/chkfontpath/
Log:
builds with tcs 1.2

Copied: contrib/1.2/chkfontpath (from rev 5921, contrib/1.1/chkfontpath)



From svn at tinysofa.org  Wed Feb 16 18:27:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:27:12 -0500 (EST)
Subject: [tinysofa-svn] r5923 - contrib/1.2
Message-ID: <20050216182712.D2F42344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:27:04 -0500 (Wed, 16 Feb 2005)
New Revision: 5923

Added:
   contrib/1.2/compface/
Log:
builds with tcs 1.2

Copied: contrib/1.2/compface (from rev 5922, contrib/1.1/compface)



From svn at tinysofa.org  Wed Feb 16 18:27:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:27:33 -0500 (EST)
Subject: [tinysofa-svn] r5924 - contrib/1.2
Message-ID: <20050216182733.AC904344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:27:27 -0500 (Wed, 16 Feb 2005)
New Revision: 5924

Added:
   contrib/1.2/ddd/
Log:
builds with tcs 1.2

Copied: contrib/1.2/ddd (from rev 5923, contrib/1.1/ddd)



From svn at tinysofa.org  Wed Feb 16 18:27:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:27:57 -0500 (EST)
Subject: [tinysofa-svn] r5925 - contrib/1.2
Message-ID: <20050216182757.2CF66344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:27:50 -0500 (Wed, 16 Feb 2005)
New Revision: 5925

Added:
   contrib/1.2/distcc/
Log:
builds with tcs 1.2

Copied: contrib/1.2/distcc (from rev 5924, contrib/1.1/distcc)



From svn at tinysofa.org  Wed Feb 16 18:28:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:28:32 -0500 (EST)
Subject: [tinysofa-svn] r5926 - contrib/1.2
Message-ID: <20050216182832.4317B344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:28:26 -0500 (Wed, 16 Feb 2005)
New Revision: 5926

Added:
   contrib/1.2/fontconfig/
Log:
builds with tcs 1.2

Copied: contrib/1.2/fontconfig (from rev 5925, contrib/1.1/fontconfig)



From svn at tinysofa.org  Wed Feb 16 18:28:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:28:53 -0500 (EST)
Subject: [tinysofa-svn] r5927 - contrib/1.2
Message-ID: <20050216182853.563DA344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:28:47 -0500 (Wed, 16 Feb 2005)
New Revision: 5927

Added:
   contrib/1.2/fox/
Log:
builds with tcs 1.2

Copied: contrib/1.2/fox (from rev 5926, contrib/1.1/fox)



From svn at tinysofa.org  Wed Feb 16 18:29:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:29:23 -0500 (EST)
Subject: [tinysofa-svn] r5928 - contrib/1.2
Message-ID: <20050216182923.EC409344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:29:17 -0500 (Wed, 16 Feb 2005)
New Revision: 5928

Added:
   contrib/1.2/fribidi/
Log:
builds with tcs 1.2

Copied: contrib/1.2/fribidi (from rev 5927, contrib/1.1/fribidi)



From svn at tinysofa.org  Wed Feb 16 18:29:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:29:40 -0500 (EST)
Subject: [tinysofa-svn] r5929 - contrib/1.2
Message-ID: <20050216182940.F250E344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:29:34 -0500 (Wed, 16 Feb 2005)
New Revision: 5929

Added:
   contrib/1.2/gdk-pixbuf/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gdk-pixbuf (from rev 5928, contrib/1.1/gdk-pixbuf)



From svn at tinysofa.org  Wed Feb 16 18:29:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:29:59 -0500 (EST)
Subject: [tinysofa-svn] r5930 - contrib/1.2
Message-ID: <20050216182959.23A1F344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:29:53 -0500 (Wed, 16 Feb 2005)
New Revision: 5930

Added:
   contrib/1.2/gimp/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gimp (from rev 5929, contrib/1.1/gimp)



From svn at tinysofa.org  Wed Feb 16 18:30:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:30:18 -0500 (EST)
Subject: [tinysofa-svn] r5931 - contrib/1.2
Message-ID: <20050216183018.49C3F344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:30:12 -0500 (Wed, 16 Feb 2005)
New Revision: 5931

Added:
   contrib/1.2/gpgme/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gpgme (from rev 5930, contrib/1.1/gpgme)



From svn at tinysofa.org  Wed Feb 16 18:30:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:30:35 -0500 (EST)
Subject: [tinysofa-svn] r5932 - contrib/1.2
Message-ID: <20050216183035.624E9344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:30:29 -0500 (Wed, 16 Feb 2005)
New Revision: 5932

Added:
   contrib/1.2/gpm/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gpm (from rev 5931, contrib/1.1/gpm)



From svn at tinysofa.org  Wed Feb 16 18:30:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:30:54 -0500 (EST)
Subject: [tinysofa-svn] r5933 - contrib/1.2
Message-ID: <20050216183054.4D827344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:30:48 -0500 (Wed, 16 Feb 2005)
New Revision: 5933

Added:
   contrib/1.2/gtk12+/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gtk12+ (from rev 5932, contrib/1.1/gtk12+)



From svn at tinysofa.org  Wed Feb 16 18:31:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:31:11 -0500 (EST)
Subject: [tinysofa-svn] r5934 - contrib/1.2
Message-ID: <20050216183111.044AA344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:31:05 -0500 (Wed, 16 Feb 2005)
New Revision: 5934

Added:
   contrib/1.2/gtk/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gtk (from rev 5933, contrib/1.1/gtk)



From svn at tinysofa.org  Wed Feb 16 18:31:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:31:31 -0500 (EST)
Subject: [tinysofa-svn] r5935 - contrib/1.2
Message-ID: <20050216183131.DA471344471@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:31:22 -0500 (Wed, 16 Feb 2005)
New Revision: 5935

Added:
   contrib/1.2/icewm/
Log:
builds with tcs 1.2

Copied: contrib/1.2/icewm (from rev 5934, contrib/1.1/icewm)



From svn at tinysofa.org  Wed Feb 16 18:31:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:31:52 -0500 (EST)
Subject: [tinysofa-svn] r5936 - contrib/1.2
Message-ID: <20050216183152.CD2AB344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:31:46 -0500 (Wed, 16 Feb 2005)
New Revision: 5936

Added:
   contrib/1.2/imlib/
Log:
builds with tcs 1.2

Copied: contrib/1.2/imlib (from rev 5935, contrib/1.1/imlib)



From svn at tinysofa.org  Wed Feb 16 18:32:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:32:14 -0500 (EST)
Subject: [tinysofa-svn] r5937 - contrib/1.2
Message-ID: <20050216183214.57A19344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:32:07 -0500 (Wed, 16 Feb 2005)
New Revision: 5937

Added:
   contrib/1.2/lesstif/
Log:
builds with tcs 1.2

Copied: contrib/1.2/lesstif (from rev 5936, contrib/1.1/lesstif)



From svn at tinysofa.org  Wed Feb 16 18:32:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:32:34 -0500 (EST)
Subject: [tinysofa-svn] r5938 - contrib/1.2
Message-ID: <20050216183234.EBE77344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:32:27 -0500 (Wed, 16 Feb 2005)
New Revision: 5938

Added:
   contrib/1.2/libglade/
Log:
builds with tcs 1.2

Copied: contrib/1.2/libglade (from rev 5937, contrib/1.1/libglade)



From svn at tinysofa.org  Wed Feb 16 18:32:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:32:55 -0500 (EST)
Subject: [tinysofa-svn] r5939 - contrib/1.2
Message-ID: <20050216183255.57C49344476@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:32:49 -0500 (Wed, 16 Feb 2005)
New Revision: 5939

Added:
   contrib/1.2/libidl/
Log:
builds with tcs 1.2

Copied: contrib/1.2/libidl (from rev 5938, contrib/1.1/libidl)



From svn at tinysofa.org  Wed Feb 16 18:33:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:33:17 -0500 (EST)
Subject: [tinysofa-svn] r5940 - contrib/1.2
Message-ID: <20050216183317.86097344478@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:33:11 -0500 (Wed, 16 Feb 2005)
New Revision: 5940

Added:
   contrib/1.2/libungif/
Log:
builds with tcs 1.2

Copied: contrib/1.2/libungif (from rev 5939, contrib/1.1/libungif)



From svn at tinysofa.org  Wed Feb 16 18:33:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:33:49 -0500 (EST)
Subject: [tinysofa-svn] r5941 - contrib/1.2
Message-ID: <20050216183349.0B11F344478@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:33:42 -0500 (Wed, 16 Feb 2005)
New Revision: 5941

Added:
   contrib/1.2/nedit/
Log:
builds with tcs 1.2

Copied: contrib/1.2/nedit (from rev 5940, contrib/1.1/nedit)



From svn at tinysofa.org  Wed Feb 16 18:34:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:34:47 -0500 (EST)
Subject: [tinysofa-svn] r5942 - contrib/1.2
Message-ID: <20050216183447.8FF9434447F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:34:39 -0500 (Wed, 16 Feb 2005)
New Revision: 5942

Added:
   contrib/1.2/pango/
Log:
builds with tcs 1.2

Copied: contrib/1.2/pango (from rev 5941, contrib/1.1/pango)



From svn at tinysofa.org  Wed Feb 16 18:35:04 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:35:04 -0500 (EST)
Subject: [tinysofa-svn] r5943 - contrib/1.2
Message-ID: <20050216183504.E779F34447F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:34:58 -0500 (Wed, 16 Feb 2005)
New Revision: 5943

Added:
   contrib/1.2/perl-archive-tar/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-archive-tar (from rev 5942, contrib/1.1/perl-archive-tar)



From svn at tinysofa.org  Wed Feb 16 18:35:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:35:24 -0500 (EST)
Subject: [tinysofa-svn] r5944 - contrib/1.2
Message-ID: <20050216183524.02DFF34447F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:35:18 -0500 (Wed, 16 Feb 2005)
New Revision: 5944

Added:
   contrib/1.2/perl-archive-zip/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-archive-zip (from rev 5943, contrib/1.1/perl-archive-zip)



From svn at tinysofa.org  Wed Feb 16 18:35:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:35:44 -0500 (EST)
Subject: [tinysofa-svn] r5945 - contrib/1.2
Message-ID: <20050216183544.394BF3444A2@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:35:38 -0500 (Wed, 16 Feb 2005)
New Revision: 5945

Added:
   contrib/1.2/perl-berkeleydb/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-berkeleydb (from rev 5944, contrib/1.1/perl-berkeleydb)



From svn at tinysofa.org  Wed Feb 16 18:36:02 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:36:02 -0500 (EST)
Subject: [tinysofa-svn] r5946 - contrib/1.2
Message-ID: <20050216183602.41DB13444A4@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:35:54 -0500 (Wed, 16 Feb 2005)
New Revision: 5946

Added:
   contrib/1.2/perl-business-isbn/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-business-isbn (from rev 5945, contrib/1.1/perl-business-isbn)



From svn at tinysofa.org  Wed Feb 16 18:36:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:36:18 -0500 (EST)
Subject: [tinysofa-svn] r5947 - contrib/1.2
Message-ID: <20050216183618.AC2BE3444A2@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:36:12 -0500 (Wed, 16 Feb 2005)
New Revision: 5947

Added:
   contrib/1.2/perl-business-isbn-data/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-business-isbn-data (from rev 5946, contrib/1.1/perl-business-isbn-data)



From svn at tinysofa.org  Wed Feb 16 18:36:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:36:36 -0500 (EST)
Subject: [tinysofa-svn] r5948 - contrib/1.2
Message-ID: <20050216183636.C173D3444A2@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:36:30 -0500 (Wed, 16 Feb 2005)
New Revision: 5948

Added:
   contrib/1.2/perl-compress-zlib/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-compress-zlib (from rev 5947, contrib/1.1/perl-compress-zlib)



From svn at tinysofa.org  Wed Feb 16 18:37:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:37:00 -0500 (EST)
Subject: [tinysofa-svn] r5949 - contrib/1.2
Message-ID: <20050216183700.D07B13444A4@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:36:54 -0500 (Wed, 16 Feb 2005)
New Revision: 5949

Added:
   contrib/1.2/perl-convert-tnef/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-convert-tnef (from rev 5948, contrib/1.1/perl-convert-tnef)



From svn at tinysofa.org  Wed Feb 16 18:37:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:37:18 -0500 (EST)
Subject: [tinysofa-svn] r5950 - contrib/1.2
Message-ID: <20050216183718.0B1CE3444A4@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:37:12 -0500 (Wed, 16 Feb 2005)
New Revision: 5950

Added:
   contrib/1.2/perl-convert-uulib/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-convert-uulib (from rev 5949, contrib/1.1/perl-convert-uulib)



From svn at tinysofa.org  Wed Feb 16 18:37:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:37:38 -0500 (EST)
Subject: [tinysofa-svn] r5951 - contrib/1.2
Message-ID: <20050216183738.29DDF3444A4@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:37:31 -0500 (Wed, 16 Feb 2005)
New Revision: 5951

Added:
   contrib/1.2/perl-date-manip/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-date-manip (from rev 5950, contrib/1.1/perl-date-manip)



From svn at tinysofa.org  Wed Feb 16 18:37:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:37:56 -0500 (EST)
Subject: [tinysofa-svn] r5952 - contrib/1.2
Message-ID: <20050216183756.0AD0E3444A4@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:37:50 -0500 (Wed, 16 Feb 2005)
New Revision: 5952

Added:
   contrib/1.2/perl-dbd-mysql/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-dbd-mysql (from rev 5951, contrib/1.1/perl-dbd-mysql)



From svn at tinysofa.org  Wed Feb 16 18:38:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:38:15 -0500 (EST)
Subject: [tinysofa-svn] r5953 - contrib/1.2
Message-ID: <20050216183815.821813444A6@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:38:09 -0500 (Wed, 16 Feb 2005)
New Revision: 5953

Added:
   contrib/1.2/perl-dbd-pg/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-dbd-pg (from rev 5952, contrib/1.1/perl-dbd-pg)



From svn at tinysofa.org  Wed Feb 16 18:38:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:38:38 -0500 (EST)
Subject: [tinysofa-svn] r5954 - contrib/1.2
Message-ID: <20050216183838.9AAF13444A6@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:38:32 -0500 (Wed, 16 Feb 2005)
New Revision: 5954

Added:
   contrib/1.2/perl-digest-perl-md5/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-digest-perl-md5 (from rev 5953, contrib/1.1/perl-digest-perl-md5)



From svn at tinysofa.org  Wed Feb 16 18:39:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:39:25 -0500 (EST)
Subject: [tinysofa-svn] r5955 - contrib/1.2
Message-ID: <20050216183925.E2BB53444B0@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:39:19 -0500 (Wed, 16 Feb 2005)
New Revision: 5955

Added:
   contrib/1.2/perl-digest-sha1/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-digest-sha1 (from rev 5954, contrib/1.1/perl-digest-sha1)



From svn at tinysofa.org  Wed Feb 16 18:39:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:39:42 -0500 (EST)
Subject: [tinysofa-svn] r5956 - contrib/1.2
Message-ID: <20050216183942.B10DA3444B0@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:39:36 -0500 (Wed, 16 Feb 2005)
New Revision: 5956

Added:
   contrib/1.2/perl-html-parser/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-html-parser (from rev 5955, contrib/1.1/perl-html-parser)



From svn at tinysofa.org  Wed Feb 16 18:39:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:39:58 -0500 (EST)
Subject: [tinysofa-svn] r5957 - contrib/1.2
Message-ID: <20050216183958.EB79B3444C2@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:39:52 -0500 (Wed, 16 Feb 2005)
New Revision: 5957

Added:
   contrib/1.2/perl-html-tagset/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-html-tagset (from rev 5956, contrib/1.1/perl-html-tagset)



From svn at tinysofa.org  Wed Feb 16 18:40:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:40:16 -0500 (EST)
Subject: [tinysofa-svn] r5958 - contrib/1.2
Message-ID: <20050216184016.888123444F9@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:40:10 -0500 (Wed, 16 Feb 2005)
New Revision: 5958

Added:
   contrib/1.2/perl-html-template/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-html-template (from rev 5957, contrib/1.1/perl-html-template)



From svn at tinysofa.org  Wed Feb 16 18:40:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:40:59 -0500 (EST)
Subject: [tinysofa-svn] r5959 - contrib/1.2
Message-ID: <20050216184059.4C6993444FE@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:40:52 -0500 (Wed, 16 Feb 2005)
New Revision: 5959

Added:
   contrib/1.2/perl-inline/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-inline (from rev 5958, contrib/1.1/perl-inline)



From svn at tinysofa.org  Wed Feb 16 18:41:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:41:15 -0500 (EST)
Subject: [tinysofa-svn] r5960 - contrib/1.2
Message-ID: <20050216184115.D9CE9344509@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:41:09 -0500 (Wed, 16 Feb 2005)
New Revision: 5960

Added:
   contrib/1.2/perl-io-multiplex/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-io-multiplex (from rev 5959, contrib/1.1/perl-io-multiplex)



From svn at tinysofa.org  Wed Feb 16 18:41:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:41:51 -0500 (EST)
Subject: [tinysofa-svn] r5961 - contrib/1.2
Message-ID: <20050216184151.C0B6A3443D0@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:41:45 -0500 (Wed, 16 Feb 2005)
New Revision: 5961

Added:
   contrib/1.2/perl-io-socket-ssl/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-io-socket-ssl (from rev 5960, contrib/1.1/perl-io-socket-ssl)



From svn at tinysofa.org  Wed Feb 16 18:42:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:42:11 -0500 (EST)
Subject: [tinysofa-svn] r5962 - contrib/1.2
Message-ID: <20050216184211.53FEA34450B@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:42:05 -0500 (Wed, 16 Feb 2005)
New Revision: 5962

Added:
   contrib/1.2/perl-io-string/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-io-string (from rev 5961, contrib/1.1/perl-io-string)



From svn at tinysofa.org  Wed Feb 16 18:42:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:42:31 -0500 (EST)
Subject: [tinysofa-svn] r5963 - contrib/1.2
Message-ID: <20050216184231.945B634450D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:42:25 -0500 (Wed, 16 Feb 2005)
New Revision: 5963

Added:
   contrib/1.2/perl-io-stringy/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-io-stringy (from rev 5962, contrib/1.1/perl-io-stringy)



From svn at tinysofa.org  Wed Feb 16 18:42:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:42:48 -0500 (EST)
Subject: [tinysofa-svn] r5964 - contrib/1.2
Message-ID: <20050216184248.D01A9344510@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:42:42 -0500 (Wed, 16 Feb 2005)
New Revision: 5964

Added:
   contrib/1.2/perl-io-zlib/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-io-zlib (from rev 5963, contrib/1.1/perl-io-zlib)



From svn at tinysofa.org  Wed Feb 16 18:43:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:43:05 -0500 (EST)
Subject: [tinysofa-svn] r5965 - contrib/1.2
Message-ID: <20050216184305.64F3F344510@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:42:59 -0500 (Wed, 16 Feb 2005)
New Revision: 5965

Added:
   contrib/1.2/perl-libwww-perl/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-libwww-perl (from rev 5964, contrib/1.1/perl-libwww-perl)



From svn at tinysofa.org  Wed Feb 16 18:43:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:43:31 -0500 (EST)
Subject: [tinysofa-svn] r5966 - contrib/1.2
Message-ID: <20050216184331.82FBF344512@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:43:25 -0500 (Wed, 16 Feb 2005)
New Revision: 5966

Added:
   contrib/1.2/perl-mail-clamav/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-mail-clamav (from rev 5965, contrib/1.1/perl-mail-clamav)



From svn at tinysofa.org  Wed Feb 16 18:43:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:43:52 -0500 (EST)
Subject: [tinysofa-svn] r5967 - contrib/1.2
Message-ID: <20050216184352.5AE6B344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:43:45 -0500 (Wed, 16 Feb 2005)
New Revision: 5967

Added:
   contrib/1.2/perl-mailtools/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-mailtools (from rev 5966, contrib/1.1/perl-mailtools)



From svn at tinysofa.org  Wed Feb 16 18:44:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:44:18 -0500 (EST)
Subject: [tinysofa-svn] r5968 - contrib/1.2
Message-ID: <20050216184418.0210D344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:44:10 -0500 (Wed, 16 Feb 2005)
New Revision: 5968

Added:
   contrib/1.2/perl-net-cidr/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-net-cidr (from rev 5967, contrib/1.1/perl-net-cidr)



From svn at tinysofa.org  Wed Feb 16 18:44:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:44:40 -0500 (EST)
Subject: [tinysofa-svn] r5969 - contrib/1.2
Message-ID: <20050216184440.2A3A7344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:44:32 -0500 (Wed, 16 Feb 2005)
New Revision: 5969

Added:
   contrib/1.2/perl-net-server/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-net-server (from rev 5968, contrib/1.1/perl-net-server)



From svn at tinysofa.org  Wed Feb 16 18:45:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:45:01 -0500 (EST)
Subject: [tinysofa-svn] r5970 - contrib/1.2
Message-ID: <20050216184501.993FC344541@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:44:54 -0500 (Wed, 16 Feb 2005)
New Revision: 5970

Added:
   contrib/1.2/perl-net-ssleay/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-net-ssleay (from rev 5969, contrib/1.1/perl-net-ssleay)



From svn at tinysofa.org  Wed Feb 16 18:45:20 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:45:20 -0500 (EST)
Subject: [tinysofa-svn] r5971 - contrib/1.2
Message-ID: <20050216184520.0FB6F344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:45:13 -0500 (Wed, 16 Feb 2005)
New Revision: 5971

Added:
   contrib/1.2/perl-parse-recdescent/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-parse-recdescent (from rev 5970, contrib/1.1/perl-parse-recdescent)



From svn at tinysofa.org  Wed Feb 16 18:45:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:45:40 -0500 (EST)
Subject: [tinysofa-svn] r5972 - contrib/1.2
Message-ID: <20050216184540.197ED344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:45:33 -0500 (Wed, 16 Feb 2005)
New Revision: 5972

Added:
   contrib/1.2/perl-parse-syslog/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-parse-syslog (from rev 5971, contrib/1.1/perl-parse-syslog)



From svn at tinysofa.org  Wed Feb 16 18:45:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:45:57 -0500 (EST)
Subject: [tinysofa-svn] r5973 - contrib/1.2
Message-ID: <20050216184557.6B031344541@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:45:51 -0500 (Wed, 16 Feb 2005)
New Revision: 5973

Added:
   contrib/1.2/perl-statistics-distributions/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-statistics-distributions (from rev 5972, contrib/1.1/perl-statistics-distributions)



From svn at tinysofa.org  Wed Feb 16 18:46:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:46:17 -0500 (EST)
Subject: [tinysofa-svn] r5974 - contrib/1.2
Message-ID: <20050216184617.7FA2F344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:46:09 -0500 (Wed, 16 Feb 2005)
New Revision: 5974

Added:
   contrib/1.2/perl-test-manifest/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-test-manifest (from rev 5973, contrib/1.1/perl-test-manifest)



From svn at tinysofa.org  Wed Feb 16 18:46:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:46:40 -0500 (EST)
Subject: [tinysofa-svn] r5975 - contrib/1.2
Message-ID: <20050216184640.07A8D344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:46:33 -0500 (Wed, 16 Feb 2005)
New Revision: 5975

Added:
   contrib/1.2/perl-timedate/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-timedate (from rev 5974, contrib/1.1/perl-timedate)



From svn at tinysofa.org  Wed Feb 16 18:46:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:46:57 -0500 (EST)
Subject: [tinysofa-svn] r5976 - contrib/1.2
Message-ID: <20050216184657.909BF344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:46:51 -0500 (Wed, 16 Feb 2005)
New Revision: 5976

Added:
   contrib/1.2/perl-unicode-map/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-unicode-map (from rev 5975, contrib/1.1/perl-unicode-map)



From svn at tinysofa.org  Wed Feb 16 18:47:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:47:14 -0500 (EST)
Subject: [tinysofa-svn] r5977 - contrib/1.2
Message-ID: <20050216184714.663C0344546@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:47:08 -0500 (Wed, 16 Feb 2005)
New Revision: 5977

Added:
   contrib/1.2/perl-unicode-string/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-unicode-string (from rev 5976, contrib/1.1/perl-unicode-string)



From svn at tinysofa.org  Wed Feb 16 18:47:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:47:38 -0500 (EST)
Subject: [tinysofa-svn] r5978 - contrib/1.2
Message-ID: <20050216184738.830DC344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:47:32 -0500 (Wed, 16 Feb 2005)
New Revision: 5978

Added:
   contrib/1.2/perl-unix-syslog/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-unix-syslog (from rev 5977, contrib/1.1/perl-unix-syslog)



From svn at tinysofa.org  Wed Feb 16 18:47:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:47:55 -0500 (EST)
Subject: [tinysofa-svn] r5979 - contrib/1.2
Message-ID: <20050216184755.E44D5344517@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:47:49 -0500 (Wed, 16 Feb 2005)
New Revision: 5979

Added:
   contrib/1.2/perl-uri/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-uri (from rev 5978, contrib/1.1/perl-uri)



From svn at tinysofa.org  Wed Feb 16 18:48:13 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:48:13 -0500 (EST)
Subject: [tinysofa-svn] r5980 - contrib/1.2
Message-ID: <20050216184813.3E74334454A@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:48:07 -0500 (Wed, 16 Feb 2005)
New Revision: 5980

Added:
   contrib/1.2/perl-xml-parser/
Log:
builds with tcs 1.2

Copied: contrib/1.2/perl-xml-parser (from rev 5979, contrib/1.1/perl-xml-parser)



From svn at tinysofa.org  Wed Feb 16 18:48:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:48:30 -0500 (EST)
Subject: [tinysofa-svn] r5981 - contrib/1.2
Message-ID: <20050216184830.2232D34454B@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:48:24 -0500 (Wed, 16 Feb 2005)
New Revision: 5981

Added:
   contrib/1.2/spamassassin/
Log:
builds with tcs 1.2

Copied: contrib/1.2/spamassassin (from rev 5980, contrib/1.1/spamassassin)



From svn at tinysofa.org  Wed Feb 16 18:48:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:48:50 -0500 (EST)
Subject: [tinysofa-svn] r5982 - contrib/1.2
Message-ID: <20050216184850.48A0334454B@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:48:44 -0500 (Wed, 16 Feb 2005)
New Revision: 5982

Added:
   contrib/1.2/sylpheed/
Log:
builds with tcs 1.2

Copied: contrib/1.2/sylpheed (from rev 5981, contrib/1.1/sylpheed)



From svn at tinysofa.org  Wed Feb 16 18:49:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:49:09 -0500 (EST)
Subject: [tinysofa-svn] r5983 - contrib/1.2
Message-ID: <20050216184909.54838344555@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:49:03 -0500 (Wed, 16 Feb 2005)
New Revision: 5983

Added:
   contrib/1.2/synaptic/
Log:
builds with tcs 1.2

Copied: contrib/1.2/synaptic (from rev 5982, contrib/1.1/synaptic)



From svn at tinysofa.org  Wed Feb 16 18:49:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:49:25 -0500 (EST)
Subject: [tinysofa-svn] r5984 - contrib/1.2
Message-ID: <20050216184925.46EC7344557@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:49:19 -0500 (Wed, 16 Feb 2005)
New Revision: 5984

Added:
   contrib/1.2/tcl/
Log:
builds with tcs 1.2

Copied: contrib/1.2/tcl (from rev 5983, contrib/1.1/tcl)



From svn at tinysofa.org  Wed Feb 16 18:49:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:49:58 -0500 (EST)
Subject: [tinysofa-svn] r5985 - contrib/1.2
Message-ID: <20050216184958.831E634455E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:49:52 -0500 (Wed, 16 Feb 2005)
New Revision: 5985

Added:
   contrib/1.2/utempter/
Log:
builds with tcs 1.2

Copied: contrib/1.2/utempter (from rev 5984, contrib/1.1/utempter)



From svn at tinysofa.org  Wed Feb 16 18:50:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:50:19 -0500 (EST)
Subject: [tinysofa-svn] r5986 - contrib/1.2
Message-ID: <20050216185019.F3590344563@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:50:13 -0500 (Wed, 16 Feb 2005)
New Revision: 5986

Added:
   contrib/1.2/xcdroast/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xcdroast (from rev 5985, contrib/1.1/xcdroast)



From svn at tinysofa.org  Wed Feb 16 18:50:37 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:50:37 -0500 (EST)
Subject: [tinysofa-svn] r5987 - contrib/1.2
Message-ID: <20050216185037.595AD344565@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:50:31 -0500 (Wed, 16 Feb 2005)
New Revision: 5987

Added:
   contrib/1.2/xchat/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xchat (from rev 5986, contrib/1.1/xchat)



From svn at tinysofa.org  Wed Feb 16 18:52:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:52:21 -0500 (EST)
Subject: [tinysofa-svn] r5988 - contrib/1.2
Message-ID: <20050216185221.946CA344576@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:52:15 -0500 (Wed, 16 Feb 2005)
New Revision: 5988

Added:
   contrib/1.2/xfe/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xfe (from rev 5987, contrib/1.1/xfe)



From svn at tinysofa.org  Wed Feb 16 18:52:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:52:40 -0500 (EST)
Subject: [tinysofa-svn] r5989 - contrib/1.2
Message-ID: <20050216185240.D976334426C@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:52:34 -0500 (Wed, 16 Feb 2005)
New Revision: 5989

Added:
   contrib/1.2/xinitrc/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xinitrc (from rev 5988, contrib/1.1/xinitrc)



From svn at tinysofa.org  Wed Feb 16 18:52:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:52:58 -0500 (EST)
Subject: [tinysofa-svn] r5990 - contrib/1.2
Message-ID: <20050216185258.E703534428E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:52:52 -0500 (Wed, 16 Feb 2005)
New Revision: 5990

Added:
   contrib/1.2/xterm/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xterm (from rev 5989, contrib/1.1/xterm)



From svn at tinysofa.org  Wed Feb 16 18:55:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:55:38 -0500 (EST)
Subject: [tinysofa-svn] r5991 - contrib/1.1/amavisd-new/current/specs
Message-ID: <20050216185538.9B92D34428F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:55:33 -0500 (Wed, 16 Feb 2005)
New Revision: 5991

Modified:
   contrib/1.1/amavisd-new/current/specs/amavisd-new.spec
Log:
removed version check from perl-mime-tools

Modified: contrib/1.1/amavisd-new/current/specs/amavisd-new.spec
===================================================================
--- contrib/1.1/amavisd-new/current/specs/amavisd-new.spec	2005-02-16 18:52:52 UTC (rev 5990)
+++ contrib/1.1/amavisd-new/current/specs/amavisd-new.spec	2005-02-16 18:55:33 UTC (rev 5991)
@@ -1,6 +1,6 @@
 Name:      amavisd-new
 Version:   2.2.1
-Release:   1gd
+Release:   2gd
 Summary:   AMaViSd-new - A Mail Virus Scanner
 URL:       http://www.ijs.si/software/amavisd/
 License:   GPL
@@ -27,7 +27,7 @@
 Requires: perl-io-stringy
 Requires: perl-io-zlib
 Requires: perl-mailtools
-Requires: perl-mime-tools >= 6.200
+Requires: perl-mime-tools
 Requires: perl-net-server
 Requires: perl-unix-syslog
 Requires: perl-berkeleydb
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.1-2gd
+- removed version check from perl-mime-tools
+
 * Wed Feb 02 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.1-1gd
 - new upstream
 



From svn at tinysofa.org  Wed Feb 16 18:56:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 13:56:16 -0500 (EST)
Subject: [tinysofa-svn] r5992 - contrib/1.2
Message-ID: <20050216185616.E868C34428F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 13:56:08 -0500 (Wed, 16 Feb 2005)
New Revision: 5992

Added:
   contrib/1.2/amavisd-new/
Log:
builds with tcs 1.2

Copied: contrib/1.2/amavisd-new (from rev 5991, contrib/1.1/amavisd-new)



From svn at tinysofa.org  Wed Feb 16 19:01:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:01:52 -0500 (EST)
Subject: [tinysofa-svn] r5993 - in contrib/1.1/clamav/current: sources specs
Message-ID: <20050216190152.BE8DC34455D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:00:22 -0500 (Wed, 16 Feb 2005)
New Revision: 5993

Added:
   contrib/1.1/clamav/current/sources/clamav-0.83.tar.gz
Removed:
   contrib/1.1/clamav/current/sources/clamav-0.82.tar.gz
Modified:
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
new upstream

Deleted: contrib/1.1/clamav/current/sources/clamav-0.82.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/clamav/current/sources/clamav-0.83.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/clamav/current/sources/clamav-0.83.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2005-02-16 18:56:08 UTC (rev 5992)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2005-02-16 19:00:22 UTC (rev 5993)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.82
-Release: 2jh
+Version: 0.83
+Release: 1gd
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 0.83-1gd
+- New upstream
+
 * Wed Feb  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.82-2jh
 - add missing try-restart targets to init scripts
 



From svn at tinysofa.org  Wed Feb 16 19:02:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:02:23 -0500 (EST)
Subject: [tinysofa-svn] r5994 - contrib/1.2
Message-ID: <20050216190223.7C6B4344578@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:02:15 -0500 (Wed, 16 Feb 2005)
New Revision: 5994

Added:
   contrib/1.2/clamav/
Log:
builds with tcs 1.2

Copied: contrib/1.2/clamav (from rev 5993, contrib/1.1/clamav)



From svn at tinysofa.org  Wed Feb 16 19:06:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:06:16 -0500 (EST)
Subject: [tinysofa-svn] r5995 - in contrib/1.1/firefox/current: sources specs
Message-ID: <20050216190616.1EAB834454B@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:06:07 -0500 (Wed, 16 Feb 2005)
New Revision: 5995

Added:
   contrib/1.1/firefox/current/sources/firefox-1.0-bsd-tar.patch
Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
fixed because of bsd tar

Added: contrib/1.1/firefox/current/sources/firefox-1.0-bsd-tar.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-1.0-bsd-tar.patch	2005-02-16 19:02:15 UTC (rev 5994)
+++ contrib/1.1/firefox/current/sources/firefox-1.0-bsd-tar.patch	2005-02-16 19:06:07 UTC (rev 5995)
@@ -0,0 +1,44 @@
+--- mozilla/toolkit/mozapps/installer/unix/install_sub.pl.orig	2005-02-15 00:13:02.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/unix/install_sub.pl	2005-02-15 00:13:27.000000000 +0100
+@@ -35,7 +35,7 @@
+     rename ("$instRoot/mozilla-installer", "$instRoot/$mainExe-installer");
+     rename ("$instRoot/mozilla-installer-bin", "$instRoot/$mainExe-installer-bin");
+ 
+-    system ("cd $gDirDistInstall/sea && tar -zcv --owner=0 --group=0 --numeric-owner --mode='go-w' -f $seiFileNameSpecific.tar.gz $mainExe-installer");
++    system ("cd $gDirDistInstall/sea && tar -zcv -f $seiFileNameSpecific.tar.gz $mainExe-installer");
+     return 0;
+ }
+ 
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2005-02-15 00:15:19.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk	2005-02-15 00:15:48.000000000 +0100
+@@ -70,7 +70,7 @@
+ TAR_CREATE_FLAGS = -cvLf
+ endif
+ 
+-CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
++CREATE_FINAL_TAR = tar -c -f
+ 
+ ifeq ($(MOZ_PKG_FORMAT),TAR)
+ PKG_SUFFIX	= .tar
+--- mozilla/xpinstall/packager/Makefile.in.orig	2005-02-15 00:17:16.000000000 +0100
++++ mozilla/xpinstall/packager/Makefile.in	2005-02-15 00:17:30.000000000 +0100
+@@ -87,7 +87,7 @@
+ TAR_CREATE_FLAGS = -cvLf
+ endif
+ 
+-CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
++CREATE_FINAL_TAR = tar -c -f
+ 
+ ifeq ($(MOZ_PKG_FORMAT),TAR)
+ PKG_SUFFIX	= .tar
+--- mozilla/xpinstall/packager/unix/deliver.pl.orig	2005-02-15 00:18:39.000000000 +0100
++++ mozilla/xpinstall/packager/unix/deliver.pl	2005-02-15 00:18:57.000000000 +0100
+@@ -155,7 +155,7 @@
+ #-------------------------------------------------------------------------
+ #// tar and gzip mozilla-installer, mozilla-installer-bin, README, license, 
+ #// config.ini, installer.ini into stub
+-my $create_tar = 'tar -cv --owner=0 --group=0 --numeric-owner --mode="go-w" -f';
++my $create_tar = 'tar -cv -f';
+ spew("Creating stub installer tarball...");
+ chdir("$RAW/..");
+ system("mv $RAW $ROOT/$SUBDIR");

Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2005-02-16 19:02:15 UTC (rev 5994)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2005-02-16 19:06:07 UTC (rev 5995)
@@ -10,7 +10,7 @@
 Summary: Mozilla Firefox web browser
 Name: firefox
 Version: 1.0
-Release: 1jh
+Release: 2gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -25,6 +25,7 @@
 Patch5: mozilla-1.7-psfonts.patch
 Patch6: firefox-0.10-gcc3-alpha.patch
 Patch101: firefox-PR1-pkgconfig.patch
+Patch102: firefox-1.0-bsd-tar.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: xorg-x11-devel, zlib-devel, zip, unzip
@@ -50,6 +51,7 @@
 %patch5 -p1 -b .psfonts
 %patch6 -p1 -b .gcc3-alpha
 %patch101 -p0 -b .pkgconfig
+%patch102 -p1 -b .bsd-tar
 
 %{__cat} <<'EOF' >.mozconfig
 . $topsrcdir/browser/config/mozconfig
@@ -243,6 +245,9 @@
 %endif
 
 %changelog
+* Mon Feb 14 2005 Gerald Dachs <gda at tinysofa dot org> 1.0-2gd
+- patches for bsd tar
+
 * Mon Oct 04 2004 Dag Wieers <dag at wieers.com> - 0.10.1-0.1
 - Disable typeaheadfind as it breaks things. (Matthias Hensler)
 - Added more patches from rawhide.



From svn at tinysofa.org  Wed Feb 16 19:07:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:07:30 -0500 (EST)
Subject: [tinysofa-svn] r5996 - contrib/1.2
Message-ID: <20050216190730.33FE5344584@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:07:22 -0500 (Wed, 16 Feb 2005)
New Revision: 5996

Added:
   contrib/1.2/firefox/
Log:
builds with tcs 1.2

Copied: contrib/1.2/firefox (from rev 5995, contrib/1.1/firefox)



From svn at tinysofa.org  Wed Feb 16 19:09:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:09:55 -0500 (EST)
Subject: [tinysofa-svn] r5997 - contrib/1.1/xorg-x11/current/specs
Message-ID: <20050216190955.4368A34458A@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:09:42 -0500 (Wed, 16 Feb 2005)
New Revision: 5997

Modified:
   contrib/1.1/xorg-x11/current/specs/xorg-x11.spec
Log:
own more dirs

Modified: contrib/1.1/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/1.1/xorg-x11/current/specs/xorg-x11.spec	2005-02-16 19:07:22 UTC (rev 5996)
+++ contrib/1.1/xorg-x11/current/specs/xorg-x11.spec	2005-02-16 19:09:42 UTC (rev 5997)
@@ -20,7 +20,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 1gd
+Release: 2gd
 #Release: 0.%{cvs_release}.0
 
 %define build_maintainer_mode	%( hostname -f |grep -q capslock.lan && echo 1 || echo 0)
@@ -2947,6 +2947,17 @@
 %endif
 
 %files libs
+
+# ts 1.x filesystem package doesn't own following directories
+%defattr(-,root,root,755)
+%dir %{_x11dir}
+%dir %{_x11bindir}
+%dir %{_x11datadir}
+%dir %{_x11includedir}
+%dir %{_x11libdir}
+%dir %{_x11libdir}
+%dir %{_x11mandir}
+%dir /etc/X11
 %defattr(-,root,root)
 # On x86 and other architectures _x11libdir and _x11datadir are the same dir,
 # so listing them both generates a "file included twice" error.  Since these
@@ -3354,6 +3365,9 @@
 %clean_buildroot
 
 %changelog
+* Mon Feb 14 2005 Gerald Dachs <gda at tinysofa dot org> 6.8.2-2gd
+- own now x-dirs (again)
+
 * Sat Feb 12 2005 Gerald Dachs <gda at tinysofa dot org> 6.8.2-1gd
 - new upstream
 



From svn at tinysofa.org  Wed Feb 16 19:10:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:10:31 -0500 (EST)
Subject: [tinysofa-svn] r5998 - contrib/1.2
Message-ID: <20050216191031.C9E7B34458E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:10:18 -0500 (Wed, 16 Feb 2005)
New Revision: 5998

Added:
   contrib/1.2/xorg-x11/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xorg-x11 (from rev 5997, contrib/1.1/xorg-x11)



From svn at tinysofa.org  Wed Feb 16 19:13:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:13:34 -0500 (EST)
Subject: [tinysofa-svn] r5999 - in contrib/1.1/glib12/current: sources specs
Message-ID: <20050216191334.0C36C34458E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:13:24 -0500 (Wed, 16 Feb 2005)
New Revision: 5999

Added:
   contrib/1.1/glib12/current/sources/glib-1.2.10-gcc-3.4.3.patch
Modified:
   contrib/1.1/glib12/current/specs/glib12.spec
Log:
patched for gcc 3.4.3 compatibility

Added: contrib/1.1/glib12/current/sources/glib-1.2.10-gcc-3.4.3.patch
===================================================================
--- contrib/1.1/glib12/current/sources/glib-1.2.10-gcc-3.4.3.patch	2005-02-16 19:10:18 UTC (rev 5998)
+++ contrib/1.1/glib12/current/sources/glib-1.2.10-gcc-3.4.3.patch	2005-02-16 19:13:24 UTC (rev 5999)
@@ -0,0 +1,44 @@
+--- glib-1.2.10/gstrfuncs.c.orig	2005-02-14 21:59:58.000000000 +0100
++++ glib-1.2.10/gstrfuncs.c	2005-02-14 22:05:56.000000000 +0100
+@@ -867,8 +867,7 @@
+                   /* beware of positional parameters
+                    */
+                 case '$':
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle positional parameters (%%n$)");
++                  g_warning("%s(): unable to handle positional parameters (%%n$)", G_GNUC_PRETTY_FUNCTION);
+                   len += 1024; /* try adding some safety padding */
+                   break;
+ 
+@@ -1034,8 +1033,7 @@
+                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
+                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
+                   if (spec.mod_extra_long)
+-                    g_warning (G_GNUC_PRETTY_FUNCTION
+-                               "(): unable to handle long double, collecting double only");
++                    g_warning("%s(): unable to handle long double, collecting double only", G_GNUC_PRETTY_FUNCTION);
+ #ifdef HAVE_LONG_DOUBLE
+ #error need to implement special handling for long double
+ #endif
+@@ -1077,8 +1075,7 @@
+                   conv_done = TRUE;
+                   if (spec.mod_long)
+                     {
+-                      g_warning (G_GNUC_PRETTY_FUNCTION
+-                                 "(): unable to handle wide char strings");
++                      g_warning("%s(): unable to handle wide char strings", G_GNUC_PRETTY_FUNCTION);
+                       len += 1024; /* try adding some safety padding */
+                     }
+                   break;
+@@ -1108,9 +1105,8 @@
+                   conv_len += format - spec_start;
+                   break;
+                 default:
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle `%c' while parsing format",
+-                             c);
++                  g_warning("%s(): unable to handle `%c' while parsing format",
++                             G_GNUC_PRETTY_FUNCTION, c);
+                   break;
+                 }
+               conv_done |= conv_len > 0;

Modified: contrib/1.1/glib12/current/specs/glib12.spec
===================================================================
--- contrib/1.1/glib12/current/specs/glib12.spec	2005-02-16 19:10:18 UTC (rev 5998)
+++ contrib/1.1/glib12/current/specs/glib12.spec	2005-02-16 19:13:24 UTC (rev 5999)
@@ -1,10 +1,11 @@
 Summary: A library of handy utility functions.
 Name: glib12
 Version: 1.2.10
-Release: 2jh
+Release: 3gd
 License: LGPL
 Group: contrib
 Source: ftp://ftp.gtk.org/pub/gtk/v2.1/glib-%{version}.tar.gz
+Patch: glib-1.2.10-gcc-3.4.3.patch
 BuildRoot: /var/tmp/glib-%{version}-root
 BuildRequires: pkgconfig
 
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q -n glib-%{version}
+%patch -p1 -b .gcc-3.4.3
 
 %build
 %configure
@@ -64,6 +66,9 @@
 %{_prefix}/bin/*
 
 %changelog
+* Mon Feb 14 2005 Gerald Dachs <gda at tinysofa dot org> 1.2.10-3gd
+- patched for gcc 3.4.3 compatibility
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.2.10-2jh
 - current (1.2.10-2jh) integrated as 1.2.10-2jh
 



From svn at tinysofa.org  Wed Feb 16 19:14:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:14:08 -0500 (EST)
Subject: [tinysofa-svn] r6000 - contrib/1.2
Message-ID: <20050216191408.2A3BF344591@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:13:59 -0500 (Wed, 16 Feb 2005)
New Revision: 6000

Added:
   contrib/1.2/glib12/
Log:
builds with tcs 1.2

Copied: contrib/1.2/glib12 (from rev 5999, contrib/1.1/glib12)



From svn at tinysofa.org  Wed Feb 16 19:25:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:25:00 -0500 (EST)
Subject: [tinysofa-svn] r6001 - in contrib/1.2: . perl-convert-binhex
	perl-convert-binhex/current perl-convert-binhex/current/sources
	perl-convert-binhex/current/specs
Message-ID: <20050216192500.091A63445A5@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:24:48 -0500 (Wed, 16 Feb 2005)
New Revision: 6001

Added:
   contrib/1.2/perl-convert-binhex/
   contrib/1.2/perl-convert-binhex/current/
   contrib/1.2/perl-convert-binhex/current/sources/
   contrib/1.2/perl-convert-binhex/current/sources/Convert-BinHex-1.119.tar.gz
   contrib/1.2/perl-convert-binhex/current/sources/perl-convert-binhex-checker-isa.patch
   contrib/1.2/perl-convert-binhex/current/specs/
   contrib/1.2/perl-convert-binhex/current/specs/perl-convert-binhex.spec
   contrib/1.2/perl-convert-binhex/pristine/
   contrib/1.2/perl-convert-binhex/releases/
Log:
new in tinysofa contrib

Added: contrib/1.2/perl-convert-binhex/current/sources/Convert-BinHex-1.119.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.2/perl-convert-binhex/current/sources/Convert-BinHex-1.119.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.2/perl-convert-binhex/current/sources/perl-convert-binhex-checker-isa.patch
===================================================================
--- contrib/1.2/perl-convert-binhex/current/sources/perl-convert-binhex-checker-isa.patch	2005-02-16 19:13:59 UTC (rev 6000)
+++ contrib/1.2/perl-convert-binhex/current/sources/perl-convert-binhex-checker-isa.patch	2005-02-16 19:24:48 UTC (rev 6001)
@@ -0,0 +1,10 @@
+*** Convert-BinHex-1.119.ori/t/Checker.pm       2004-06-08 05:49:44.960015512 +0200
+--- Convert-BinHex-1.119/t/Checker.pm   2004-06-08 05:50:05.415905744 +0200
+***************
+*** 1,4 ****
+--- 1,5 ----
+  package Checker;
++ require Exporter;
+
+  @ISA = qw(Exporter);
+  @EXPORT = qw($CHECK okay_if note check filter_warnings);

Added: contrib/1.2/perl-convert-binhex/current/specs/perl-convert-binhex.spec
===================================================================
--- contrib/1.2/perl-convert-binhex/current/specs/perl-convert-binhex.spec	2005-02-16 19:13:59 UTC (rev 6000)
+++ contrib/1.2/perl-convert-binhex/current/specs/perl-convert-binhex.spec	2005-02-16 19:24:48 UTC (rev 6001)
@@ -0,0 +1,51 @@
+%define perlname Convert-BinHex
+
+Summary:The Perl module Convert::BinHex.
+Name: perl-convert-binhex
+Version: 1.119
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+Patch: perl-convert-binhex-checker-isa.patch
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module Convert::BinHex.
+
+%prep
+%setup -q -n %{perlname}-%{version}
+%patch -p1 -b .checker-isa
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc COPYING README docs MANIFEST README-TOO      
+
+%changelog
+* Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 1.119-1gd
+- new in tinysofa contrib



From svn at tinysofa.org  Wed Feb 16 19:26:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:26:12 -0500 (EST)
Subject: [tinysofa-svn] r6002 - in contrib/1.2: . perl-mime-tools
	perl-mime-tools/current perl-mime-tools/current/sources
	perl-mime-tools/current/specs
Message-ID: <20050216192612.92E293445AF@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:25:54 -0500 (Wed, 16 Feb 2005)
New Revision: 6002

Added:
   contrib/1.2/perl-mime-tools/
   contrib/1.2/perl-mime-tools/current/
   contrib/1.2/perl-mime-tools/current/sources/
   contrib/1.2/perl-mime-tools/current/sources/MIME-tools-5.417.tar.gz
   contrib/1.2/perl-mime-tools/current/specs/
   contrib/1.2/perl-mime-tools/current/specs/perl-mime-tools.spec
   contrib/1.2/perl-mime-tools/pristine/
   contrib/1.2/perl-mime-tools/releases/
Log:
new in tinysofa contrib 1.2

Added: contrib/1.2/perl-mime-tools/current/sources/MIME-tools-5.417.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.2/perl-mime-tools/current/sources/MIME-tools-5.417.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.2/perl-mime-tools/current/specs/perl-mime-tools.spec
===================================================================
--- contrib/1.2/perl-mime-tools/current/specs/perl-mime-tools.spec	2005-02-16 19:24:48 UTC (rev 6001)
+++ contrib/1.2/perl-mime-tools/current/specs/perl-mime-tools.spec	2005-02-16 19:25:54 UTC (rev 6002)
@@ -0,0 +1,80 @@
+%define perlname MIME-tools
+
+Summary:The Perl module MIME-tools.
+Name: perl-mime-tools
+Version: 5.417
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version} perl-io-stringy perl-mailtools
+Requires: perl-unicode-map >= 0.112, perl-unicode-string >= 2.06
+Requires: perl-convert-binhex
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRequires: perl-io-stringy perl-mailtools
+BuildRequires: perl-unicode-map >= 0.112 perl-unicode-string >= 2.06
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module MIME-tools.
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc COPYING README-OR-DIE examples testmsgs INSTALLING MANIFEST README
+
+%changelog
+* Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 5.417-1gd
+- going back to version 5.417. Don't know where 6.200_02 comes from
+  and it doesn't build with perl 5.8.6
+
+* Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 6.200_02-19gd
+- current (6.200_02-19gd) integrated as 6.200_02-19gd
+
+* Tue Jul 27 2004 Gerald Dachs <gda at tinysofa dot org> 6.200_02-19gd
+- autogenerated by cpan2rpm
+
+* Sun Jul 18 2004 Gerald Dachs <gda at tinysofa dot org> 6.200_02-18gd
+- patched v5.6 away
+
+* Sat Jul 17 2004 Gerald Dachs <gda at tinysofa dot org> 6.200_02-17gd
+- cleaned up spec file
+
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 6.200_02-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 6.200_02-2gd
+- fixed permission on directories
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+



From svn at tinysofa.org  Wed Feb 16 19:56:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:56:49 -0500 (EST)
Subject: [tinysofa-svn] r6003 - contrib/1.2
Message-ID: <20050216195649.332C3344584@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:56:40 -0500 (Wed, 16 Feb 2005)
New Revision: 6003

Added:
   contrib/1.2/zoo/
Log:
builds with tcs 1.2

Copied: contrib/1.2/zoo (from rev 6002, contrib/1.1/zoo)



From svn at tinysofa.org  Wed Feb 16 19:58:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 14:58:35 -0500 (EST)
Subject: [tinysofa-svn] r6004 - contrib/1.2
Message-ID: <20050216195835.5740F344598@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 14:58:27 -0500 (Wed, 16 Feb 2005)
New Revision: 6004

Added:
   contrib/1.2/zisofs-tools/
Log:
builds with tcs 1.2

Copied: contrib/1.2/zisofs-tools (from rev 6003, contrib/1.1/zisofs-tools)



From svn at tinysofa.org  Wed Feb 16 20:26:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 15:26:52 -0500 (EST)
Subject: [tinysofa-svn] r6005 - contrib/1.2
Message-ID: <20050216202652.6EE473445F6@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 15:26:43 -0500 (Wed, 16 Feb 2005)
New Revision: 6005

Added:
   contrib/1.2/xpdf/
Log:
builds with tcs 1.2

Copied: contrib/1.2/xpdf (from rev 6004, contrib/1.1/xpdf)



From svn at tinysofa.org  Wed Feb 16 20:32:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 15:32:17 -0500 (EST)
Subject: [tinysofa-svn] r6006 - contrib/1.2
Message-ID: <20050216203217.D072234447E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 15:32:09 -0500 (Wed, 16 Feb 2005)
New Revision: 6006

Added:
   contrib/1.2/libogg/
Log:
builds with tcs 1.2

Copied: contrib/1.2/libogg (from rev 6005, contrib/1.1/libogg)



From svn at tinysofa.org  Wed Feb 16 20:33:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 15:33:36 -0500 (EST)
Subject: [tinysofa-svn] r6007 - contrib/1.2
Message-ID: <20050216203336.1484434456E@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 15:33:27 -0500 (Wed, 16 Feb 2005)
New Revision: 6007

Added:
   contrib/1.2/libvorbis/
Log:
builds with tcs 1.2

Copied: contrib/1.2/libvorbis (from rev 6006, contrib/1.1/libvorbis)



From svn at tinysofa.org  Wed Feb 16 20:56:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 15:56:17 -0500 (EST)
Subject: [tinysofa-svn] r6008 - contrib/1.2
Message-ID: <20050216205617.694E73443BF@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 15:56:09 -0500 (Wed, 16 Feb 2005)
New Revision: 6008

Added:
   contrib/1.2/alsa-lib/
Log:
builds with tcs 1.2

Copied: contrib/1.2/alsa-lib (from rev 6007, contrib/1.1/alsa-lib)



From svn at tinysofa.org  Wed Feb 16 21:00:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 16:00:50 -0500 (EST)
Subject: [tinysofa-svn] r6009 - contrib/1.2
Message-ID: <20050216210050.0B3053445AA@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 16:00:41 -0500 (Wed, 16 Feb 2005)
New Revision: 6009

Added:
   contrib/1.2/alsa-utils/
Log:
builds with tcs 1.2

Copied: contrib/1.2/alsa-utils (from rev 6008, contrib/1.1/alsa-utils)



From svn at tinysofa.org  Wed Feb 16 21:28:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Feb 2005 16:28:11 -0500 (EST)
Subject: [tinysofa-svn] r6010 - contrib/1.2
Message-ID: <20050216212811.C80B83445FD@minbar.tinysofa.org>

Author: gda
Date: 2005-02-16 16:28:03 -0500 (Wed, 16 Feb 2005)
New Revision: 6010

Added:
   contrib/1.2/gqview/
Log:
builds with tcs 1.2

Copied: contrib/1.2/gqview (from rev 6009, contrib/1.1/gqview)



From svn at tinysofa.org  Thu Feb 17 14:19:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 09:19:56 -0500 (EST)
Subject: [tinysofa-svn] r6011 - in tinysofa/releases/1.2/tar/current:
	sources specs
Message-ID: <20050217141956.85D893443C0@minbar.tinysofa.org>

Author: jh
Date: 2005-02-17 09:19:47 -0500 (Thu, 17 Feb 2005)
New Revision: 6011

Modified:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- fix setlocale patch

Modified: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch	2005-02-16 21:28:03 UTC (rev 6010)
+++ tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022-setlocale.patch	2005-02-17 14:19:47 UTC (rev 6011)
@@ -1,11 +1,14 @@
---- bsdtar-1.01.022/bsdtar.c.orig	2005-02-04 20:42:18.000000000 +0200
-+++ bsdtar-1.01.022/bsdtar.c	2005-02-04 20:42:54.000000000 +0200
-@@ -191,7 +191,9 @@
+--- ./bsdtar.c.setlocale~	2004-12-22 08:44:04.000000000 +0200
++++ ./bsdtar.c	2005-02-17 14:40:12.000000000 +0200
+@@ -190,8 +190,12 @@
+ 	bsdtar->fd = -1; /* Mark as "unused" */
  	option_o = 0;
  
++#if 0
  	if (setlocale(LC_ALL, "") == NULL)
-+#if 0
  		bsdtar_warnc(bsdtar, 0, "Failed to set default locale");
++#else
++	setlocale(LC_ALL, "");
 +#endif
  #if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
  	bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-16 21:28:03 UTC (rev 6010)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-17 14:19:47 UTC (rev 6011)
@@ -3,7 +3,7 @@
 Name: tar
 Epoch: 1
 Version: 1.01.022
-Release: 1jh
+Release: 5jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Feb 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-5jh
+- fix setlocale patch
+
 * Tue Feb 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-4jh
 - revert bsdtar sources back to 1.01.022
 



From svn at tinysofa.org  Thu Feb 17 14:27:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 09:27:06 -0500 (EST)
Subject: [tinysofa-svn] r6012 - in tinysofa/releases/1.2/postfix/current:
	sources specs
Message-ID: <20050217142706.35C623443C0@minbar.tinysofa.org>

Author: jh
Date: 2005-02-17 09:26:51 -0500 (Thu, 17 Feb 2005)
New Revision: 6012

Added:
   tinysofa/releases/1.2/postfix/current/sources/tls+ipv6-1.26-pf-2.0.20.patch.gz
Removed:
   tinysofa/releases/1.2/postfix/current/sources/tls+ipv6-1.21-pf-2.0.18.patch.gz
Modified:
   tinysofa/releases/1.2/postfix/current/specs/postfix.spec
Log:
- update tls+ipv6 patch, fixes an open relay bug

Deleted: tinysofa/releases/1.2/postfix/current/sources/tls+ipv6-1.21-pf-2.0.18.patch.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/postfix/current/sources/tls+ipv6-1.26-pf-2.0.20.patch.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/postfix/current/sources/tls+ipv6-1.26-pf-2.0.20.patch.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-17 14:19:47 UTC (rev 6011)
+++ tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-17 14:26:51 UTC (rev 6012)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
 Version: 2.0.20
-Release: 5gd
+Release: 6jh
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz
@@ -21,7 +21,7 @@
 Source8: postfix-sasl
 Source9: postfix-pam
 Source10: README.sender_auth+sender_relay
-Patch0: http://www.ipnet6.org/postfix/download/tls+ipv6-1.21-pf-2.0.18.patch.gz
+Patch0: http://www.ipnet6.org/postfix/download/tls+ipv6-1.26-pf-2.0.20.patch.gz
 Patch1: postfix-1.1.2-contrib.patch
 # Not applied, provided by source1
 Patch2: postfix-1.1.4-maincf.patch
@@ -484,6 +484,9 @@
 
 
 %changelog
+* Tue Feb 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.0.20-6jh
+- update tls+ipv6 patch, fixes an open relay bug
+
 * Wed Feb 02 2005 Gerald Dachs <gda at tinysofa dot org> 2.0.20-5gd
 - included README for Sender based SASL-authentification and sender
   based relaying



From svn at tinysofa.org  Thu Feb 17 14:27:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 09:27:56 -0500 (EST)
Subject: [tinysofa-svn] r6013 -
	tinysofa/releases/1.2/tinysofa-rpm-config/current/sources
Message-ID: <20050217142756.22946344279@minbar.tinysofa.org>

Author: jh
Date: 2005-02-17 09:27:47 -0500 (Thu, 17 Feb 2005)
New Revision: 6013

Added:
   tinysofa/releases/1.2/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.2.0.tar.bz2
Removed:
   tinysofa/releases/1.2/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.6.tar.bz2
Log:
- update sources


Deleted: tinysofa/releases/1.2/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.6.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.2.0.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.2.0.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



From svn at tinysofa.org  Thu Feb 17 18:09:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:09:18 -0500 (EST)
Subject: [tinysofa-svn] r6014 - contrib/1.2
Message-ID: <20050217180918.1C176344312@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:09:10 -0500 (Thu, 17 Feb 2005)
New Revision: 6014

Added:
   contrib/1.2/unarj/
Log:
builds with tcs 1.2

Copied: contrib/1.2/unarj (from rev 6013, contrib/1.1/unarj)



From svn at tinysofa.org  Thu Feb 17 18:10:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:10:24 -0500 (EST)
Subject: [tinysofa-svn] r6015 - contrib/1.2
Message-ID: <20050217181024.0E608344312@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:10:15 -0500 (Thu, 17 Feb 2005)
New Revision: 6015

Added:
   contrib/1.2/unace/
Log:
builds with tcs 1.2

Copied: contrib/1.2/unace (from rev 6014, contrib/1.1/unace)



From svn at tinysofa.org  Thu Feb 17 18:21:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:21:49 -0500 (EST)
Subject: [tinysofa-svn] r6016 - contrib/1.1/unrar/current/specs
Message-ID: <20050217182149.5222B34437F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:21:43 -0500 (Thu, 17 Feb 2005)
New Revision: 6016

Modified:
   contrib/1.1/unrar/current/specs/unrar.spec
Log:
fixed buildrequirement

Modified: contrib/1.1/unrar/current/specs/unrar.spec
===================================================================
--- contrib/1.1/unrar/current/specs/unrar.spec	2005-02-17 18:10:15 UTC (rev 6015)
+++ contrib/1.1/unrar/current/specs/unrar.spec	2005-02-17 18:21:43 UTC (rev 6016)
@@ -1,14 +1,14 @@
 Summary: unRAR - extract, test and view RAR archives.
 Name:    unrar
 Version: 3.3.6
-Release: 2gd
+Release: 3gd
 License: Freeware
 Group: contrib
 Source0: http://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
 Source1: unrar.1
 Patch:   unrarsrc-3.2.1-errhnd.patch
 URL:     http://www.rarlab.com/
-BuildRequires: gcc-c++ gcc-c++-devel
+BuildRequires: gcc-c++
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -40,6 +40,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Feb 17 2005 Gerald Dachs <gda at tinysofa dot org> 3.3.6-3gd
+- removed buildrequirement for gcc-c++-devel
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 3.3.6-2gd
 - current (3.3.6-2gd) integrated as 3.3.6-2gd
 



From svn at tinysofa.org  Thu Feb 17 18:22:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:22:23 -0500 (EST)
Subject: [tinysofa-svn] r6017 - contrib/1.2
Message-ID: <20050217182223.7CB1734437F@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:22:15 -0500 (Thu, 17 Feb 2005)
New Revision: 6017

Added:
   contrib/1.2/unrar/
Log:
builds with tcs 1.2

Copied: contrib/1.2/unrar (from rev 6016, contrib/1.1/unrar)



From svn at tinysofa.org  Thu Feb 17 18:27:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:27:44 -0500 (EST)
Subject: [tinysofa-svn] r6018 - contrib/1.1/jigdo/current/specs
Message-ID: <20050217182744.E7B4C34439D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:27:39 -0500 (Thu, 17 Feb 2005)
New Revision: 6018

Modified:
   contrib/1.1/jigdo/current/specs/jigdo.spec
Log:
fixed buildrequirement

Modified: contrib/1.1/jigdo/current/specs/jigdo.spec
===================================================================
--- contrib/1.1/jigdo/current/specs/jigdo.spec	2005-02-17 18:22:15 UTC (rev 6017)
+++ contrib/1.1/jigdo/current/specs/jigdo.spec	2005-02-17 18:27:39 UTC (rev 6018)
@@ -1,14 +1,14 @@
 Summary:	Jigsaw Download
 Name:		jigdo
 Version:	0.7.1
-Release: 2gd
+Release: 3gd
 Group:		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 zlib
-BuildRequires:  db4-devel gcc-c++ gcc-c++-devel zlib-devel
+BuildRequires:  db4-devel gcc-c++ zlib-devel
 
 %description
 Jigsaw Download, or short jigdo, is an intelligent tool that can be used on the
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Feb 17 2005 Gerald Dachs <gda at tinysofa dot org> 0.7.1-3gd
+- removed buildrequirement for gcc-c++-devel
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.7.1-2gd
 - current (0.7.1-2gd) integrated as 0.7.1-2gd
 



From svn at tinysofa.org  Thu Feb 17 18:28:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:28:16 -0500 (EST)
Subject: [tinysofa-svn] r6019 - contrib/1.2
Message-ID: <20050217182816.44F1834439D@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:28:07 -0500 (Thu, 17 Feb 2005)
New Revision: 6019

Added:
   contrib/1.2/jigdo/
Log:
builds with tcs 1.2

Copied: contrib/1.2/jigdo (from rev 6018, contrib/1.1/jigdo)



From svn at tinysofa.org  Thu Feb 17 18:32:02 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:32:02 -0500 (EST)
Subject: [tinysofa-svn] r6020 - contrib/1.2
Message-ID: <20050217183202.16A16344392@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:31:53 -0500 (Thu, 17 Feb 2005)
New Revision: 6020

Added:
   contrib/1.2/usbutils/
Log:
builds with tcs 1.2

Copied: contrib/1.2/usbutils (from rev 6019, contrib/1.1/usbutils)



From svn at tinysofa.org  Thu Feb 17 18:39:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:39:28 -0500 (EST)
Subject: [tinysofa-svn] r6022 - contrib/1.2
Message-ID: <20050217183928.79C8C3443BB@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:39:19 -0500 (Thu, 17 Feb 2005)
New Revision: 6022

Added:
   contrib/1.2/sqlite3/
Log:
builds with tcs 1.2

Copied: contrib/1.2/sqlite3 (from rev 6021, contrib/1.1/sqlite3)



From svn at tinysofa.org  Thu Feb 17 18:41:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:41:05 -0500 (EST)
Subject: [tinysofa-svn] r6023 - contrib/1.2
Message-ID: <20050217184105.9268F3443BC@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:40:56 -0500 (Thu, 17 Feb 2005)
New Revision: 6023

Added:
   contrib/1.2/clearsilver/
Log:
builds with tcs 1.2

Copied: contrib/1.2/clearsilver (from rev 6022, contrib/1.1/clearsilver)



From svn at tinysofa.org  Thu Feb 17 18:34:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 13:34:58 -0500 (EST)
Subject: [tinysofa-svn] r6021 - contrib/1.2
Message-ID: <20050217183458.31F553443A8@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 13:34:49 -0500 (Thu, 17 Feb 2005)
New Revision: 6021

Added:
   contrib/1.2/smartmontools/
Log:
builds with tcs 1.2

Copied: contrib/1.2/smartmontools (from rev 6020, contrib/1.1/smartmontools)



From svn at tinysofa.org  Thu Feb 17 19:10:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 14:10:07 -0500 (EST)
Subject: [tinysofa-svn] r6024 - contrib/1.2
Message-ID: <20050217191007.BDAA83443C8@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 14:09:58 -0500 (Thu, 17 Feb 2005)
New Revision: 6024

Added:
   contrib/1.2/neon/
Log:
builds with tcs 1.2

Copied: contrib/1.2/neon (from rev 6023, contrib/1.1/neon)



From svn at tinysofa.org  Thu Feb 17 19:40:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 14:40:22 -0500 (EST)
Subject: [tinysofa-svn] r6025 - contrib/1.1/swig/current/specs
Message-ID: <20050217194022.797B9344416@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 14:40:16 -0500 (Thu, 17 Feb 2005)
New Revision: 6025

Modified:
   contrib/1.1/swig/current/specs/swig.spec
Log:
disabled php4

Modified: contrib/1.1/swig/current/specs/swig.spec
===================================================================
--- contrib/1.1/swig/current/specs/swig.spec	2005-02-17 19:09:58 UTC (rev 6024)
+++ contrib/1.1/swig/current/specs/swig.spec	2005-02-17 19:40:16 UTC (rev 6025)
@@ -1,7 +1,7 @@
 Summary: Simplified Wrapper and Interface Generator
 Name:    swig
 Version: 1.3.21
-Release: 5jh
+Release: 6gd
 URL:     http://swig.sourceforge.net
 Source0: http://belnet.dl.sourceforge.net/sourceforge/swig/%{name}-%{version}.tar.gz
 Patch0: swig-1.3.21-destdir.patch
@@ -11,7 +11,7 @@
 BuildRequires: gcc-c++
 BuildRequires: python-devel
 BuildRequires: perl-devel
-BuildRequires: php4-devel
+#BuildRequires: php4-devel
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -86,13 +86,13 @@
 # SWIG library: ruby.
 
 
-%package php4
-Summary:  SWIG library: php4
-Requires: %{name} = %{version}-%{release}
-Group: contrib
+#%package php4
+#Summary:  SWIG library: php4
+#Requires: %{name} = %{version}-%{release}
+#Group: contrib
 
-%description php4
-SWIG library: php4.
+#%description php4
+#SWIG library: php4.
 
 
 # %package ocaml
@@ -150,6 +150,7 @@
 make install-runtime DESTDIR=${RPM_BUILD_ROOT}
 # cleanup the stuff we dont pack
 rm -r %{buildroot}/%{_libdir}/swig1.3/tcl      || :
+rm    %{buildroot}/%{_libdir}/libswigtcl*      || :
 rm -r %{buildroot}/%{_libdir}/swig1.3/guile    || :
 rm -r %{buildroot}/%{_libdir}/swig1.3/java     || :
 rm -r %{buildroot}/%{_libdir}/swig1.3/mzscheme || :
@@ -158,6 +159,7 @@
 rm -r %{buildroot}/%{_libdir}/swig1.3/pike     || :
 rm -r %{buildroot}/%{_libdir}/swig1.3/chicken  || :
 rm -r %{buildroot}/%{_libdir}/swig1.3/csharp   || :
+rm -r %{buildroot}/%{_libdir}/swig1.3/php4     || :
 
 
 %clean
@@ -221,9 +223,9 @@
 # %defattr(-,root,root)
 # %{_libdir}/swig1.3/ruby
 
-%files php4
-%defattr(-,root,root)
-%{_libdir}/swig1.3/php4
+#%files php4
+#%defattr(-,root,root)
+#%{_libdir}/swig1.3/php4
 
 # %files ocaml
 # %defattr(-,root,root)
@@ -243,6 +245,9 @@
 
 
 %changelog
+* Thu Feb 19 2005 Gerald Dachs <gda at tinysofa dot org> 1.3.21-6gd
+- disabled build of php package
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.3.21-5jh
 - current (1.3.21-5jh) integrated as 1.3.21-5jh
 



From svn at tinysofa.org  Thu Feb 17 19:40:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 14:40:57 -0500 (EST)
Subject: [tinysofa-svn] r6026 - contrib/1.2
Message-ID: <20050217194057.3E459344416@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 14:40:46 -0500 (Thu, 17 Feb 2005)
New Revision: 6026

Added:
   contrib/1.2/swig/
Log:
builds with tcs 1.2

Copied: contrib/1.2/swig (from rev 6025, contrib/1.1/swig)



From svn at tinysofa.org  Thu Feb 17 19:43:45 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 14:43:45 -0500 (EST)
Subject: [tinysofa-svn] r6027 - contrib/1.2
Message-ID: <20050217194345.DDACF3444AA@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 14:43:36 -0500 (Thu, 17 Feb 2005)
New Revision: 6027

Added:
   contrib/1.2/subversion/
Log:
builds with tcs 1.2

Copied: contrib/1.2/subversion (from rev 6026, contrib/1.1/subversion)



From svn at tinysofa.org  Thu Feb 17 20:04:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:04:42 -0500 (EST)
Subject: [tinysofa-svn] r6028 - in contrib/1.2: . squirrelmail
	squirrelmail/current squirrelmail/current/sources
	squirrelmail/current/specs
Message-ID: <20050217200442.C1043344512@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:03:18 -0500 (Thu, 17 Feb 2005)
New Revision: 6028

Added:
   contrib/1.2/squirrelmail/
   contrib/1.2/squirrelmail/current/
   contrib/1.2/squirrelmail/current/sources/
   contrib/1.2/squirrelmail/current/sources/all_locales-1.4.4-20050122.tar.bz2
   contrib/1.2/squirrelmail/current/sources/config.php.tinysofa
   contrib/1.2/squirrelmail/current/sources/squirrelmail-1.4.4.tar.bz2
   contrib/1.2/squirrelmail/current/specs/
   contrib/1.2/squirrelmail/current/specs/squirrelmail.spec
   contrib/1.2/squirrelmail/pristine/
   contrib/1.2/squirrelmail/releases/
Log:
requires php4 -> php

Added: contrib/1.2/squirrelmail/current/sources/all_locales-1.4.4-20050122.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.2/squirrelmail/current/sources/all_locales-1.4.4-20050122.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.2/squirrelmail/current/sources/config.php.tinysofa
===================================================================
--- contrib/1.2/squirrelmail/current/sources/config.php.tinysofa	2005-02-17 19:43:36 UTC (rev 6027)
+++ contrib/1.2/squirrelmail/current/sources/config.php.tinysofa	2005-02-17 20:03:18 UTC (rev 6028)
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * SquirrelMail Configuration File
+ * Created using the configure script, conf.pl
+ */
+
+global $version;
+$config_version = '1.4.0';
+$config_use_color = 1;
+
+$org_name      = "SquirrelMail";
+$org_logo      = SM_PATH . 'images/sm_logo.png';
+$org_logo_width  = '308';
+$org_logo_height = '111';
+$org_title     = "SquirrelMail $version";
+$signout_page  = '';
+$frame_top     = '_top';
+
+$provider_uri     = 'http://www.squirrelmail.org/';
+
+$provider_name     = 'SquirrelMail';
+
+$motd = "";
+
+$squirrelmail_default_language = 'en_US';
+
+$domain                 = 'localhost';
+$imapServerAddress      = 'localhost';
+$imapPort               = 143;
+$useSendmail            = false;
+$smtpServerAddress      = 'localhost';
+$smtpPort               = 25;
+$sendmail_path          = '/usr/sbin/sendmail';
+$pop_before_smtp        = false;
+$imap_server_type       = 'courier';
+$invert_time            = false;
+$optional_delimiter     = 'detect';
+
+$default_folder_prefix          = 'INBOX.';
+$trash_folder                   = 'Trash';
+$sent_folder                    = 'Sent';
+$draft_folder                   = 'Drafts';
+$default_move_to_trash          = true;
+$default_move_to_sent           = true;
+$default_save_as_draft          = true;
+$show_prefix_option             = true;
+$list_special_folders_first     = true;
+$use_special_folder_color       = true;
+$auto_expunge                   = true;
+$default_sub_of_inbox           = false;
+$show_contain_subfolders_option = true;
+$default_unseen_notify          = 2;
+$default_unseen_type            = 1;
+$auto_create_special            = true;
+$delete_folder                  = false;
+$noselect_fix_enable            = false;
+
+$default_charset          = 'iso-8859-1';
+$data_dir                 = '/var/lib/squirrelmail/prefs/';
+$attachment_dir           = '/var/spool/squirrelmail/attach/';
+$dir_hash_level           = 0;
+$default_left_size        = '150';
+$force_username_lowercase = false;
+$default_use_priority     = true;
+$hide_sm_attributions     = false;
+$default_use_mdn          = true;
+$edit_identity            = true;
+$edit_name                = true;
+$allow_thread_sort        = true;
+$allow_server_sort        = true;
+$allow_charset_search     = true;
+$uid_support              = true;
+
+$plugins[0] = 'delete_move_next';
+$plugins[1] = 'squirrelspell';
+$plugins[2] = 'newmail';
+
+$theme_css = '';
+$theme_default = 0;
+$theme[0]['PATH'] = SM_PATH . 'themes/default_theme.php';
+$theme[0]['NAME'] = 'Default';
+$theme[1]['PATH'] = SM_PATH . 'themes/plain_blue_theme.php';
+$theme[1]['NAME'] = 'Plain Blue';
+$theme[2]['PATH'] = SM_PATH . 'themes/sandstorm_theme.php';
+$theme[2]['NAME'] = 'Sand Storm';
+$theme[3]['PATH'] = SM_PATH . 'themes/deepocean_theme.php';
+$theme[3]['NAME'] = 'Deep Ocean';
+$theme[4]['PATH'] = SM_PATH . 'themes/slashdot_theme.php';
+$theme[4]['NAME'] = 'Slashdot';
+$theme[5]['PATH'] = SM_PATH . 'themes/purple_theme.php';
+$theme[5]['NAME'] = 'Purple';
+$theme[6]['PATH'] = SM_PATH . 'themes/forest_theme.php';
+$theme[6]['NAME'] = 'Forest';
+$theme[7]['PATH'] = SM_PATH . 'themes/ice_theme.php';
+$theme[7]['NAME'] = 'Ice';
+$theme[8]['PATH'] = SM_PATH . 'themes/seaspray_theme.php';
+$theme[8]['NAME'] = 'Sea Spray';
+$theme[9]['PATH'] = SM_PATH . 'themes/bluesteel_theme.php';
+$theme[9]['NAME'] = 'Blue Steel';
+$theme[10]['PATH'] = SM_PATH . 'themes/dark_grey_theme.php';
+$theme[10]['NAME'] = 'Dark Grey';
+$theme[11]['PATH'] = SM_PATH . 'themes/high_contrast_theme.php';
+$theme[11]['NAME'] = 'High Contrast';
+$theme[12]['PATH'] = SM_PATH . 'themes/black_bean_burrito_theme.php';
+$theme[12]['NAME'] = 'Black Bean Burrito';
+$theme[13]['PATH'] = SM_PATH . 'themes/servery_theme.php';
+$theme[13]['NAME'] = 'Servery';
+$theme[14]['PATH'] = SM_PATH . 'themes/maize_theme.php';
+$theme[14]['NAME'] = 'Maize';
+$theme[15]['PATH'] = SM_PATH . 'themes/bluesnews_theme.php';
+$theme[15]['NAME'] = 'BluesNews';
+$theme[16]['PATH'] = SM_PATH . 'themes/deepocean2_theme.php';
+$theme[16]['NAME'] = 'Deep Ocean 2';
+$theme[17]['PATH'] = SM_PATH . 'themes/blue_grey_theme.php';
+$theme[17]['NAME'] = 'Blue Grey';
+$theme[18]['PATH'] = SM_PATH . 'themes/dompie_theme.php';
+$theme[18]['NAME'] = 'Dompie';
+$theme[19]['PATH'] = SM_PATH . 'themes/methodical_theme.php';
+$theme[19]['NAME'] = 'Methodical';
+$theme[20]['PATH'] = SM_PATH . 'themes/greenhouse_effect.php';
+$theme[20]['NAME'] = 'Greenhouse Effect (Changes)';
+$theme[21]['PATH'] = SM_PATH . 'themes/in_the_pink.php';
+$theme[21]['NAME'] = 'In The Pink (Changes)';
+$theme[22]['PATH'] = SM_PATH . 'themes/kind_of_blue.php';
+$theme[22]['NAME'] = 'Kind of Blue (Changes)';
+$theme[23]['PATH'] = SM_PATH . 'themes/monostochastic.php';
+$theme[23]['NAME'] = 'Monostochastic (Changes)';
+$theme[24]['PATH'] = SM_PATH . 'themes/shades_of_grey.php';
+$theme[24]['NAME'] = 'Shades of Grey (Changes)';
+$theme[25]['PATH'] = SM_PATH . 'themes/spice_of_life.php';
+$theme[25]['NAME'] = 'Spice of Life (Changes)';
+$theme[26]['PATH'] = SM_PATH . 'themes/spice_of_life_lite.php';
+$theme[26]['NAME'] = 'Spice of Life - Lite (Changes)';
+$theme[27]['PATH'] = SM_PATH . 'themes/spice_of_life_dark.php';
+$theme[27]['NAME'] = 'Spice of Life - Dark (Changes)';
+$theme[28]['PATH'] = SM_PATH . 'themes/christmas.php';
+$theme[28]['NAME'] = 'Holiday - Christmas';
+$theme[29]['PATH'] = SM_PATH . 'themes/darkness.php';
+$theme[29]['NAME'] = 'Darkness (Changes)';
+$theme[30]['PATH'] = SM_PATH . 'themes/random.php';
+$theme[30]['NAME'] = 'Random (Changes every login)';
+$theme[31]['PATH'] = SM_PATH . 'themes/midnight.php';
+$theme[31]['NAME'] = 'Midnight';
+$theme[32]['PATH'] = SM_PATH . 'themes/alien_glow.php';
+$theme[32]['NAME'] = 'Alien Glow';
+$theme[33]['PATH'] = SM_PATH . 'themes/dark_green.php';
+$theme[33]['NAME'] = 'Dark Green';
+$theme[34]['PATH'] = SM_PATH . 'themes/penguin.php';
+$theme[34]['NAME'] = 'Penguin';
+
+$default_use_javascript_addr_book = false;
+$addrbook_dsn = '';
+$addrbook_table = 'address';
+
+$prefs_dsn = '';
+$prefs_table = 'userprefs';
+$prefs_user_field = 'user';
+$prefs_key_field = 'prefkey';
+$prefs_val_field = 'prefval';
+$no_list_for_subscribe = false;
+$smtp_auth_mech = 'none';
+$imap_auth_mech = 'login';
+$use_imap_tls = false;
+$use_smtp_tls = false;
+$session_name = 'SQMSESSID';
+
+ at include SM_PATH . 'config/config_local.php';
+
+/**
+ * Make sure there are no characters after the PHP closing
+ * tag below (including newline characters and whitespace).
+ * Otherwise, that character will cause the headers to be
+ * sent and regular output to begin, which will majorly screw
+ * things up when we try to send more headers later.
+ */
+?>
\ No newline at end of file

Added: contrib/1.2/squirrelmail/current/sources/squirrelmail-1.4.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.2/squirrelmail/current/sources/squirrelmail-1.4.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.2/squirrelmail/current/specs/squirrelmail.spec
===================================================================
--- contrib/1.2/squirrelmail/current/specs/squirrelmail.spec	2005-02-17 19:43:36 UTC (rev 6027)
+++ contrib/1.2/squirrelmail/current/specs/squirrelmail.spec	2005-02-17 20:03:18 UTC (rev 6028)
@@ -0,0 +1,153 @@
+%define locale_stamp 20050122
+
+Summary:        SquirrelMail webmail client
+Name:           squirrelmail
+Version:        1.4.4
+Release:        3gd
+License:        GPL
+URL:            http://www.squirrelmail.org/
+Vendor:         squirrelmail.org
+Group:          contrib
+Source:         %{name}-%{version}.tar.bz2
+Source1:        all_locales-%{version}-%{locale_stamp}.tar.bz2
+Source2:	config.php.tinysofa
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildArch:      noarch
+Requires:       httpd, php, perl, tmpwatch >= 2.8, aspell
+Requires:       /usr/sbin/sendmail
+
+%description
+SquirrelMail is a standards-based webmail package written in PHP4. It
+includes built-in pure PHP support for the IMAP and SMTP protocols, and
+all pages render in pure HTML 4.0 (with no Javascript) for maximum
+compatibility across browsers.  It has very few requirements and is very
+easy to configure and install. SquirrelMail has all the functionality
+you would want from an email client, including strong MIME support,
+address books, and folder manipulation.
+
+%prep
+%setup -q -a 1
+%{__rm} -f plugins/make_archive.pl
+
+# Rearrange the documentation
+%{__mv} AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
+%{__mv} ReleaseNotes doc/ReleaseNotes.txt
+%{__mv} themes/README.themes doc/
+for f in `find plugins -name "README*" -or -name INSTALL \
+    -or -name CHANGES -or -name HISTORY`; do
+    %{__mkdir_p} doc/`dirname $f`
+    %{__mv} $f $_
+done
+%{__mv} doc/plugins/squirrelspell/doc/README doc/plugins/squirrelspell
+%{__rm} -rf doc/plugins/squirrelspell/doc
+%{__mv} plugins/squirrelspell/doc/* doc/plugins/squirrelspell
+%{__rm} -f doc/plugins/squirrelspell/index.php
+%{__rm} -rf plugins/squirrelspell/doc
+
+# Fixup various files
+echo "left_refresh=300" >> data/default_pref
+cp %{SOURCE2} contrib/RPM/
+for f in contrib/RPM/squirrelmail.cron contrib/RPM/config.php.tinysofa; do
+    %{__perl} -pi \
+        -e "s|__ATTDIR__|%{_localstatedir}/spool/squirrelmail/attach/|g;" \
+        -e "s|__PREFSDIR__|%{_localstatedir}/lib/squirrelmail/prefs/|g;" \
+        -e "s|__IMAP_SERVER__|courier|g;" \
+        -e "s|__OPT_DELIM__||g;" \
+        -e "s|__DEF_FOLDER_PREFIX__|INBOX.|g;" $f
+done
+
+# Fix the version
+%{__perl} -pi -e "s|^(\s*\\\$version\s*=\s*).*|\1'%{version}-%{release}';|g"\
+    functions/strings.php
+
+%install
+%{__mkdir_p} -m 755 %{buildroot}%{_sysconfdir}/squirrelmail
+%{__mkdir_p} -m 755 %{buildroot}%{_localstatedir}/lib/squirrelmail/prefs
+%{__mkdir_p} -m 755 %{buildroot}%{_localstatedir}/spool/squirrelmail/attach
+%{__mkdir_p} -m 755 %{buildroot}%{_datadir}/squirrelmail
+
+# install default_pref into /etc/squirrelmail and symlink to it from data
+%{__install} -m 644 data/default_pref \
+    %{buildroot}%{_sysconfdir}/squirrelmail/
+%{__ln_s} %{_sysconfdir}/squirrelmail/default_pref \
+    %{buildroot}%{_localstatedir}/lib/squirrelmail/prefs/default_pref
+
+# install the config files
+%{__mkdir_p} -m 755 %{buildroot}%{_datadir}/squirrelmail/config
+%{__install} -m 644 contrib/RPM/config.php.tinysofa \
+    %{buildroot}%{_sysconfdir}/squirrelmail/config.php
+%{__ln_s} %{_sysconfdir}/squirrelmail/config.php \
+    %{buildroot}%{_datadir}/squirrelmail/config/config.php
+%{__install} -m 644 config/config_local.php \
+    %{buildroot}%{_sysconfdir}/squirrelmail/config_local.php
+%{__ln_s} %{_sysconfdir}/squirrelmail/config_local.php \
+    %{buildroot}%{_datadir}/squirrelmail/config/config_local.php
+%{__rm} -f config/config_local.php config/config.php
+%{__install} -m 644 config/*.php %{buildroot}%{_datadir}/squirrelmail/config/
+%{__install} -m 755 config/*.pl  %{buildroot}%{_datadir}/squirrelmail/config/
+
+# install index.php
+%{__install} -m 644 index.php %{buildroot}%{_datadir}/squirrelmail/
+
+# Copy over the rest
+for DIR in class functions help images include locale plugins src themes; do
+    %{__cp} -rp $DIR %{buildroot}%{_datadir}/squirrelmail/
+done
+
+# install the cron script
+%{__mkdir_p} -m 755 %{buildroot}%{_sysconfdir}/cron.daily
+%{__install} -m 755 contrib/RPM/squirrelmail.cron \
+    %{buildroot}/%{_sysconfdir}/cron.daily/
+
+# install the config file
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
+%{__install} -m 644 contrib/RPM/squirrelmail.conf \
+    %{buildroot}%{_sysconfdir}/httpd/conf.d/
+
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%config %dir %{_sysconfdir}/squirrelmail
+%config(noreplace) %{_sysconfdir}/squirrelmail/*
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
+%doc doc/*
+%dir %{_datadir}/squirrelmail
+%{_datadir}/squirrelmail/index.php
+%{_datadir}/squirrelmail/class
+%{_datadir}/squirrelmail/functions
+%{_datadir}/squirrelmail/help
+%{_datadir}/squirrelmail/images
+%{_datadir}/squirrelmail/include
+%{_datadir}/squirrelmail/locale
+%{_datadir}/squirrelmail/src
+%{_datadir}/squirrelmail/themes
+%{_datadir}/squirrelmail/config
+%dir %{_datadir}/squirrelmail/plugins
+%{_datadir}/squirrelmail/plugins/*
+%dir %{_localstatedir}/lib/squirrelmail
+%dir %{_localstatedir}/spool/squirrelmail
+%attr(0770, root, httpd) %dir %{_localstatedir}/lib/squirrelmail/prefs
+%attr(0730, root, httpd) %dir %{_localstatedir}/spool/squirrelmail/attach
+%{_localstatedir}/lib/squirrelmail/prefs/default_pref
+%{_sysconfdir}/cron.daily/squirrelmail.cron
+
+%changelog
+* Thu Feb 19 2005 Gerald Dachs <gda at tinysofa dot org> 1.4.4-3gd
+- requires php4 -> php
+
+* Mon Jan 24 2005 Gerald Dachs <gda at tinysofa dot org> 1.4.4-2gd
+- this time with locales
+
+* Mon Jan 24 2005 Gerald Dachs <gda at tinysofa dot org> 1.4.4-1gd
+- 1.4.4
+
+* Thu Dec 16 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.3a-2gd
+- applied security patch
+- changed config
+
+* Mon Sep 27 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.3a-1gd
+- new in contrib
+



From svn at tinysofa.org  Thu Feb 17 20:07:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:07:17 -0500 (EST)
Subject: [tinysofa-svn] r6029 - contrib/1.2
Message-ID: <20050217200717.628823443C8@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:07:06 -0500 (Thu, 17 Feb 2005)
New Revision: 6029

Added:
   contrib/1.2/fetchmail/
Log:
builds with tcs 1.2

Copied: contrib/1.2/fetchmail (from rev 6028, contrib/1.1/fetchmail)



From svn at tinysofa.org  Thu Feb 17 20:08:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:08:03 -0500 (EST)
Subject: [tinysofa-svn] r6030 - contrib/1.2
Message-ID: <20050217200803.306E73443C8@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:07:53 -0500 (Thu, 17 Feb 2005)
New Revision: 6030

Added:
   contrib/1.2/mailf/
Log:
builds with tcs 1.2

Copied: contrib/1.2/mailf (from rev 6029, contrib/1.1/mailf)



From svn at tinysofa.org  Thu Feb 17 20:09:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:09:42 -0500 (EST)
Subject: [tinysofa-svn] r6031 - contrib/1.2
Message-ID: <20050217200942.2ED833443D5@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:09:33 -0500 (Thu, 17 Feb 2005)
New Revision: 6031

Added:
   contrib/1.2/ripole/
Log:
builds with tcs 1.2

Copied: contrib/1.2/ripole (from rev 6030, contrib/1.1/ripole)



From svn at tinysofa.org  Thu Feb 17 20:15:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:15:40 -0500 (EST)
Subject: [tinysofa-svn] r6032 - contrib/1.2
Message-ID: <20050217201540.8DC82344397@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:15:33 -0500 (Thu, 17 Feb 2005)
New Revision: 6032

Added:
   contrib/1.2/kernel-module-unionfs/
Log:
builds with tcs 1.2

Copied: contrib/1.2/kernel-module-unionfs (from rev 6031, contrib/1.1/kernel-module-unionfs)



From svn at tinysofa.org  Thu Feb 17 20:18:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:18:19 -0500 (EST)
Subject: [tinysofa-svn] r6033 - contrib/1.2
Message-ID: <20050217201819.8DC4834439C@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:18:12 -0500 (Thu, 17 Feb 2005)
New Revision: 6033

Added:
   contrib/1.2/aspell-de/
Log:
builds with tcs 1.2

Copied: contrib/1.2/aspell-de (from rev 6032, contrib/1.1/aspell-de)



From svn at tinysofa.org  Thu Feb 17 20:18:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:18:40 -0500 (EST)
Subject: [tinysofa-svn] r6034 - contrib/1.2
Message-ID: <20050217201840.3E20D34439C@minbar.tinysofa.org>

Author: gda
Date: 2005-02-17 15:18:31 -0500 (Thu, 17 Feb 2005)
New Revision: 6034

Added:
   contrib/1.2/aspell-en/
Log:
builds with tcs 1.2

Copied: contrib/1.2/aspell-en (from rev 6033, contrib/1.1/aspell-en)



From svn at tinysofa.org  Thu Feb 17 20:26:58 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 17 Feb 2005 15:26:58 -0500 (EST)
Subject: [tinysofa-svn] r6035 - tinysofa/releases/1.2/php/current/specs
Message-ID: <20050217202658.E40F63443A3@minbar.tinysofa.org>

Author: jh
Date: 2005-02-17 15:26:52 -0500 (Thu, 17 Feb 2005)
New Revision: 6035

Modified:
   tinysofa/releases/1.2/php/current/specs/php.spec
Log:
- fix bogus obsoletes/conflicts


Modified: tinysofa/releases/1.2/php/current/specs/php.spec
===================================================================
--- tinysofa/releases/1.2/php/current/specs/php.spec	2005-02-17 20:18:31 UTC (rev 6034)
+++ tinysofa/releases/1.2/php/current/specs/php.spec	2005-02-17 20:26:52 UTC (rev 6035)
@@ -8,7 +8,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.3
-Release: 1
+Release: 2jh
 License: The PHP License
 Group: main
 URL: http://www.php.net/
@@ -54,8 +54,7 @@
 # Enforce Apache module ABI compatibility
 PreReq: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 Requires: php-pear, file >= 4.0
-Conflicts: php >= 5.0.0
-Obsoletes: php < 5.0.0
+Obsoletes: php4
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -71,8 +70,7 @@
 Group: development
 Summary: Files needed for building PHP extensions.
 Requires: php = %{version}-%{release}
-Conflicts: php-devel >= 5.0.0
-Obsoletes: php-devel < 5.0.0
+Obsoletes: php4-devel
 
 %description devel
 The php-devel package contains the files needed for building PHP
@@ -83,8 +81,7 @@
 Group: extra
 Summary: PHP Extension and Application Repository Components
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-pear >= 5.0.0
-Obsoletes: php-pear < 5.0.0
+Obsoletes: php4-pear
 
 %description pear
 PEAR is a framework and distribution system for reusable PHP
@@ -95,8 +92,7 @@
 Summary: An Apache module for PHP applications that use IMAP.
 Group: extra
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-imap >= 5.0.0
-Obsoletes: php-imap < 5.0.0
+Obsoletes: php4-imap
 Obsoletes: mod_php3-imap, stronghold-php-imap
 BuildRequires: krb5-devel, openssl-devel, libc-client-devel
 
@@ -113,8 +109,7 @@
 Summary: A module for PHP applications that use LDAP.
 Group: extra
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-ldap >= 5.0.0
-Obsoletes: php-ldap < 5.0.0
+Obsoletes: php4-ldap
 Obsoletes: mod_php3-ldap, stronghold-php-ldap
 BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel
 
@@ -130,8 +125,7 @@
 Summary: A module for PHP applications that use MySQL databases.
 Group: extra
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-mysql >= 5.0.0
-Obsoletes: php-mysql < 5.0.0
+Obsoletes: php4-mysql
 Provides: %{name}_database
 Obsoletes: mod_php3-mysql, stronghold-php-mysql
 BuildRequires: mysql-devel
@@ -147,8 +141,7 @@
 Summary: A PostgreSQL database module for PHP.
 Group: extra
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-pgsql >= 5.0.0
-Obsoletes: php-pgsql < 5.0.0
+Obsoletes: php4-pgsql
 Provides: %{name}_database
 Obsoletes: mod_php3-pgsql, stronghold-php-pgsql
 BuildRequires: krb5-devel, openssl-devel, postgresql-devel
@@ -167,8 +160,7 @@
 Group: extra
 Requires: %{name} = %{version}-%{release}
 Summary: A module for PHP applications that use ODBC databases.
-Conflicts: php-odbc >= 5.0.0
-Obsoletes: php-odbc < 5.0.0
+Obsoletes: php4-odbc
 Provides: %{name}_database
 Obsoletes: stronghold-php-odbc
 BuildRequires: unixODBC-devel
@@ -213,8 +205,7 @@
 %package oci8
 Group: extra
 Summary: A module for PHP applications that use OCI8 databases.
-Conflicts: php-oci8 >= 5.0.0
-Obsoletes: php-oci8 < 5.0.0
+Obsoletes: php4-oci8
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}_database
 
@@ -227,8 +218,7 @@
 %package mssql
 Group: extra
 Summary: A module for PHP applications that use MSSQL databases.
-Conflicts: php-mssql >= 5.0.0
-Obsoletes: php-mssql < 5.0.0
+Obsoletes: php4-mssql
 Requires: %{name} = %{version}-%{release}, freetds
 Provides: %{name}_database
 BuildRequires: freetds-devel
@@ -242,8 +232,7 @@
 %package mhash
 Summary: A module for PHP applications that use Mhash.
 Group: extra
-Conflicts: php-mhash >= 5.0.0
-Obsoletes: php-mhash < 5.0.0
+Obsoletes: php4-mhash
 Requires: %{name} = %{version}-%{release}
 BuildRequires: mhash-devel
 
@@ -257,8 +246,7 @@
 Summary: A module for PHP applications that query SNMP-managed devices.
 Group: extra
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-snmp >= 5.0.0
-Obsoletes: php-snmp < 5.0.0
+Obsoletes: php4-snmp
 BuildRequires: net-snmp-devel
 
 %description snmp
@@ -272,8 +260,7 @@
 Obsoletes: php-domxml, php-dom
 Provides: php-dom, php-xsl
 Group: extra
-Conflicts: php >= 5.0.0
-Obsoletes: php-domxml < 5.0.0
+Obsoletes: php4-domxml
 Requires: %{name} = %{version}-%{release}
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
 BuildRequires: libxml2-devel >= 2.4.14-1
@@ -286,8 +273,7 @@
 %package xmlrpc
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: extra
-Conflicts: php-xmlrpc >= 5.0.0
-Obsoletes: php-xmlrpc < 5.0.0
+Obsoletes: php4-xmlrpc
 Requires: %{name} = %{version}-%{release}
 BuildRequires: expat-devel
 
@@ -300,8 +286,7 @@
 Summary: A module for PHP applications which need multi-byte string handling
 Group: extra
 Requires: %{name} = %{version}-%{release}
-Conflicts: php-mbstring >= 5.0.0
-Obsoletes: php-mbstring < 5.0.0
+Obsoletes: php4-mbstring
 
 %description mbstring
 The php-mbstring package contains a dynamic shared object that will add
@@ -312,8 +297,7 @@
 Group: extra
 Requires: %{name} = %{version}-%{release}
 BuildRequires: ncurses-devel
-Conflicts: php-ncurses >= 5.0.0
-Obsoletes: php-ncurses < 5.0.0
+Obsoletes: php4-ncurses
 
 %description ncurses
 The php-mbstring package contains a dynamic shared object that will add
@@ -325,8 +309,7 @@
 Requires: %{name} = %{version}-%{release}
 #BuildRequires: gd-devel, freetype-devel
 BuildRequires: libpng-devel, libjpeg-devel, freetype-devel
-Conflicts: php-gd >= 5.0.0
-Obsoletes: php-gd < 5.0.0
+Obsoletes: php4-gd
 Obsoletes: mod_php4-gd
 
 %description gd



From svn at tinysofa.org  Fri Feb 18 10:44:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 05:44:06 -0500 (EST)
Subject: [tinysofa-svn] r6036 - in tinysofa/releases/1.2/dovecot/current:
	sources specs
Message-ID: <20050218104406.08F983445F5@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 05:43:42 -0500 (Fri, 18 Feb 2005)
New Revision: 6036

Added:
   tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.14.tar.gz
Removed:
   tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.13.tar.gz
Modified:
   tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec
Log:
- 0.99.14

Deleted: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.13.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.14.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/dovecot/current/sources/dovecot-0.99.14.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec
===================================================================
--- tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec	2005-02-17 20:26:52 UTC (rev 6035)
+++ tinysofa/releases/1.2/dovecot/current/specs/dovecot.spec	2005-02-18 10:43:42 UTC (rev 6036)
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
-Version: 0.99.13
-Release: 2gd
+Version: 0.99.14
+Release: 1jh
 License: GPL
 Group: extra
 Source: %{name}-%{version}.tar.gz
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Thu Feb 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.99.14-jh
+- 0.99.14
+
 * Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 0.99.13-2gd
 - changed group to extra
 



From svn at tinysofa.org  Fri Feb 18 16:54:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 11:54:25 -0500 (EST)
Subject: [tinysofa-svn] r6037 - tinysofa/releases/1.2/python/current/sources
Message-ID: <20050218165425.1E360344599@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 11:54:19 -0500 (Fri, 18 Feb 2005)
New Revision: 6037

Modified:
   tinysofa/releases/1.2/python/current/sources/python-2.4-lib64.patch
Log:
- update patch


Modified: tinysofa/releases/1.2/python/current/sources/python-2.4-lib64.patch
===================================================================
--- tinysofa/releases/1.2/python/current/sources/python-2.4-lib64.patch	2005-02-18 10:43:42 UTC (rev 6036)
+++ tinysofa/releases/1.2/python/current/sources/python-2.4-lib64.patch	2005-02-18 16:54:19 UTC (rev 6037)
@@ -162,15 +162,6 @@
  
 --- Python-2.4b1/Modules/Setup.dist.lib64	2004-11-04 14:35:15.805241496 -0500
 +++ Python-2.4b1/Modules/Setup.dist	2004-11-04 14:38:43.884254818 -0500
-@@ -325,7 +325,7 @@
- # *** Uncomment and edit to reflect your Tcl/Tk versions:
- 	-ltk -ltcl \
- # *** Uncomment and edit to reflect where your X11 libraries are:
--	-L/usr/X11R6/lib \
-+	-L/usr/X11R6/lib64 \
- # *** Or uncomment this for Solaris:
- #	-L/usr/openwin/lib \
- # *** Uncomment these for TOGL extension only:
 @@ -395,7 +395,7 @@
  # and the subdirectory of PORT where you built it.
  DBLIBVER=4.2



From svn at tinysofa.org  Fri Feb 18 17:24:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 12:24:42 -0500 (EST)
Subject: [tinysofa-svn] r6038 - tinysofa/releases/1.2/perl/current/specs
Message-ID: <20050218172442.4B09734458E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 12:24:36 -0500 (Fri, 18 Feb 2005)
New Revision: 6038

Modified:
   tinysofa/releases/1.2/perl/current/specs/perl.spec
Log:
- own /usr/lib/perl5, /usr/lib/perl5/%%{version} correctly on multilib arches

Modified: tinysofa/releases/1.2/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-18 16:54:19 UTC (rev 6037)
+++ tinysofa/releases/1.2/perl/current/specs/perl.spec	2005-02-18 17:24:36 UTC (rev 6038)
@@ -253,9 +253,8 @@
 %{_bindir}/xsubpp
 %attr(4711,root,root) %{_bindir}/sperl%{version}
 %exclude %{_bindir}/suidperl
-%dir %{perl_root64}
-%dir %{perl_root64}/%{version}
-     %{perl_root64}/%{version}/%{full_arch}
+%dir %{perl_root}
+%dir %{perl_root}/%{version}
      %{perl_root}/%{version}/*.pl
      %{perl_root}/%{version}/*.pm
 %dir %{perl_root}/%{version}/Attribute
@@ -367,9 +366,12 @@
 %dir %{perl_root}/site_perl
 %dir %{perl_root}/site_perl/%{version}
 %ifarch %{multilib_64_archs}
+%dir %{perl_root64}
+%dir %{perl_root64}/%{version}
 %dir %{perl_root64}/site_perl
 %dir %{perl_root64}/site_perl/%{version}
 %endif
+     %{perl_root64}/%{version}/%{full_arch}
 %dir %{perl_root64}/site_perl/%{version}/%{_arch}-linux
 %if %threading
 %dir %{perl_root64}/site_perl/%{version}/%{full_arch}
@@ -444,6 +446,10 @@
 
 
 %changelog
+* Fri Feb 18 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- own /usr/lib/perl5, /usr/lib/perl5/%%{version} correctly on multilib
+  arches
+
 * Sun Feb  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 5.8.6-3jh
 - fix CAN-2005-0155 and CAN-2005-0156 (#5)
 



From svn at tinysofa.org  Fri Feb 18 17:26:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 12:26:29 -0500 (EST)
Subject: [tinysofa-svn] r6039 - tinysofa/releases/1.2/gdb/current/specs
Message-ID: <20050218172629.A4AD6344567@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 12:26:24 -0500 (Fri, 18 Feb 2005)
New Revision: 6039

Modified:
   tinysofa/releases/1.2/gdb/current/specs/gdb.spec
Log:
- multilib fix


Modified: tinysofa/releases/1.2/gdb/current/specs/gdb.spec
===================================================================
--- tinysofa/releases/1.2/gdb/current/specs/gdb.spec	2005-02-18 17:24:36 UTC (rev 6038)
+++ tinysofa/releases/1.2/gdb/current/specs/gdb.spec	2005-02-18 17:26:24 UTC (rev 6039)
@@ -25,6 +25,7 @@
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
 	--bindir=%{_bindir} \
+	--bindir=%{_libdir} \
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--with-separate-debug-dir=/usr/lib/debug \
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Fri Feb 18 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- multilib fix
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 6.3-1ts
 - current (6.3-1jh) integrated as 6.3-1ts for release 1.1-U3
 



From svn at tinysofa.org  Fri Feb 18 18:56:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 13:56:52 -0500 (EST)
Subject: [tinysofa-svn] r6041 - tinysofa/releases/1.2/stunnel/current/specs
Message-ID: <20050218185652.203B7344615@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 13:56:46 -0500 (Fri, 18 Feb 2005)
New Revision: 6041

Modified:
   tinysofa/releases/1.2/stunnel/current/specs/stunnel.spec
Log:
- fix %%postun


Modified: tinysofa/releases/1.2/stunnel/current/specs/stunnel.spec
===================================================================
--- tinysofa/releases/1.2/stunnel/current/specs/stunnel.spec	2005-02-18 18:12:13 UTC (rev 6040)
+++ tinysofa/releases/1.2/stunnel/current/specs/stunnel.spec	2005-02-18 18:56:46 UTC (rev 6041)
@@ -72,6 +72,9 @@
 
 %postun
 %service_postun stunnel
+# this must be here since the init script may return a non-zero
+# value if the config file is missing
+exit 0
 
 %clean
 %clean_buildroot



From svn at tinysofa.org  Fri Feb 18 19:36:13 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 14:36:13 -0500 (EST)
Subject: [tinysofa-svn] r6042 - tinysofa/releases/1.2/gdb/current/specs
Message-ID: <20050218193613.7F66F344645@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 14:36:07 -0500 (Fri, 18 Feb 2005)
New Revision: 6042

Modified:
   tinysofa/releases/1.2/gdb/current/specs/gdb.spec
Log:
- fix latest fix

Modified: tinysofa/releases/1.2/gdb/current/specs/gdb.spec
===================================================================
--- tinysofa/releases/1.2/gdb/current/specs/gdb.spec	2005-02-18 18:56:46 UTC (rev 6041)
+++ tinysofa/releases/1.2/gdb/current/specs/gdb.spec	2005-02-18 19:36:07 UTC (rev 6042)
@@ -25,7 +25,7 @@
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
 	--bindir=%{_bindir} \
-	--bindir=%{_libdir} \
+	--libdir=%{_libdir} \
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--with-separate-debug-dir=/usr/lib/debug \



From svn at tinysofa.org  Fri Feb 18 20:01:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 15:01:53 -0500 (EST)
Subject: [tinysofa-svn] r6043 - in tinysofa/releases/1.2/kernel/current:
	sources specs
Message-ID: <20050218200153.22BA03445A2@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 14:58:25 -0500 (Fri, 18 Feb 2005)
New Revision: 6043

Added:
   tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-x86_64.patch
   tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11-rc4.bz2
Removed:
   tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11-rc3.bz2
Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- 2.6.11-rc4
- add a x86_64 patch


Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config	2005-02-18 19:36:07 UTC (rev 6042)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586-smp.config	2005-02-18 19:58:25 UTC (rev 6043)
@@ -1,8 +1,8 @@
 # i386
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11-rc3
-# Fri Feb  4 20:39:09 2005
+# Linux kernel version: 2.6.11-rc4
+# Fri Feb 18 20:21:09 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -1091,6 +1091,7 @@
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_BCSP_TXCRC=y
 CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config	2005-02-18 19:36:07 UTC (rev 6042)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-i586.config	2005-02-18 19:58:25 UTC (rev 6043)
@@ -1,8 +1,8 @@
 # i386
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11-rc3
-# Fri Feb  4 20:18:37 2005
+# Linux kernel version: 2.6.11-rc4
+# Fri Feb 18 20:21:00 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -1091,6 +1091,7 @@
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_BCSP_TXCRC=y
 CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config	2005-02-18 19:36:07 UTC (rev 6042)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config	2005-02-18 19:58:25 UTC (rev 6043)
@@ -1,8 +1,8 @@
 # x86_64
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11-rc3
-# Fri Feb 18 22:05:48 2005
+# Linux kernel version: 2.6.11-rc4
+# Fri Feb 18 22:32:39 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -977,6 +977,7 @@
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_BCSP_TXCRC=y
 CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config	2005-02-18 19:36:07 UTC (rev 6042)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config	2005-02-18 19:58:25 UTC (rev 6043)
@@ -1,8 +1,8 @@
 # x86_64
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11-rc3
-# Fri Feb 18 22:09:52 2005
+# Linux kernel version: 2.6.11-rc4
+# Fri Feb 18 22:32:43 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -971,6 +971,7 @@
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_BCSP_TXCRC=y
 CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m

Added: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-x86_64.patch
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-x86_64.patch	2005-02-18 19:36:07 UTC (rev 6042)
+++ tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-x86_64.patch	2005-02-18 19:58:25 UTC (rev 6043)
@@ -0,0 +1,31 @@
+--- ./arch/x86_64/mm/mmap.c.x86_64	2005-02-18 22:51:02.000000000 +0200
++++ ./arch/x86_64/mm/mmap.c	2005-02-18 22:51:46.000000000 +0200
+@@ -37,7 +37,7 @@
+ 
+ static inline unsigned long mmap_base(void)
+ {
+-	unsigned long gap = current->rlim[RLIMIT_STACK].rlim_cur;
++	unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
+ 
+ 	if (gap < MIN_GAP)
+ 		gap = MIN_GAP;
+@@ -58,7 +58,7 @@
+ 	if (current->personality & ADDR_COMPAT_LAYOUT) 
+ 		return 1;
+ 	
+-	if (current->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)
++	if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)
+ 		return 1;
+ 		
+ 	return sysctl_legacy_va_layout;
+--- ./include/asm-x86_64/processor.h.pp	2005-02-18 23:12:21.000000000 +0200
++++ ./include/asm-x86_64/processor.h	2005-02-18 23:14:41.000000000 +0200
+@@ -79,6 +79,8 @@
+ #define X86_VENDOR_NUM 8
+ #define X86_VENDOR_UNKNOWN 0xff
+ 
++#define HAVE_ARCH_PICK_MMAP_LAYOUT
++
+ #ifdef CONFIG_SMP
+ extern struct cpuinfo_x86 cpu_data[];
+ #define current_cpu_data cpu_data[smp_processor_id()]

Deleted: tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11-rc3.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11-rc4.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11-rc4.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-18 19:36:07 UTC (rev 6042)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-18 19:58:25 UTC (rev 6043)
@@ -45,7 +45,7 @@
 Group: System Environment/Kernel
 License: GPLv2
 Version: %{rpmversion}
-Release: 5gd
+Release: 6jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -75,9 +75,10 @@
 Source25: kernel-%{kversion}-x86_64.config
 Source26: kernel-%{kversion}-x86_64-smp.config
 
-Patch0: patch-2.6.11-rc3.bz2
+Patch0: patch-2.6.11-rc4.bz2
 Patch1: exec-shield-nx-2.6.10-A3.patch
 Patch2: linux-2.6.11-tinysofa-grsec.patch
+Patch3: linux-2.6.11-x86_64.patch
 
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
@@ -201,6 +202,7 @@
 %patch0 -p1
 %patch1 -p1 -b .exec-shield~
 %patch2 -p1 -b .grsec~
+%patch3 -p1 -b .x86_64~
 
 %patch20020 -p1
 
@@ -566,6 +568,10 @@
 
 
 %changelog
+* Fri Feb 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.10-6jh
+- 2.6.11-rc4
+- add a x86_64 patch
+
 * Sun Feb  6 2005 Gerald Dachs <gda at tinysofa dot org> 2.6.10-5gd
 - applied squashfs 2.1-r2
 



From svn at tinysofa.org  Fri Feb 18 20:52:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 15:52:50 -0500 (EST)
Subject: [tinysofa-svn] r6044 -
	tinysofa/releases/1.2/kernel-utils/current/specs
Message-ID: <20050218205250.523B1344635@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 15:52:43 -0500 (Fri, 18 Feb 2005)
New Revision: 6044

Modified:
   tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec
Log:
- create initrddir


Modified: tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec
===================================================================
--- tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec	2005-02-18 19:58:25 UTC (rev 6043)
+++ tinysofa/releases/1.2/kernel-utils/current/specs/kernel-utils.spec	2005-02-18 20:52:43 UTC (rev 6044)
@@ -80,6 +80,7 @@
 mkdir -p %{buildroot}%{_mandir}/man{1,8}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_initrddir}
 
 %ifarch %{ix86}
 cd microcode_ctl-1.06



From svn at tinysofa.org  Fri Feb 18 21:41:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 16:41:34 -0500 (EST)
Subject: [tinysofa-svn] r6045 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050218214134.ED394344630@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 16:41:27 -0500 (Fri, 18 Feb 2005)
New Revision: 6045

Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config
Log:
- build usb hid as a module on x86-64


Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config	2005-02-18 20:52:43 UTC (rev 6044)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config	2005-02-18 21:41:27 UTC (rev 6045)
@@ -1975,7 +1975,7 @@
 #
 # USB Input Devices
 #
-CONFIG_USB_HID=y
+CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config	2005-02-18 20:52:43 UTC (rev 6044)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config	2005-02-18 21:41:27 UTC (rev 6045)
@@ -1984,7 +1984,7 @@
 #
 # USB Input Devices
 #
-CONFIG_USB_HID=y
+CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y



From svn at tinysofa.org  Fri Feb 18 21:48:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 16:48:28 -0500 (EST)
Subject: [tinysofa-svn] r6046 - in tinysofa/releases/1.2/grsecurity/current:
	sources specs
Message-ID: <20050218214828.4D23E344631@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 16:47:48 -0500 (Fri, 18 Feb 2005)
New Revision: 6046

Added:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050218.tar
Removed:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050215.tar
Modified:
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- fix a mistake in previous policy update


Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050215.tar
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050218.tar
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050218.tar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-18 21:41:27 UTC (rev 6045)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-18 21:47:48 UTC (rev 6046)
@@ -1,4 +1,4 @@
-%define policies_date	20050215
+%define policies_date	20050218
 Summary: grsecurity user space utilities and policies
 Name: grsecurity
 Version: 2.1.1



From svn at tinysofa.org  Fri Feb 18 22:22:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 17:22:09 -0500 (EST)
Subject: [tinysofa-svn] r6047 -
	tinysofa/releases/1.2/grsecurity/current/specs
Message-ID: <20050218222209.B4AD534462D@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 17:22:04 -0500 (Fri, 18 Feb 2005)
New Revision: 6047

Modified:
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- supress a message caused by "cd -" in %%post


Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-18 21:47:48 UTC (rev 6046)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-18 22:22:04 UTC (rev 6047)
@@ -86,7 +86,6 @@
 		/usr/bin/find policies roles -type f -name '*.rpmnew' \
 			-exec %{__rm} -f '{}' \;
 	fi
-	cd -
 fi
 exit 0
 



From svn at tinysofa.org  Fri Feb 18 22:22:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Feb 2005 17:22:57 -0500 (EST)
Subject: [tinysofa-svn] r6048 - tinysofa/releases/1.2/bind/current/specs
Message-ID: <20050218222257.D64CC34462E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-18 17:22:52 -0500 (Fri, 18 Feb 2005)
New Revision: 6048

Modified:
   tinysofa/releases/1.2/bind/current/specs/bind.spec
Log:
- don't print messages caused by the rndc key generation


Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec
===================================================================
--- tinysofa/releases/1.2/bind/current/specs/bind.spec	2005-02-18 22:22:04 UTC (rev 6047)
+++ tinysofa/releases/1.2/bind/current/specs/bind.spec	2005-02-18 22:22:52 UTC (rev 6048)
@@ -309,7 +309,7 @@
 		chmod 600 %{jail}%{_sysconfdir}/rndc.key
 		chown named.root %{jail}%{_sysconfdir}/rndc.key
 	else
-		/usr/sbin/rndc-confgen -a -t %{jail} -u named 2>&1 > /dev/null
+		/usr/sbin/rndc-confgen -a -t %{jail} -u named > /dev/null 2>&1
 	fi
 fi
 # -f = is file, it should be a symlink!
@@ -383,7 +383,7 @@
 		chmod 600 %{jail}%{_sysconfdir}/rndc.key
 		chown named.root %{jail}%{_sysconfdir}/rndc.key
 	else
-		/usr/sbin/rndc-confgen -a -t %{jail} -u named
+		/usr/sbin/rndc-confgen -a -t %{jail} -u named > /dev/null 2>&1
 	fi
 fi
 



From svn at tinysofa.org  Sat Feb 19 12:01:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 19 Feb 2005 07:01:51 -0500 (EST)
Subject: [tinysofa-svn] r6049 - in tinysofa/releases/1.2/make/current:
	sources specs
Message-ID: <20050219120151.52E5C344650@minbar.tinysofa.org>

Author: jh
Date: 2005-02-19 07:01:20 -0500 (Sat, 19 Feb 2005)
New Revision: 6049

Added:
   tinysofa/releases/1.2/make/current/sources/make-3.79.1-noclock_gettime.patch
   tinysofa/releases/1.2/make/current/sources/make-3.79.1-siglist.patch
   tinysofa/releases/1.2/make/current/sources/make-3.80-cvs.patch
   tinysofa/releases/1.2/make/current/sources/make-3.80-j8k.patch
   tinysofa/releases/1.2/make/current/sources/make-3.80.tar.bz2
Removed:
   tinysofa/releases/1.2/make/current/sources/make-3.80.tar.gz
Modified:
   tinysofa/releases/1.2/make/current/specs/make.spec
Log:
- update with Fedora patches (hopefully fix use after free bugs)


Added: tinysofa/releases/1.2/make/current/sources/make-3.79.1-noclock_gettime.patch
===================================================================
--- tinysofa/releases/1.2/make/current/sources/make-3.79.1-noclock_gettime.patch	2005-02-18 22:22:52 UTC (rev 6048)
+++ tinysofa/releases/1.2/make/current/sources/make-3.79.1-noclock_gettime.patch	2005-02-19 12:01:20 UTC (rev 6049)
@@ -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/releases/1.2/make/current/sources/make-3.79.1-siglist.patch
===================================================================
--- tinysofa/releases/1.2/make/current/sources/make-3.79.1-siglist.patch	2005-02-18 22:22:52 UTC (rev 6048)
+++ tinysofa/releases/1.2/make/current/sources/make-3.79.1-siglist.patch	2005-02-19 12:01:20 UTC (rev 6049)
@@ -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 <signal.h>
++#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/releases/1.2/make/current/sources/make-3.80-cvs.patch
===================================================================
--- tinysofa/releases/1.2/make/current/sources/make-3.80-cvs.patch	2005-02-18 22:22:52 UTC (rev 6048)
+++ tinysofa/releases/1.2/make/current/sources/make-3.80-cvs.patch	2005-02-19 12:01:20 UTC (rev 6049)
@@ -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/releases/1.2/make/current/sources/make-3.80-j8k.patch
===================================================================
--- tinysofa/releases/1.2/make/current/sources/make-3.80-j8k.patch	2005-02-18 22:22:52 UTC (rev 6048)
+++ tinysofa/releases/1.2/make/current/sources/make-3.80-j8k.patch	2005-02-19 12:01:20 UTC (rev 6049)
@@ -0,0 +1,23 @@
+--- make-3.80/main.c.jj	2002-08-09 21:27:17.000000000 -0400
++++ make-3.80/main.c	2004-12-13 12:48:25.000000000 -0500
+@@ -1549,6 +1549,20 @@ int main (int argc, char ** argv)
+       }
+   }
+ 
++#ifdef PIPE_BUF
++  if (job_slots > PIPE_BUF)
++#elif defined _POSIX_PIPE_BUF
++  if (job_slots > _POSIX_PIPE_BUF)
++#else
++  if (job_slots > 512)
++#endif
++    {
++      error (NILF,
++	     _("More parallel jobs (-jN) than this platform can handle requested."));
++      error (NILF, _("Resetting to single job (-j1) mode."));
++      job_slots = 1;
++    }
++
+   /* If we have >1 slot but no jobserver-fds, then we're a top-level make.
+      Set up the pipe and install the fds option for our children.  */
+ 

Added: tinysofa/releases/1.2/make/current/sources/make-3.80.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/make/current/sources/make-3.80.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/make/current/sources/make-3.80.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/make/current/specs/make.spec
===================================================================
--- tinysofa/releases/1.2/make/current/specs/make.spec	2005-02-18 22:22:52 UTC (rev 6048)
+++ tinysofa/releases/1.2/make/current/specs/make.spec	2005-02-19 12:01:20 UTC (rev 6049)
@@ -1,118 +1,173 @@
 Summary: A GNU tool which simplifies the build process for users.
 Name: make
 Version: 3.80
-Release: 11jh
+Release: 12jh
 License: GPL
 Group: development
-Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: texinfo
-Prereq: htmlinfo
+URL: http://www.gnu.org/software/make/
+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
+Patch4: make-3.80-j8k.patch
+%info_requires
+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.
 
 The GNU make tool should be installed on your system because it is
 commonly used to simplify the process of installing programs.
 
+
 %prep
 %setup -q
+%patch -p1
+#%patch2 -p1
+%patch3 -p0
+%patch4 -p1
 
+
 %build
 %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 || :
+%make
 
+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/
+%makeinstall
 
-pushd $RPM_BUILD_ROOT/%{_prefix}; { 
-  rm -rf ./share/info
-  strip ./bin/make
-  ln -sf make ./bin/gmake
-} ; popd
+pushd ${RPM_BUILD_ROOT}
+  ln -sf make .%{_bindir}/gmake
+  chmod ug-s .%{_bindir}/*
+popd
 
-rm -rf $RPM_BUILD_ROOT/usr/info
+%nuke_info
 
 %find_lang %{name}
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
 %postun
-/usr/sbin/htmlinfo_update.sh
+%info_postun
 
-%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*/*
 
+
 %changelog
-* Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 3.80-10ts
-- current (3.80-10jh) integrated as 3.80-10ts for release 1.1
+* Sat Feb 19 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.80-12jh
+- tinysofa
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.80-9ts
-- current (3.80-8ts) integrated as 3.80-9ts for release 1.0-U1
+* Mon Dec 13 2004 Jakub Jelinek <jakub at redhat.com> 3.80-6
+- refuse -jN where N is bigger than PIPE_BUF (#142691, #17374)
 
-* Tue Dec  9 2003 Erlend Midttun <erlendbm at trustix dot org> 3.80-5tr
-- Rebuilt
+* Thu Oct  7 2004 Jakub Jelinek <jakub at redhat.com> 3.80-5
+- add URL rpm tag (#134799)
 
-* Tue Sep 16 2003 Chr. H. Toldnes <christht at trustix dot com> 3.80-4tr
-- Rebuilt and retagged for release.
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri Sep  5 2003 Goetz Bock <bock at trustix dot org> 3.80-3bg
-- readded html page generated from make.texi
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 3.80-2tr
-- Big rebuild
+* Tue Dec 02 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- add important bug-fixes from make home-page
 
-* Tue May 21 2003 Roland Kruse <rolandk at trustix dot com> 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 Nov 30 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 3.80
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 3.79.1-7em
-- Rebuilt against glibc 2.3.2.
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri Oct 25 2002 Christian H. Toldnes <christht at trustix dot com> 3.79.1-6ct
-- Replaces ugly info2man-hack with cute htmlinfo setup
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Mon Aug 26 2002 Christian H. Toldnes <christht at trustix dot com> 3.79.1-5ct
-- Converted info pages to make_info.1 man page.
+* Sun Dec 29 2002 Tim Powers <timp at redhat.com>
+- fix references to %%install in the changelog so that the package will build
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 3.79.1-4dm
-- rebuild for Trustix Secure Linux 2.0
+* Tue Dec 03 2002 Elliot Lee <sopwith at redhat.com> 3.79.1-15
+- _smp_mflags
+- Fix ppc build (sys_siglist issues in patch2)
 
-* Thu Sep 15 2000 Erlend Midttun <erlendbm at trustix dot com>
-- update to 3.79.1
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Thu May 11 2000 Oystein Viggen <oysteivi at trustix dot com>
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Jakub Jelinek <jakub at redhat.com>
+- Run make check during build
+
+* Thu May 23 2002 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix build with current auto* tools
+
+* Fri Jan 25 2002 Jakub Jelinek <jakub at redhat.com>
+- rebuilt with gcc 3.1
+
+* Fri Jul  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- s/Copyright/License/
+- langify
+- Make sure it isn't setgid if built as root
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Mon Aug  7 2000 Tim Waugh <twaugh at redhat.com>
+- change info-dir entry so that 'info make' works (#15029).
+
+* Tue Aug  1 2000 Jakub Jelinek <jakub at redhat.com>
+- 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 <jbj at redhat.com>
+- add locale files (#14362).
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Sat Jun 24 2000 Preston Brown <pbrown at redhat.com>
+- 3.79.1 bugfix release
+
+* Mon Jun  5 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+
+* Sun May  7 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix build for some odd situations, such as
+  - previously installed make != GNU make
+  - /bin/sh != bash
+
+* Mon Apr 17 2000 Florian La Roche <Florian.LaRoche at redhat.com>
 - update to 3.79
 
-* Fri Jan 28 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Changed man and info paths
+* Thu Feb 24 2000 Cristian Gafton <gafton at redhat.com>
+- add patch from Andreas Jaeger to fix dtype lookups (for glibc 2.1.3
+  builds)
 
+* Mon Feb  7 2000 Jeff Johnson <jbj at redhat.com>
+- compress man page.
+
 * Fri Jan 21 2000 Cristian Gafton <gafton at redhat.com>
-- 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 <jbj at redhat.com>
 - update to 3.78.1.



From svn at tinysofa.org  Sat Feb 19 14:12:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 19 Feb 2005 09:12:36 -0500 (EST)
Subject: [tinysofa-svn] r6050 - in tinysofa/releases/1.2/anaconda/current:
	sources specs
Message-ID: <20050219141236.4F9B83446CB@minbar.tinysofa.org>

Author: jh
Date: 2005-02-19 09:12:26 -0500 (Sat, 19 Feb 2005)
New Revision: 6050

Added:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-wcstubs.patch
Modified:
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- get wcstubs from anaconda 10


Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-wcstubs.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-wcstubs.patch	2005-02-19 12:01:20 UTC (rev 6049)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-wcstubs.patch	2005-02-19 14:12:26 UTC (rev 6050)
@@ -0,0 +1,49 @@
+--- ./loader2/wcstubs.c.wcstubs~	2005-02-19 14:12:51.000000000 +0200
++++ ./loader2/wcstubs.c	2005-02-19 14:12:51.000000000 +0200
+@@ -61,6 +61,46 @@
+     return 0;
+ }
+ 
++#  define __libc_freeres_fn_section \
++  __attribute__ ((section ("__libc_freeres_fn")))
++
++void __libc_freeres_fn_section ___nl_locale_subfreeres (void) {}
++strong_alias (___nl_locale_subfreeres, _nl_locale_subfreeres);
++
++void libc_freeres_fn (void * free_mem) {}
++
++const char *const _nl_category_names[] = {
++    [LC_COLLATE] = "LC_COLLATE",
++    [LC_CTYPE] = "LC_CTYPE",
++    [LC_MONETARY] = "LC_MONETARY",
++    [LC_NUMERIC] = "LC_NUMERIC",
++    [LC_TIME] = "LC_TIME",
++    [LC_MESSAGES] = "LC_MESSAGES",
++    [LC_PAPER] = "LC_PAPER",
++    [LC_NAME] = "LC_NAME",
++    [LC_ADDRESS] = "LC_ADDRESS",
++    [LC_TELEPHONE] = "LC_TELEPHONE",
++    [LC_MEASUREMENT] = "LC_MEASUREMENT",
++    [LC_IDENTIFICATION] = "LC_IDENTIFCATION",
++    [LC_ALL] = "LC_ALL"
++};
++
++const size_t _nl_category_name_sizes[] = {
++    [LC_COLLATE] = sizeof("LC_COLLATE") - 1,
++    [LC_CTYPE] = sizeof("LC_CTYPE") -1,
++    [LC_MONETARY] = sizeof("LC_MONETARY") -1,
++    [LC_NUMERIC] = sizeof("LC_NUMERIC") -1,
++    [LC_TIME] = sizeof("LC_TIME") -1,
++    [LC_MESSAGES] = sizeof("LC_MESSAGES") -1,
++    [LC_PAPER] = sizeof("LC_PAPER") -1,
++    [LC_NAME] = sizeof("LC_NAME") -1,
++    [LC_ADDRESS] = sizeof("LC_ADDRESS") -1,
++    [LC_TELEPHONE] = sizeof("LC_TELEPHONE") -1,
++    [LC_MEASUREMENT] = sizeof("LC_MEASUREMENT") -1,
++    [LC_IDENTIFICATION] = sizeof("LC_IDENTIFCATION") -1,
++    [LC_ALL] = sizeof("LC_ALL")
++};
++
+ /* avoid bringing in glibc's setlocale.o - we want to use our
+    fake setlocale() */
+ typedef pthread_mutex_t __libc_lock_t;

Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-19 12:01:20 UTC (rev 6049)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-19 14:12:26 UTC (rev 6050)
@@ -34,6 +34,7 @@
 Patch17: anaconda-9.1-mdadm.patch
 Patch18: anaconda-9.1-grsecurity.patch
 Patch19: anaconda-9.1-en-only.patch
+Patch20: anaconda-9.1-wcstubs.patch
 # booty patches
 Patch100: booty-0.38-tinysofa.patch
 Patch101: booty-0.38-tinysofa-splash.patch
@@ -97,6 +98,7 @@
 %patch17 -p1 -b .mdadm~
 %patch18 -p1
 %patch19 -p1 -b .en-only~
+%patch20 -p1 -b .wcstubs~
 
 # rhpl and booty use originally python 2.3
 # anaconda uses orginally python 2.2



From svn at tinysofa.org  Sat Feb 19 15:04:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 19 Feb 2005 10:04:32 -0500 (EST)
Subject: [tinysofa-svn] r6051 - tinysofa/releases/1.2/rpm/current/specs
Message-ID: <20050219150432.A2B9D3443D2@minbar.tinysofa.org>

Author: jh
Date: 2005-02-19 10:04:26 -0500 (Sat, 19 Feb 2005)
New Revision: 6051

Modified:
   tinysofa/releases/1.2/rpm/current/specs/rpm.spec
Log:
- add Requires: findutils for rpm-build


Modified: tinysofa/releases/1.2/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/releases/1.2/rpm/current/specs/rpm.spec	2005-02-19 14:12:26 UTC (rev 6050)
+++ tinysofa/releases/1.2/rpm/current/specs/rpm.spec	2005-02-19 15:04:26 UTC (rev 6051)
@@ -88,6 +88,7 @@
 Summary: Scripts and executable programs used to build packages.
 Group: development
 Requires: rpm = %{rpm_version}, patch >= 2.5, file
+Requires: findutils
 Requires: tinysofa-rpm-config
 Provides: rpmbuild(VendorConfig) = 4.1-1
 



From svn at tinysofa.org  Sat Feb 19 15:47:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 19 Feb 2005 10:47:52 -0500 (EST)
Subject: [tinysofa-svn] r6052 -
	tinysofa/releases/1.2/grsecurity/current/specs
Message-ID: <20050219154752.1DB763449AD@minbar.tinysofa.org>

Author: jh
Date: 2005-02-19 10:47:46 -0500 (Sat, 19 Feb 2005)
New Revision: 6052

Modified:
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- handle also .rpmsave files


Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-19 15:04:26 UTC (rev 6051)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-19 15:47:46 UTC (rev 6052)
@@ -72,18 +72,20 @@
 fi
 %service_post -o grsec
 
-# handle .rpmnew files
+# handle .rpmsave and .rpmnew files
 if [ $1 -gt 1 ]; then
 	cd %{_sysconfdir}/grsec || exit 0
 	if [ ! -e rpmnew ]; then
-		%{__mkdir} -m 700 rpmnew
+		%{__mkdir} -m 700 rpmsave
 	fi
 	if [ -d rpmnew ]; then
-		/usr/bin/find policies roles -type f -name '*.rpmnew' \
-			-exec %{__cp} -pf --parents '{}' rpmnew/ \; \
+		/usr/bin/find policies roles -type f \(
+			-name '*.rpmnew' -o -name '*.rpmsave' \) \
+			-exec %{__cp} -pf --parents '{}' rpmsave/ \; \
 			-exec %{__rm} -f '{}' \;
 	else
-		/usr/bin/find policies roles -type f -name '*.rpmnew' \
+		/usr/bin/find policies roles -type f \(
+			-name '*.rpmnew' -o -name '*.rpmsave' \) \
 			-exec %{__rm} -f '{}' \;
 	fi
 fi



From svn at tinysofa.org  Sun Feb 20 08:45:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 03:45:34 -0500 (EST)
Subject: [tinysofa-svn] r6053 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050220084534.BEAA734410E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 03:45:18 -0500 (Sun, 20 Feb 2005)
New Revision: 6053

Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config
Log:
- update x86_64 configs


Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config	2005-02-19 15:47:46 UTC (rev 6052)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64-smp.config	2005-02-20 08:45:18 UTC (rev 6053)
@@ -2,7 +2,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11-rc4
-# Fri Feb 18 22:32:39 2005
+# Sun Feb 20 03:58:22 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -1982,6 +1982,12 @@
 CONFIG_LOGITECH_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
 CONFIG_USB_AIPTEK=m
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config	2005-02-19 15:47:46 UTC (rev 6052)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.10-x86_64.config	2005-02-20 08:45:18 UTC (rev 6053)
@@ -2,7 +2,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11-rc4
-# Fri Feb 18 22:32:43 2005
+# Sun Feb 20 03:58:24 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -1991,6 +1991,12 @@
 CONFIG_LOGITECH_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
 CONFIG_USB_AIPTEK=m
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m



From svn at tinysofa.org  Sun Feb 20 08:48:13 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 03:48:13 -0500 (EST)
Subject: [tinysofa-svn] r6054 - in tinysofa/releases/1.2/lftp/current:
	sources specs
Message-ID: <20050220084813.B007734410E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 03:47:55 -0500 (Sun, 20 Feb 2005)
New Revision: 6054

Added:
   tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13-fix-cxxlink.patch
Modified:
   tinysofa/releases/1.2/lftp/current/specs/lftp.spec
Log:
- add cxxlink patch


Added: tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13-fix-cxxlink.patch
===================================================================
--- tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13-fix-cxxlink.patch	2005-02-20 08:45:18 UTC (rev 6053)
+++ tinysofa/releases/1.2/lftp/current/sources/lftp-3.0.13-fix-cxxlink.patch	2005-02-20 08:47:55 UTC (rev 6054)
@@ -0,0 +1,11 @@
+--- lftp-3.0.13/src/Makefile.in.fix-cxxlink	2004-12-20 05:19:47.000000000 -0500
++++ lftp-3.0.13/src/Makefile.in	2005-01-21 18:20:32.167502000 -0500
+@@ -149,7 +149,7 @@
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \

Modified: tinysofa/releases/1.2/lftp/current/specs/lftp.spec
===================================================================
--- tinysofa/releases/1.2/lftp/current/specs/lftp.spec	2005-02-20 08:45:18 UTC (rev 6053)
+++ tinysofa/releases/1.2/lftp/current/specs/lftp.spec	2005-02-20 08:47:55 UTC (rev 6054)
@@ -6,6 +6,7 @@
 Group: main
 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
+Patch0: lftp-3.0.13-fix-cxxlink.patch
 URL: http://lftp.yar.ru/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel
@@ -21,7 +22,8 @@
 
 
 %prep
-%setup -q  
+%setup -q
+%patch -p1 -b .cxxlink~
 
 
 %build



From svn at tinysofa.org  Sun Feb 20 10:37:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 05:37:40 -0500 (EST)
Subject: [tinysofa-svn] r6055 - tinysofa/releases/1.2/lftp/current/specs
Message-ID: <20050220103740.5CFFF344148@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 05:37:27 -0500 (Sun, 20 Feb 2005)
New Revision: 6055

Modified:
   tinysofa/releases/1.2/lftp/current/specs/lftp.spec
Log:
- work around x86_64 compilation problem


Modified: tinysofa/releases/1.2/lftp/current/specs/lftp.spec
===================================================================
--- tinysofa/releases/1.2/lftp/current/specs/lftp.spec	2005-02-20 08:47:55 UTC (rev 6054)
+++ tinysofa/releases/1.2/lftp/current/specs/lftp.spec	2005-02-20 10:37:27 UTC (rev 6055)
@@ -32,7 +32,12 @@
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 LDFLAGS="-L`pwd`/src/.libs $LDFLAGS -pie"; export LDFLAGS
+# this is broken!
+%ifarch x86_64
+CPPFLAGS="$CPPFLAGS -fPIC"; export CPPFLAGS
+%else
 CPPFLAGS="$CPPFLAGS -fPIE"; export CPPFLAGS
+%endif
 
 %configure --with-modules --disable-static --with-ssl
 %make



From svn at tinysofa.org  Sun Feb 20 11:09:45 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 06:09:45 -0500 (EST)
Subject: [tinysofa-svn] r6056 - in tinysofa/releases/1.2/nfs-utils/current:
	sources specs
Message-ID: <20050220110945.99963344116@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 06:08:50 -0500 (Sun, 20 Feb 2005)
New Revision: 6056

Added:
   tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-idmap-event.patch
   tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-statd-notify-hostname.patch
Modified:
   tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-pie.patch
   tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec
Log:
- work around x86_64 compilation
- add patches:
	nfs-utils-1.0.6-statd-notify-hostname.patch
	nfs-utils-1.0.6-idmap-event.patch


Added: tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-idmap-event.patch
===================================================================
--- tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-idmap-event.patch	2005-02-20 10:37:27 UTC (rev 6055)
+++ tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-idmap-event.patch	2005-02-20 11:08:50 UTC (rev 6056)
@@ -0,0 +1,15 @@
+--- nfs-utils-1.0.6/utils/idmapd/idmapd.c.orig	2004-10-15 08:36:43.000000000 -0400
++++ nfs-utils-1.0.6/utils/idmapd/idmapd.c	2004-12-14 08:51:58.091500944 -0500
+@@ -604,10 +604,8 @@ nfsdreopen()
+ 			if (ic->ic_fd != -1)
+ 				close(ic->ic_fd);
+ 			ic->ic_event.ev_fd = ic->ic_fd = fd;
+-			if ((ic->ic_event.ev_flags & EVLIST_INIT) == 0) {
+-				event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic);
+-				event_add(&ic->ic_event, NULL);
+-			}
++			event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic);
++			event_add(&ic->ic_event, NULL);
+ 		} else {
+ 			warnx("nfsdreopen: Opening '%s' failed: errno %d (%s)", 
+ 				ic->ic_path, errno, strerror(errno));

Modified: tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-pie.patch
===================================================================
--- tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-pie.patch	2005-02-20 10:37:27 UTC (rev 6055)
+++ tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-pie.patch	2005-02-20 11:08:50 UTC (rev 6056)
@@ -1,5 +1,5 @@
---- nfs-utils-1.0.6/support/export/Makefile.pie	2003-09-15 01:29:08.000000000 +0200
-+++ nfs-utils-1.0.6/support/export/Makefile	2004-02-12 16:18:05.178180168 +0100
+--- ./support/export/Makefile.pie	2003-09-15 02:29:08.000000000 +0300
++++ ./support/export/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -14,6 +14,8 @@
  
  include $(TOP)rules.mk
@@ -9,24 +9,24 @@
  $(RPCHDRS) $(RPCSRCS): mount.x
  	$(RM) $(RPCHDRS) $(RPCSRCS)
  	$(RPCGEN) -h -o mount.h $<
---- nfs-utils-1.0.6/support/misc/Makefile.pie	2003-05-30 06:43:39.000000000 +0200
-+++ nfs-utils-1.0.6/support/misc/Makefile	2004-02-12 16:18:05.179180016 +0100
+--- ./support/misc/Makefile.pie	2003-05-30 07:43:39.000000000 +0300
++++ ./support/misc/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -9,3 +9,5 @@
  
  install::
  	@:
 +
 +CFLAGS += -fpie
---- nfs-utils-1.0.6/support/nfs/Makefile.pie	2003-03-26 01:29:08.000000000 +0100
-+++ nfs-utils-1.0.6/support/nfs/Makefile	2004-02-12 16:18:05.180179864 +0100
+--- ./support/nfs/Makefile.pie	2003-03-26 02:29:08.000000000 +0200
++++ ./support/nfs/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -12,3 +12,5 @@
  
  install::
  	@:
 +
 +CFLAGS += -fpie
---- nfs-utils-1.0.6/utils/lockd/Makefile.pie	2000-02-26 07:55:18.000000000 +0100
-+++ nfs-utils-1.0.6/utils/lockd/Makefile	2004-02-12 16:18:05.181179712 +0100
+--- ./utils/lockd/Makefile.pie	2000-02-26 08:55:18.000000000 +0200
++++ ./utils/lockd/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -10,3 +10,6 @@
  MAN8	= lockd
  
@@ -34,8 +34,8 @@
 +
 +CFLAGS += -fpie
 +LDFLAGS += -pie
---- nfs-utils-1.0.6/utils/mountd/Makefile.pie	2003-05-21 08:22:41.000000000 +0200
-+++ nfs-utils-1.0.6/utils/mountd/Makefile	2004-02-12 16:18:05.182179560 +0100
+--- ./utils/mountd/Makefile.pie	2003-05-21 09:22:41.000000000 +0300
++++ ./utils/mountd/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -10,3 +10,6 @@
  MAN8	= mountd
  
@@ -43,8 +43,8 @@
 +
 +CFLAGS += -fpie
 +LDFLAGS += -pie
---- nfs-utils-1.0.6/utils/nfsd/Makefile.pie	2004-02-12 17:07:55.875525064 +0100
-+++ nfs-utils-1.0.6/utils/nfsd/Makefile	2004-02-12 17:08:22.726443104 +0100
+--- ./utils/nfsd/Makefile.pie	2003-07-03 09:09:00.000000000 +0300
++++ ./utils/nfsd/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -10,6 +10,9 @@
  MAN8	= nfsd
  include $(TOP)rules.mk
@@ -55,8 +55,8 @@
  # 
  # all::	nfsd
  # 	@echo "Done."
---- nfs-utils-1.0.6/utils/statd/Makefile.pie	2003-09-15 01:29:39.000000000 +0200
-+++ nfs-utils-1.0.6/utils/statd/Makefile	2004-02-12 16:18:05.183179408 +0100
+--- ./utils/statd/Makefile.pie	2003-09-15 02:29:39.000000000 +0300
++++ ./utils/statd/Makefile	2005-02-20 12:56:25.000000000 +0200
 @@ -37,6 +37,8 @@
  include $(TOP)rules.mk
  
@@ -66,3 +66,14 @@
  
  $(RPCHDRS) $(RPCSRCS):	sm_inter.x
  	$(RM) $(RPCHDRS) $(RPCSRCS)
+--- ./utils/gssd/Makefile.pie	2005-02-20 13:05:18.000000000 +0200
++++ ./utils/gssd/Makefile	2005-02-20 13:06:03.000000000 +0200
+@@ -11,5 +11,8 @@
+ 
+ include $(TOP)rules.mk
+ 
++CFLAGS += -fpie
++LDFLAGS += -pie
++
+ CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I$(TOP)support/rpc/include/ \
+  	-I$(KRBDIR)/include

Added: tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-statd-notify-hostname.patch
===================================================================
--- tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-statd-notify-hostname.patch	2005-02-20 10:37:27 UTC (rev 6055)
+++ tinysofa/releases/1.2/nfs-utils/current/sources/nfs-utils-1.0.6-statd-notify-hostname.patch	2005-02-20 11:08:50 UTC (rev 6056)
@@ -0,0 +1,113 @@
+--- nfs-utils-1.0.6/utils/statd/rmtcall.c.orig	2004-11-24 05:42:13.494353000 -0500
++++ nfs-utils-1.0.6/utils/statd/rmtcall.c	2004-11-24 06:02:37.935145000 -0500
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <netinet/in.h>
++#include <net/if.h>
+ #include <arpa/inet.h>
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_prot.h>
+@@ -34,6 +35,7 @@
+ #include <netdb.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <ifaddrs.h>
+ #include "sm_inter.h"
+ #include "statd.h"
+ #include "notlist.h"
+@@ -73,7 +75,44 @@ statd_get_socket(int port)
+ 
+ 	return sockfd;
+ }
+-
++/*
++ * Using the NL_ADDR(lp), reset (if needed) the hostname
++ * that will be put in the SM_NOTIFY to the hostname
++ * that is associated with the network interface 
++ * that was monitored
++ */
++static void
++reset_my_name(notify_list *lp)
++{
++	struct ifaddrs *ifa = NULL, *ifap;
++	struct in_addr netaddr, tmp;
++	struct sockaddr_in *sin, *nsin;
++	struct hostent *hp;
++
++	netaddr.s_addr = inet_netof(NL_ADDR(lp));
++	if (getifaddrs(&ifa) >= 0) {
++		for (ifap = ifa; ifap != NULL; ifap = ifap->ifa_next) {
++			if (ifap->ifa_addr->sa_family != AF_INET)
++				continue;
++			if (!(ifap->ifa_flags & IFF_UP))
++				continue;
++			sin = (struct sockaddr_in *)ifap->ifa_addr;
++			nsin = (struct sockaddr_in *)ifap->ifa_netmask;
++			tmp.s_addr = sin->sin_addr.s_addr & nsin->sin_addr.s_addr;
++			if (memcmp(&tmp.s_addr, &netaddr.s_addr, sizeof(netaddr.s_addr)))
++				continue;
++			hp = gethostbyaddr((char *)&sin->sin_addr, 
++				sizeof(sin->sin_addr), AF_INET);
++			if (hp == NULL)
++				continue;
++			if (strcmp(NL_MY_NAME(lp), hp->h_name)) {
++				free(NL_MY_NAME(lp));
++				NL_MY_NAME(lp)= strdup(hp->h_name);
++			}
++		}
++	}
++	return;
++}
+ /*
+  * Try to resolve host name for notify/callback request
+  *
+@@ -283,6 +322,7 @@ process_entry(int sockfd, notify_list *l
+ {
+ 	struct sockaddr_in	sin;
+ 	struct status		new_status;
++	stat_chge           new_stat;
+ 	xdrproc_t		func;
+ 	void			*objp;
+ 	u_int32_t		proc, vers, prog;
+@@ -309,9 +349,19 @@ process_entry(int sockfd, notify_list *l
+ 
+ 		/* Use source address for notify replies */
+ 		sin.sin_addr   = lp->addr;
++		/* 
++		 * Unless a static hostname has been defined
++		 * set the NL_MY_NAME(lp) hostname to the 
++		 * one associated with the network interface
++		 */
++		if (!(run_mode & STATIC_HOSTNAME))
++			reset_my_name(lp);
+ 
+ 		func = (xdrproc_t) xdr_stat_chge;
+-		objp = &SM_stat_chge;
++		new_stat.state = MY_STATE;
++		new_stat.mon_name = NL_MY_NAME(lp);
++
++		objp = &new_stat;
+ 		break;
+ 	case NOTIFY_CALLBACK:
+ 		prog = NL_MY_PROG(lp);
+--- nfs-utils-1.0.6/utils/statd/statd.c.orig	2004-11-24 05:42:15.099369000 -0500
++++ nfs-utils-1.0.6/utils/statd/statd.c	2004-11-24 05:52:27.570265000 -0500
+@@ -288,6 +288,7 @@ int main (int argc, char **argv)
+ 			}
+ 			break;
+ 		case 'n':	/* Specify local hostname */
++			run_mode |= STATIC_HOSTNAME;
+ 			MY_NAME = xstrdup(optarg);
+ 			break;
+ 		case 'P':
+--- nfs-utils-1.0.6/utils/statd/statd.h.orig	2004-11-24 05:42:14.899371000 -0500
++++ nfs-utils-1.0.6/utils/statd/statd.h	2004-11-24 05:53:50.516929000 -0500
+@@ -79,6 +79,7 @@ extern int run_mode;
+ /* LH - notify_only mode would be for notifying hosts on an IP alias
+  * that just came back up, for ex, when failing over a HA service to
+  * another host.... */
++#define STATIC_HOSTNAME 8	/* Always use the hostname set by -n */
+ 
+ /*
+  * Program name and version pointers -- See statd.c for the reasoning

Modified: tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec
===================================================================
--- tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec	2005-02-20 10:37:27 UTC (rev 6055)
+++ tinysofa/releases/1.2/nfs-utils/current/specs/nfs-utils.spec	2005-02-20 11:08:50 UTC (rev 6056)
@@ -65,6 +65,8 @@
 Patch57: nfs-utils-1.0.6-idmap-syslog.patch
 Patch58: nfs-utils-1.0.6-idmap.conf.patch
 Patch59: nfs-utils-1.0.6-rquotad-overflow.patch
+Patch60: nfs-utils-1.0.6-statd-notify-hostname.patch
+Patch61: nfs-utils-1.0.6-idmap-event.patch
 
 Patch100: nfs-utils-1.0.6-compile.patch
 Patch150: nfs-utils-1.0.6-pie.patch
@@ -143,6 +145,8 @@
 %patch57 -p1 -b .syslog
 %patch58 -p1 -b .conf
 %patch59 -p1 -b .overflow
+%patch60 -p1 -b .notify
+%patch61 -p1 -b .event
 
 
 # Do the magic to get things to compile
@@ -155,6 +159,10 @@
 %build
 autoconf
 
+%ifarch x86_64
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpic"
+%endif
+
 #
 # Hack to enable netgroups.  If anybody knows the right way to do
 # this, please help yourself.



From svn at tinysofa.org  Sun Feb 20 11:59:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 06:59:47 -0500 (EST)
Subject: [tinysofa-svn] r6058 - tinysofa/releases/1.2/samba/current/specs
Message-ID: <20050220115947.350133440E2@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 06:59:33 -0500 (Sun, 20 Feb 2005)
New Revision: 6058

Modified:
   tinysofa/releases/1.2/samba/current/specs/samba.spec
Log:
- add -fpie to CFLAGS


Modified: tinysofa/releases/1.2/samba/current/specs/samba.spec
===================================================================
--- tinysofa/releases/1.2/samba/current/specs/samba.spec	2005-02-20 11:15:20 UTC (rev 6057)
+++ tinysofa/releases/1.2/samba/current/specs/samba.spec	2005-02-20 11:59:33 UTC (rev 6058)
@@ -55,16 +55,17 @@
 %define __perl_requires %{nil}
 
 %description
-Samba is the protocol by which a lot of PC-related machines share
-files, printers, and other information (such as lists of available
-files and printers). The Windows NT, OS/2, and Linux operating systems
-support this natively, and add-on packages can enable the same thing
-for DOS, Windows, VMS, UNIX of all kinds, MVS, and more. This package
-provides an SMB server that can be used to provide network services to
-SMB (sometimes called "Lan Manager") clients. Samba uses NetBIOS over
-TCP/IP (NetBT) protocols and does NOT need the NetBEUI (Microsoft Raw
-NetBIOS frame) protocol.
 
+Samba is the suite of programs by which a lot of PC-related machines
+share files, printers, and other information (such as lists of
+available files and printers). The Windows NT, OS/2, and Linux
+operating systems support this natively, and add-on packages can
+enable the same thing for DOS, Windows, VMS, UNIX of all kinds, MVS,
+and more. This package provides an SMB server that can be used to
+provide network services to SMB (sometimes called "Lan Manager")
+clients. Samba uses NetBIOS over TCP/IP (NetBT) protocols and does NOT
+need the NetBEUI (Microsoft Raw NetBIOS frame) protocol.
+
 %package client
 Summary: Samba (SMB) client programs.
 Group: extra
@@ -150,7 +151,7 @@
 autoconf
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
-CFLAGS="-D_GNU_SOURCE" %configure \
+CFLAGS="-D_GNU_SOURCE -fpie" %configure \
 	--with-acl-support \
 	--with-automount \
 	--with-libsmbclient \



From svn at tinysofa.org  Sun Feb 20 12:06:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 07:06:40 -0500 (EST)
Subject: [tinysofa-svn] r6059 - in tinysofa/releases/1.2/vim/current:
	sources specs
Message-ID: <20050220120640.55EE5344107@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 07:06:18 -0500 (Sun, 20 Feb 2005)
New Revision: 6059

Added:
   tinysofa/releases/1.2/vim/current/sources/vim-6.3.058-062.patch
Modified:
   tinysofa/releases/1.2/vim/current/specs/vim.spec
Log:
- update to patchlevel 62


Added: tinysofa/releases/1.2/vim/current/sources/vim-6.3.058-062.patch
===================================================================
--- tinysofa/releases/1.2/vim/current/sources/vim-6.3.058-062.patch	2005-02-20 11:59:33 UTC (rev 6058)
+++ tinysofa/releases/1.2/vim/current/sources/vim-6.3.058-062.patch	2005-02-20 12:06:18 UTC (rev 6059)
@@ -0,0 +1,410 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.058
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.058
+Problem:    When 'foldcolumn' is equal to the window width and 'wrap' is on
+	    Vim may crash.  Disabling the vertical split feature breaks
+	    compiling.  (Peter Winters)
+Solution:   Check for zero room for wrapped text.  Make compiling without
+	    vertical splits possible.
+Files:	    src/move.c, src/quickfix.c, src/screen.c, src/netbeans.c
+
+
+*** ../vim-6.3.057/src/move.c	Mon Dec  6 11:51:12 2004
+--- src/move.c	Thu Jan 13 19:16:32 2005
+***************
+*** 871,880 ****
+  
+  	/* long line wrapping, adjust curwin->w_wrow */
+  	if (curwin->w_p_wrap && col >= (colnr_T)W_WIDTH(curwin)
+! #ifdef FEAT_VERTSPLIT
+! 		&& curwin->w_width != 0
+! #endif
+! 		)
+  	{
+  	    col -= W_WIDTH(curwin);
+  	    col = col % (W_WIDTH(curwin) - off + curwin_col_off2());
+--- 871,877 ----
+  
+  	/* long line wrapping, adjust curwin->w_wrow */
+  	if (curwin->w_p_wrap && col >= (colnr_T)W_WIDTH(curwin)
+! 		&& W_WIDTH(curwin) - off + curwin_col_off2() > 0)
+  	{
+  	    col -= W_WIDTH(curwin);
+  	    col = col % (W_WIDTH(curwin) - off + curwin_col_off2());
+*** ../vim-6.3.057/src/quickfix.c	Wed Jun  9 14:56:26 2004
+--- src/quickfix.c	Thu Jan 13 19:19:21 2005
+***************
+*** 1680,1687 ****
+--- 1680,1689 ----
+  	else if (buf != curbuf)
+  	    set_curbuf(buf, DOBUF_GOTO);
+  
++ #ifdef FEAT_VERTSPLIT
+  	/* Only set the height when there is no window to the side. */
+  	if (curwin->w_width == Columns)
++ #endif
+  	    win_setheight(height);
+  	curwin->w_p_wfh = TRUE;	    /* set 'winfixheight' */
+  	if (win_valid(win))
+*** ../vim-6.3.057/src/screen.c	Thu Dec 16 12:48:12 2004
+--- src/screen.c	Thu Jan 13 19:21:40 2005
+***************
+*** 1906,1913 ****
+  	if (n > 0)
+  	{
+  	    /* draw the fold column at the right */
+! 	    if (n > wp->w_width)
+! 		n = wp->w_width;
+  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
+  		    W_ENDCOL(wp) - n, (int)W_ENDCOL(wp),
+  		    ' ', ' ', hl_attr(HLF_FC));
+--- 1906,1913 ----
+  	if (n > 0)
+  	{
+  	    /* draw the fold column at the right */
+! 	    if (n > W_WIDTH(wp))
+! 		n = W_WIDTH(wp);
+  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
+  		    W_ENDCOL(wp) - n, (int)W_ENDCOL(wp),
+  		    ' ', ' ', hl_attr(HLF_FC));
+***************
+*** 1919,1926 ****
+  	    int nn = n + 2;
+  
+  	    /* draw the sign column left of the fold column */
+! 	    if (nn > wp->w_width)
+! 		nn = wp->w_width;
+  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
+  		    W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n,
+  		    ' ', ' ', hl_attr(HLF_SC));
+--- 1919,1926 ----
+  	    int nn = n + 2;
+  
+  	    /* draw the sign column left of the fold column */
+! 	    if (nn > W_WIDTH(wp))
+! 		nn = W_WIDTH(wp);
+  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
+  		    W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n,
+  		    ' ', ' ', hl_attr(HLF_SC));
+*** ../vim-6.3.057/src/netbeans.c	Wed Jun  9 14:56:26 2004
+--- src/netbeans.c	Thu Jan 13 19:22:30 2005
+***************
+*** 2693,2699 ****
+  
+      if (bufno >= 0 && curwin != NULL && curwin->w_buffer == curbuf)
+      {
+! 	int col = mouse_col - curwin->w_wincol - (curwin->w_p_nu ? 9 : 1);
+  	long off = pos2off(curbuf, &curwin->w_cursor);
+  
+  	/* sync the cursor position */
+--- 2693,2699 ----
+  
+      if (bufno >= 0 && curwin != NULL && curwin->w_buffer == curbuf)
+      {
+! 	int col = mouse_col - W_WINCOL(curwin) - (curwin->w_p_nu ? 9 : 1);
+  	long off = pos2off(curbuf, &curwin->w_cursor);
+  
+  	/* sync the cursor position */
+*** ../vim-6.3.057/src/version.c	Thu Jan 13 17:38:30 2005
+--- src/version.c	Tue Jan 18 10:49:55 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     58,
+  /**/
+
+-- 
+TALL KNIGHT:   Firstly.  You must get us another shrubbery!
+OTHER KNIGHTS: More shrubberies!  More shrubberies for the ex-Knights of Ni!
+ARTHUR:        Not another shrubbery -
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.059
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.059
+Problem:    Crash when expanding an ":edit" command containing several spaces
+	    with the shell. (Brian Hirt)
+Solution:   Allocate enough space for the quotes.
+Files:	    src/os_unix.c
+
+
+*** ../vim-6.3.058/src/os_unix.c	Sat Sep 18 20:28:07 2004
+--- src/os_unix.c	Sat Jan 29 15:07:53 2005
+***************
+*** 4735,4742 ****
+  
+      /* "unset nonomatch; print -N >" plus two is 29 */
+      len = STRLEN(tempname) + 29;
+!     for (i = 0; i < num_pat; ++i)	/* count the length of the patterns */
+  	len += STRLEN(pat[i]) + 3;	/* add space and two quotes */
+      command = alloc(len);
+      if (command == NULL)
+      {
+--- 4735,4766 ----
+  
+      /* "unset nonomatch; print -N >" plus two is 29 */
+      len = STRLEN(tempname) + 29;
+!     for (i = 0; i < num_pat; ++i)
+!     {
+! 	/* Count the length of the patterns in the same way as they are put in
+! 	 * "command" below. */
+! #ifdef USE_SYSTEM
+  	len += STRLEN(pat[i]) + 3;	/* add space and two quotes */
++ #else
++ 	++len;				/* add space */
++ 	for (j = 0; pat[i][j] != NUL; )
++ 	    if (vim_strchr((char_u *)" '", pat[i][j]) != NULL)
++ 	    {
++ 		len += 2;		/* add two quotes */
++ 		while (pat[i][j] != NUL
++ 			&& vim_strchr((char_u *)" '", pat[i][j]) != NULL)
++ 		{
++ 		    ++len;
++ 		    ++j;
++ 		}
++ 	    }
++ 	    else
++ 	    {
++ 		++len;
++ 		++j;
++ 	    }
++ #endif
++     }
+      command = alloc(len);
+      if (command == NULL)
+      {
+*** ../vim-6.3.058/src/version.c	Tue Jan 18 10:53:53 2005
+--- src/version.c	Sat Jan 29 16:11:00 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     59,
+  /**/
+
+-- 
+The budget process was invented by an alien race of sadistic beings who
+resemble large cats.
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.060
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.060
+Problem:    Using CTRL-R CTRL-O in Insert mode with an invalid register name
+	    still causes something to be inserted.
+Solution:   Check the register name for being valid.
+Files:	    src/edit.c
+
+
+*** ../vim-6.3.059/src/edit.c	Wed Jan  5 11:17:36 2005
+--- src/edit.c	Thu Jan 27 10:33:51 2005
+***************
+*** 5933,5940 ****
+  	    im_set_active(TRUE);
+  #endif
+      }
+!     if (regname == NUL)
+  	need_redraw = TRUE;	/* remove the '"' */
+      else
+      {
+  #endif
+--- 5933,5943 ----
+  	    im_set_active(TRUE);
+  #endif
+      }
+!     if (regname == NUL || !valid_yank_reg(regname, FALSE))
+!     {
+! 	vim_beep();
+  	need_redraw = TRUE;	/* remove the '"' */
++     }
+      else
+      {
+  #endif
+*** ../vim-6.3.059/src/version.c	Sat Jan 29 16:14:42 2005
+--- src/version.c	Sat Jan 29 16:18:08 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     60,
+  /**/
+
+-- 
+Engineers will go without food and hygiene for days to solve a problem.
+(Other times just because they forgot.)
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.061
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.061
+Problem:    When editing a utf-8 file in an utf-8 xterm and there is a
+	    multi-byte character in the last column, displaying is messed up.
+	    (Jo?l Rio)
+Solution:   Check for a multi-byte character, not a multi-column character.
+Files:	    src/screen.c
+
+
+*** ../vim-6.3.060/src/screen.c	Tue Jan 18 10:53:53 2005
+--- src/screen.c	Wed Jan 19 11:03:00 2005
+***************
+*** 4169,4176 ****
+  #ifdef FEAT_MBYTE
+  		    /* When there is a multi-byte character, just output a
+  		     * space to keep it simple. */
+! 		    if (has_mbyte && mb_off2cells(LineOffset[screen_row - 1]
+! 						+ (unsigned)Columns - 1) != 1)
+  			out_char(' ');
+  		    else
+  #endif
+--- 4169,4176 ----
+  #ifdef FEAT_MBYTE
+  		    /* When there is a multi-byte character, just output a
+  		     * space to keep it simple. */
+! 		    if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[
+! 					screen_row - 1] + (Columns - 1)]) > 1)
+  			out_char(' ');
+  		    else
+  #endif
+*** ../vim-6.3.060/src/version.c	Sat Jan 29 16:19:09 2005
+--- src/version.c	Sat Jan 29 16:25:13 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     61,
+  /**/
+
+-- 
+Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
+engineering at the Technical University of Delft and graduated in 1985 on a
+multi-processor Unix architecture."
+Response by "dimator": Could the school not afford a proper stage for the
+ceremony?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.062
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.062
+Problem:    ":normal! gQ" hangs.
+Solution:   Quit getcmdline() and do_exmode() when out of typeahead.
+Files:	    src/ex_getln.c, src/ex_docmd.c
+
+
+*** ../vim-6.3.049/src/ex_getln.c	Thu Jan 13 16:25:02 2005
+--- src/ex_getln.c	Sun Feb 13 20:35:24 2005
+***************
+*** 997,1004 ****
+  
+  	case ESC:	/* get here if p_wc != ESC or when ESC typed twice */
+  	case Ctrl_C:
+! 		/* In exmode it doesn't make sense to return. */
+! 		if (exmode_active)
+  		    goto cmdline_not_changed;
+  
+  		gotesc = TRUE;		/* will free ccline.cmdbuff after
+--- 997,1009 ----
+  
+  	case ESC:	/* get here if p_wc != ESC or when ESC typed twice */
+  	case Ctrl_C:
+! 		/* In exmode it doesn't make sense to return. Except when
+! 		 * ":normal" runs out of characters. */
+! 		if (exmode_active
+! #ifdef FEAT_EX_EXTRA
+! 			&& (ex_normal_busy == 0 || typebuf.tb_len > 0)
+! #endif
+! 		   )
+  		    goto cmdline_not_changed;
+  
+  		gotesc = TRUE;		/* will free ccline.cmdbuff after
+*** ../vim-6.3.049/src/ex_docmd.c	Sun Dec  5 16:18:46 2004
+--- src/ex_docmd.c	Sun Feb 13 20:39:37 2005
+***************
+*** 525,530 ****
+--- 525,538 ----
+      MSG(_("Entering Ex mode.  Type \"visual\" to go to Normal mode."));
+      while (exmode_active)
+      {
++ #ifdef FEAT_EX_EXTRA
++ 	/* Check for a ":normal" command and no more characters left. */
++ 	if (ex_normal_busy > 0 && typebuf.tb_len == 0)
++ 	{
++ 	    exmode_active = FALSE;
++ 	    break;
++ 	}
++ #endif
+  	msg_scroll = TRUE;
+  	need_wait_return = FALSE;
+  	ex_pressedreturn = FALSE;
+*** ../vim-6.3.049/src/version.c	Sat Jan 29 16:25:36 2005
+--- src/version.c	Sun Feb 13 20:45:33 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     62,
+  /**/
+
+-- 
+I AM THANKFUL...
+...for the taxes that I pay because it means that I am employed.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

Modified: tinysofa/releases/1.2/vim/current/specs/vim.spec
===================================================================
--- tinysofa/releases/1.2/vim/current/specs/vim.spec	2005-02-20 11:59:33 UTC (rev 6058)
+++ tinysofa/releases/1.2/vim/current/specs/vim.spec	2005-02-20 12:06:18 UTC (rev 6059)
@@ -1,7 +1,7 @@
 Summary: The VIM editor.
 Name: vim
 %define srcversion 6.3
-%define patchlevel 57
+%define patchlevel 62
 %define shortname vim63
 Version: %srcversion.%patchlevel
 Release: 2jh
@@ -10,6 +10,7 @@
 Source0: ftp://ftp.nl.vim.org/pub/vim/unix/%{name}-%{srcversion}.tar.bz2
 Source1: vimrc
 Patch1: vim-6.3.001-057.patch
+Patch2: vim-6.3.058-062.patch
 Patch8: vim-6.3-tmpfile.patch
 Patch1000: xxd-locale.patch
 Requires: gawk
@@ -81,6 +82,7 @@
 %prep
 %setup -q -n %{shortname}
 %patch1 -p0
+%patch2 -p0
 
 %patch8 -p1
 
@@ -190,6 +192,9 @@
 
 
 %changelog
+* Sun Feb 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 6.3.62-1jh
+- upate to 6.3.62
+
 * Sat Jan 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 6.3.57-1jh
 - update to 6.3.57
 - put tutorial to doc subpackage



From svn at tinysofa.org  Sun Feb 20 22:24:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 20 Feb 2005 17:24:08 -0500 (EST)
Subject: [tinysofa-svn] r6061 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050220222408.AEDBF344476@minbar.tinysofa.org>

Author: jh
Date: 2005-02-20 17:24:02 -0500 (Sun, 20 Feb 2005)
New Revision: 6061

Modified:
   tinysofa/releases/1.2/kernel/current/sources/linux-2.6.9-tinysofa-grsec.patch
Log:
- fix kcore compilation


Modified: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.9-tinysofa-grsec.patch
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/linux-2.6.9-tinysofa-grsec.patch	2005-02-20 20:18:49 UTC (rev 6060)
+++ tinysofa/releases/1.2/kernel/current/sources/linux-2.6.9-tinysofa-grsec.patch	2005-02-20 22:24:02 UTC (rev 6061)
@@ -1139,8 +1139,8 @@
 @@ -810,6 +810,7 @@
  config PROC_KCORE
  	bool
++	depends on !GRKERNSEC_PROC_ADD
  	default y if !ARM
-+	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
  
  config SYSFS
  	bool "sysfs file system support" if EMBEDDED
@@ -14644,3 +14644,14 @@
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
  EXPORT_SYMBOL(security_ops);
+--- linux-2.6.9/include/linux/proc_fs.h.grsec~	2005-02-21 00:03:10.000000000 +0200
++++ linux-2.6.9/include/linux/proc_fs.h	2005-02-21 00:03:56.000000000 +0200
+@@ -226,7 +226,7 @@
+ 
+ #endif /* CONFIG_PROC_FS */
+ 
+-#if !defined(CONFIG_PROC_FS)
++#if !defined(CONFIG_PROC_FS) || !defined(CONFIG_PROC_KCORE)
+ static inline void kclist_add(struct kcore_list *new, void *addr, size_t size)
+ {
+ }



From svn at tinysofa.org  Mon Feb 21 06:53:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 01:53:29 -0500 (EST)
Subject: [tinysofa-svn] r6063 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050221065329.15A07344A99@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 01:53:22 -0500 (Mon, 21 Feb 2005)
New Revision: 6063

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- disable kmod-provides

Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 05:22:24 UTC (rev 6062)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 06:53:22 UTC (rev 6063)
@@ -159,7 +159,8 @@
 # (we used to just turn off AutoReqProv on all packages)
 #
 %define _use_internal_dependency_generator 0
-%define __find_provides /usr/lib/rpm/redhat/find-kmod-provides.sh
+# disable this as long as we don't have it - JH
+###%define __find_provides /usr/lib/rpm/redhat/find-kmod-provides.sh
 %define __find_requires %{nil}
 
 Name: kernel



From svn at tinysofa.org  Mon Feb 21 11:19:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 06:19:26 -0500 (EST)
Subject: [tinysofa-svn] r6064 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050221111926.7398134456B@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 06:19:18 -0500 (Mon, 21 Feb 2005)
New Revision: 6064

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- spec tweaks


Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 06:53:22 UTC (rev 6063)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 11:19:18 UTC (rev 6064)
@@ -160,7 +160,7 @@
 #
 %define _use_internal_dependency_generator 0
 # disable this as long as we don't have it - JH
-###%define __find_provides /usr/lib/rpm/redhat/find-kmod-provides.sh
+###define __find_provides /usr/lib/rpm/redhat/find-kmod-provides.sh
 %define __find_requires %{nil}
 
 Name: kernel
@@ -1621,8 +1621,6 @@
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}
-/boot/System.map-%{KVERREL}
-/boot/config-%{KVERREL}
 %dir /lib/modules/%{KVERREL}
 /lib/modules/%{KVERREL}/kernel
 %if %{kabi}
@@ -1640,8 +1638,6 @@
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}smp
-/boot/System.map-%{KVERREL}smp
-/boot/config-%{KVERREL}smp
 %dir /lib/modules/%{KVERREL}smp
 /lib/modules/%{KVERREL}smp/kernel
 %if %{kabi}
@@ -1659,8 +1655,6 @@
 %files hugemem
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}hugemem
-/boot/System.map-%{KVERREL}hugemem
-/boot/config-%{KVERREL}hugemem
 %dir /lib/modules/%{KVERREL}hugemem
 /lib/modules/%{KVERREL}hugemem/kernel
 %if %{kabi}
@@ -1689,7 +1683,9 @@
 /usr/share/doc/kernel-doc-%{kversion}/Documentation/*
 %endif
 
+%exclude /usr/lib/debug
 
+
 %changelog
 * Sun Feb 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.9-1jh
 - switch to rhel4 branch



From svn at tinysofa.org  Mon Feb 21 13:48:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 08:48:59 -0500 (EST)
Subject: [tinysofa-svn] r6065 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050221134859.045493443A5@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 08:48:49 -0500 (Mon, 21 Feb 2005)
New Revision: 6065

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- re-add drbd building


Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 11:19:18 UTC (rev 6064)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 13:48:49 UTC (rev 6065)
@@ -1440,6 +1440,16 @@
     cd .. 
 
     #
+    # build drbd
+    #
+    pushd ../drbd-%{drbd_version}
+    make SUBDIRS=drbd KDIR=$RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ clean
+    make SUBDIRS=drbd KDIR=$RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+
+    install -m 744 drbd/drbd.ko $RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel/drivers/block/
+    popd
+
+    #
     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
     #
     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer



From svn at tinysofa.org  Mon Feb 21 15:36:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 10:36:07 -0500 (EST)
Subject: [tinysofa-svn] r6066 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050221153607.974A634465C@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 10:36:00 -0500 (Mon, 21 Feb 2005)
New Revision: 6066

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- update configs
- change initrd requirement


Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 13:48:49 UTC (rev 6065)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 15:36:00 UTC (rev 6066)
@@ -150,7 +150,7 @@
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 4.1.15
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 5.83, mkinitrd
 
 #
 # don't use RPM's internal dependency generator, instead



From svn at tinysofa.org  Mon Feb 21 15:41:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 10:41:46 -0500 (EST)
Subject: [tinysofa-svn] r6067 - in tinysofa/releases/1.2/libxml2/current:
	sources specs
Message-ID: <20050221154146.EF9D534465C@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 10:40:20 -0500 (Mon, 21 Feb 2005)
New Revision: 6067

Added:
   tinysofa/releases/1.2/libxml2/current/sources/libxml2-2.6.17.tar.gz
Removed:
   tinysofa/releases/1.2/libxml2/current/sources/libxml2-2.6.15.tar.gz
Modified:
   tinysofa/releases/1.2/libxml2/current/specs/libxml2.spec
Log:
- 2.6.17

Deleted: tinysofa/releases/1.2/libxml2/current/sources/libxml2-2.6.15.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/libxml2/current/sources/libxml2-2.6.17.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/libxml2/current/sources/libxml2-2.6.17.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/libxml2/current/specs/libxml2.spec
===================================================================
--- tinysofa/releases/1.2/libxml2/current/specs/libxml2.spec	2005-02-21 15:36:00 UTC (rev 6066)
+++ tinysofa/releases/1.2/libxml2/current/specs/libxml2.spec	2005-02-21 15:40:20 UTC (rev 6067)
@@ -1,12 +1,13 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.15
-Release: 2jh
+Version: 2.6.17
+Release: 1jh
 License: MIT
 Group: main
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python python-devel libtool libstdc++-devel gcc-c++
+BuildRequires: zlib-devel
 URL: http://xmlsoft.org/
 
 %description
@@ -42,7 +43,7 @@
 Summary: Python bindings for the libxml2 library
 Group: extra
 Requires: libxml2 = %{version}-%{release}
-Requires: python
+%py_requires
 
 %description python
 The libxml2-python package contains a module that permits applications
@@ -90,11 +91,10 @@
 
 %files devel
 %defattr(-, root, root)
-
 %doc %{_mandir}/man1/xml2-config.1*
-%doc AUTHORS ChangeLog 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
@@ -104,10 +104,9 @@
 %{_bindir}/xml2-config
 %{_datadir}/aclocal/libxml.m4
 %{_libdir}/pkgconfig/libxml-2.0.pc
+
 %files python
 %defattr(-, root, root)
-
-%doc AUTHORS ChangeLog NEWS README Copyright
 %{_libdir}/python*/site-packages/libxml2.py
 %{_libdir}/python*/site-packages/drv_libxml2.py
 %{_libdir}/python*/site-packages/libxml2mod*
@@ -119,6 +118,9 @@
 
 
 %changelog
+* Mon Feb 21 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.17-1jh
+- 2.6.17
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 2.6.15-1ts
 - current (2.6.15-1jh) integrated as 2.6.15-1ts for release 1.1-U3
 



From svn at tinysofa.org  Mon Feb 21 15:42:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 10:42:22 -0500 (EST)
Subject: [tinysofa-svn] r6068 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050221154222.0D4BD344511@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 10:42:11 -0500 (Mon, 21 Feb 2005)
New Revision: 6068

Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config
Log:
- update configs to exclude non-working modules


Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 15:40:20 UTC (rev 6067)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 15:42:11 UTC (rev 6068)
@@ -1873,9 +1873,8 @@
 #
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_SP887X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/sc_main.mc"
-# CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_SP887X is not set
+ CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m
@@ -1884,8 +1883,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA1004X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/tda1004x.bin"
+# CONFIG_DVB_TDA1004 is not set
 CONFIG_DVB_NXT6000=m
 
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 15:40:20 UTC (rev 6067)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 15:42:11 UTC (rev 6068)
@@ -1873,9 +1873,8 @@
 #
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_SP887X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/sc_main.mc"
-# CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_SP887X is not set
+ CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m
@@ -1884,8 +1883,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA1004X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/tda1004x.bin"
+# CONFIG_DVB_TDA1004 is not set
 CONFIG_DVB_NXT6000=m
 
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config	2005-02-21 15:40:20 UTC (rev 6067)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config	2005-02-21 15:42:11 UTC (rev 6068)
@@ -1622,9 +1622,8 @@
 #
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_SP887X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/sc_main.mc"
-# CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_SP887X is not set
+ CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m
@@ -1633,8 +1632,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA1004X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/tda1004x.bin"
+# CONFIG_DVB_TDA1004 is not set
 CONFIG_DVB_NXT6000=m
 
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config	2005-02-21 15:40:20 UTC (rev 6067)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config	2005-02-21 15:42:11 UTC (rev 6068)
@@ -1640,9 +1640,8 @@
 #
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_SP887X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/sc_main.mc"
-# CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_SP887X is not set
+ CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m
@@ -1651,8 +1650,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA1004X_FIRMWARE_FILE="/usr/lib/hotplug/firmware/tda1004x.bin"
+# CONFIG_DVB_TDA1004 is not set
 CONFIG_DVB_NXT6000=m
 
 #



From svn at tinysofa.org  Mon Feb 21 16:21:11 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 11:21:11 -0500 (EST)
Subject: [tinysofa-svn] r6069 - in tinysofa/releases/1.2/bind/current:
	sources specs
Message-ID: <20050221162111.279C4344674@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 11:19:31 -0500 (Mon, 21 Feb 2005)
New Revision: 6069

Added:
   tinysofa/releases/1.2/bind/current/sources/bind-9.3.1rc1.tar.gz
Removed:
   tinysofa/releases/1.2/bind/current/sources/bind-9.3.0.tar.gz
Modified:
   tinysofa/releases/1.2/bind/current/specs/bind.spec
Log:
- 9.3.1rc1

Deleted: tinysofa/releases/1.2/bind/current/sources/bind-9.3.0.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1rc1.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1rc1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec
===================================================================
--- tinysofa/releases/1.2/bind/current/specs/bind.spec	2005-02-21 15:42:11 UTC (rev 6068)
+++ tinysofa/releases/1.2/bind/current/specs/bind.spec	2005-02-21 16:19:31 UTC (rev 6069)
@@ -1,8 +1,8 @@
 %define jail /var/lib/named
 
 Name: bind
-Version: 9.3.0
-Release: 1jh
+Version: 9.3.1
+Release: 0.rc1.1jh
 Epoch: 0
 Summary: A chrooted DNS (Domain Name System) server
 Summary(pt_BR): BIND - Servidor de nomes DNS chrooted
@@ -10,7 +10,7 @@
 Group: main
 License: BSD Like
 URL: http://www.isc.org/bind.html
-Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}rc1.tar.gz
 #Source1: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz.asc
 Source2: named.conf.non-root.example
 Source3: named.sysconfig
@@ -168,14 +168,17 @@
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-9.3.1rc1
 %patch -p1 -b .key
 %patch1 -p1 -b .varrun
 %patch2 -p1 -b .SO_BSDCOMPAT
 %patch3 -p1 -b .pie
 %patch4 -p1 -b .missing-dnssec-tools
 
+# install some tips
+cp %{SOURCE2} .
 
+
 %build
 libtoolize --copy --force
 aclocal
@@ -201,9 +204,6 @@
 install -m 644 bin/*/*.8 %{buildroot}%{_mandir}/man8/
 install -m 644 lib/lwres/man/*.3 %{buildroot}%{_mandir}/man3/
 
-# 9.2.4 and 9.3.0 installs named.conf.5 to wrong location
-mv %{buildroot}%{_mandir}/man8/named.conf.5 %{buildroot}%{_mandir}/man5
-
 # - compress some documentation, do not fail if there are
 #   no *.txt files (like when rpm -ba --without build)
 bzip2 -9 doc/rfc/*.txt || :
@@ -222,9 +222,6 @@
 #mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 #install -m 644 %{_sourcedir}/named.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/named
 
-# install some tips
-install %{_sourcedir}/named.conf.non-root.example %{_builddir}/%{name}-%{version}/
-
 # install sysconfig
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644  %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/named
@@ -490,6 +487,9 @@
 
 
 %changelog
+* Mon Feb 21 2005 Jaakko Heinonen <jh at tinysofa dot org> 9.3.1-0.rc1.1jh
+- 9.3.1rc1
+
 * Mon Jan 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 9.3.0-1jh
 - 9.3.0
 - run ldconfig on -libs postun



From svn at tinysofa.org  Mon Feb 21 16:40:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 11:40:05 -0500 (EST)
Subject: [tinysofa-svn] r6070 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050221164005.53C9C344648@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 11:39:39 -0500 (Mon, 21 Feb 2005)
New Revision: 6070

Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config
Log:
- correct typos


Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 16:19:31 UTC (rev 6069)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 16:39:39 UTC (rev 6070)
@@ -1874,7 +1874,7 @@
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
- CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 16:19:31 UTC (rev 6069)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 16:39:39 UTC (rev 6070)
@@ -1874,7 +1874,7 @@
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
- CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config	2005-02-21 16:19:31 UTC (rev 6069)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config	2005-02-21 16:39:39 UTC (rev 6070)
@@ -1623,7 +1623,7 @@
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
- CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config	2005-02-21 16:19:31 UTC (rev 6069)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config	2005-02-21 16:39:39 UTC (rev 6070)
@@ -1641,7 +1641,7 @@
 # CONFIG_DVB_TWINHAN_DST is not set
 CONFIG_DVB_STV0299=m
 # CONFIG_DVB_SP887X is not set
- CONFIG_DVB_ALPS_TDLB7 is not set
+# CONFIG_DVB_ALPS_TDLB7 is not set
 # CONFIG_DVB_ALPS_TDMB7 is not set
 CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_CX24110=m



From svn at tinysofa.org  Mon Feb 21 17:25:37 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 12:25:37 -0500 (EST)
Subject: [tinysofa-svn] r6071 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050221172537.89A0B344A54@minbar.tinysofa.org>

Author: jh
Date: 2005-02-21 12:24:25 -0500 (Mon, 21 Feb 2005)
New Revision: 6071

Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config
Log:
- typo fixes again


Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 16:39:39 UTC (rev 6070)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 17:24:25 UTC (rev 6071)
@@ -2,7 +2,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.9-ac11
-# Sun Feb 20 22:03:20 2005
+# Mon Feb 21 19:21:54 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -1883,7 +1883,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-# CONFIG_DVB_TDA1004 is not set
+# CONFIG_DVB_TDA1004X is not set
 CONFIG_DVB_NXT6000=m
 
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 16:39:39 UTC (rev 6070)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 17:24:25 UTC (rev 6071)
@@ -2,7 +2,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.9-ac11
-# Sun Feb 20 21:59:09 2005
+# Mon Feb 21 19:21:45 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -1883,7 +1883,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-# CONFIG_DVB_TDA1004 is not set
+# CONFIG_DVB_TDA1004X is not set
 CONFIG_DVB_NXT6000=m
 
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config	2005-02-21 16:39:39 UTC (rev 6070)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64-smp.config	2005-02-21 17:24:25 UTC (rev 6071)
@@ -1632,7 +1632,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-# CONFIG_DVB_TDA1004 is not set
+# CONFIG_DVB_TDA1004X is not set
 CONFIG_DVB_NXT6000=m
 
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config	2005-02-21 16:39:39 UTC (rev 6070)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-x86_64.config	2005-02-21 17:24:25 UTC (rev 6071)
@@ -1650,7 +1650,7 @@
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
-# CONFIG_DVB_TDA1004 is not set
+# CONFIG_DVB_TDA1004X is not set
 CONFIG_DVB_NXT6000=m
 
 #



From svn at tinysofa.org  Mon Feb 21 21:11:45 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Feb 2005 16:11:45 -0500 (EST)
Subject: [tinysofa-svn] r6073 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050221211145.212A73443BB@minbar.tinysofa.org>

Author: gda
Date: 2005-02-21 16:11:37 -0500 (Mon, 21 Feb 2005)
New Revision: 6073

Modified:
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
   tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
Log:
added drm support for arch i386

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 19:04:59 UTC (rev 6072)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586-smp.config	2005-02-21 21:11:37 UTC (rev 6073)
@@ -1698,8 +1698,17 @@
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
-# CONFIG_DRM is not set
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
 
+
 #
 # PCMCIA character devices
 #

Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 19:04:59 UTC (rev 6072)
+++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.9-i586.config	2005-02-21 21:11:37 UTC (rev 6073)
@@ -1698,8 +1698,17 @@
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
-# CONFIG_DRM is not set
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
 
+
 #
 # PCMCIA character devices
 #



From svn at tinysofa.org  Tue Feb 22 10:27:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Feb 2005 05:27:06 -0500 (EST)
Subject: [tinysofa-svn] r6074 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050222102706.48DB6344465@minbar.tinysofa.org>

Author: jh
Date: 2005-02-22 05:26:27 -0500 (Tue, 22 Feb 2005)
New Revision: 6074

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- use nonint_oldconfig (better for automated/mach builds)

Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-21 21:11:37 UTC (rev 6073)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-22 10:26:27 UTC (rev 6074)
@@ -1327,7 +1327,7 @@
 do 
 	mv $i .config 
 	Arch=`head -1 .config | cut -b 3-`
-	make ARCH=$Arch oldconfig
+	make ARCH=$Arch nonint_oldconfig > /dev/null
 	echo "# $Arch" > configs/$i
 	cat .config >> configs/$i 
 done



From svn at tinysofa.org  Tue Feb 22 19:03:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Feb 2005 14:03:30 -0500 (EST)
Subject: [tinysofa-svn] r6076 - tinysofa/releases/1.2/kernel/current/sources
Message-ID: <20050222190330.4BE453444A2@minbar.tinysofa.org>

Author: jh
Date: 2005-02-22 14:03:23 -0500 (Tue, 22 Feb 2005)
New Revision: 6076

Modified:
   tinysofa/releases/1.2/kernel/current/sources/genkey
Log:
- change red hat to tinysofa

Modified: tinysofa/releases/1.2/kernel/current/sources/genkey
===================================================================
--- tinysofa/releases/1.2/kernel/current/sources/genkey	2005-02-22 10:24:59 UTC (rev 6075)
+++ tinysofa/releases/1.2/kernel/current/sources/genkey	2005-02-22 19:03:23 UTC (rev 6076)
@@ -2,6 +2,6 @@
 %secring kernel.sec
 Key-Type: DSA
 Key-Length: 512
-Name-Real: Red Hat, Inc.
+Name-Real: tinysofa
 Name-Comment: Kernel Module GPG key
 %commit



From svn at tinysofa.org  Wed Feb 23 05:14:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Feb 2005 00:14:25 -0500 (EST)
Subject: [tinysofa-svn] r6077 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050223051425.9E73F344291@minbar.tinysofa.org>

Author: jh
Date: 2005-02-23 00:14:19 -0500 (Wed, 23 Feb 2005)
New Revision: 6077

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- change reference from red hat key to tinysofa


Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-22 19:03:23 UTC (rev 6076)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-23 05:14:19 UTC (rev 6077)
@@ -1352,7 +1352,7 @@
 #
 
 gpg --homedir . --batch --gen-key %{SOURCE11} 
-gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
+gpg --homedir . --export --keyring ./kernel.pub tinysofa > extract.pub
 make linux-%{kversion}/scripts/bin2c
 linux-%{kversion}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}/crypto/signature/key.h
 
@@ -1463,7 +1463,7 @@
 	KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" 
 	export KEYFLAGS 
     for i in ` find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f` ; do
-	sh ./scripts/modsign/modsign.sh $i Red
+	sh ./scripts/modsign/modsign.sh $i tiny
         mv -f $i.signed $i
     done
 	unset KEYFLAGS



From svn at tinysofa.org  Wed Feb 23 05:34:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Feb 2005 00:34:36 -0500 (EST)
Subject: [tinysofa-svn] r6078 - in tinysofa/releases/1.2/tar/current:
	sources specs
Message-ID: <20050223053436.172BE34451D@minbar.tinysofa.org>

Author: jh
Date: 2005-02-23 00:34:15 -0500 (Wed, 23 Feb 2005)
New Revision: 6078

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.009.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009-eilseq.patch
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009.tar.gz
Removed:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.006.tar.gz
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- 1.02.009

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.006.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.009.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.009.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.006.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009-eilseq.patch
===================================================================
--- tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009-eilseq.patch	2005-02-23 05:14:19 UTC (rev 6077)
+++ tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009-eilseq.patch	2005-02-23 05:34:15 UTC (rev 6078)
@@ -0,0 +1,13 @@
+--- ./archive_platform.h.old	2005-02-23 07:28:31.000000000 +0200
++++ ./archive_platform.h	2005-02-23 07:30:02.000000000 +0200
+@@ -121,8 +121,8 @@
+ #if HAVE_EFTYPE
+ #define	ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
+ #else
+-#if HAVE_EILSEQ
+-#define	ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
++#if HAVE_ENOTSUP
++#define	ARCHIVE_ERRNO_FILE_FORMAT ENOTSUP
+ #else
+ #define	ARCHIVE_ERRNO_FILE_FORMAT EINVAL
+ #endif

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-23 05:14:19 UTC (rev 6077)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-23 05:34:15 UTC (rev 6078)
@@ -1,15 +1,16 @@
-%define libarchive_version	1.02.006
+%define libarchive_version	1.02.009
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.01.022
-Release: 5jh
+Version: 1.02.009
+Release: 1jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
 Patch1: bsdtar-1.02.006-malloc.patch
+Patch2: libarchive-1.02.009-eilseq.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -27,9 +28,13 @@
 %prep
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
-###%patch1 -p1 -b .malloc~
+%patch1 -p1 -b .malloc~
 
+pushd libarchive-%{libarchive_version}
+%patch2 -p1 -b .eilseq~
+popd
 
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{libarchive_version}"
 export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
@@ -63,6 +68,9 @@
 
 
 %changelog
+* Wed Feb 23 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.009-1jh
+- 1.02.009
+
 * Thu Feb 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.01.022-5jh
 - fix setlocale patch
 



From svn at tinysofa.org  Wed Feb 23 17:51:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Feb 2005 12:51:12 -0500 (EST)
Subject: [tinysofa-svn] r6079 - contrib/1.1/tinysofa-utils/current/sources
Message-ID: <20050223175112.B03693444FE@minbar.tinysofa.org>

Author: jh
Date: 2005-02-23 12:51:06 -0500 (Wed, 23 Feb 2005)
New Revision: 6079

Modified:
   contrib/1.1/tinysofa-utils/current/sources/rel.sh
Log:
- make sure that comps is named correctly


Modified: contrib/1.1/tinysofa-utils/current/sources/rel.sh
===================================================================
--- contrib/1.1/tinysofa-utils/current/sources/rel.sh	2005-02-23 05:34:15 UTC (rev 6078)
+++ contrib/1.1/tinysofa-utils/current/sources/rel.sh	2005-02-23 17:51:06 UTC (rev 6079)
@@ -70,7 +70,7 @@
 fi
 
 mkdir -p "$target"/{srpms.os,$ARCH/tinysofa/{base,rpms.os}}
-cp "$comps" "$target/$ARCH/tinysofa/base/"
+cp "$comps" "$target/$ARCH/tinysofa/base/comps.xml"
 cp -a "$cdroot"/* "$target"/$ARCH
 
 cp "$rpms"/*.rpm "$target"/$ARCH/tinysofa/rpms.os/



From svn at tinysofa.org  Wed Feb 23 19:17:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Feb 2005 14:17:56 -0500 (EST)
Subject: [tinysofa-svn] r6080 - in tinysofa/releases/1.2/grsecurity/current:
	sources specs
Message-ID: <20050223191756.2E580344519@minbar.tinysofa.org>

Author: jh
Date: 2005-02-23 14:17:45 -0500 (Wed, 23 Feb 2005)
New Revision: 6080

Added:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050223.tar
Removed:
   tinysofa/releases/1.2/grsecurity/current/sources/policies-20050218.tar
Modified:
   tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
Log:
- policy update


Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050218.tar
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050223.tar
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050223.tar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-23 17:51:06 UTC (rev 6079)
+++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec	2005-02-23 19:17:45 UTC (rev 6080)
@@ -1,4 +1,4 @@
-%define policies_date	20050218
+%define policies_date	20050223
 Summary: grsecurity user space utilities and policies
 Name: grsecurity
 Version: 2.1.1



From svn at tinysofa.org  Wed Feb 23 20:56:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Feb 2005 15:56:36 -0500 (EST)
Subject: [tinysofa-svn] r6081 -
	tinysofa/releases/1.2/cdrtools/current/sources
Message-ID: <20050223205636.7D501344513@minbar.tinysofa.org>

Author: jh
Date: 2005-02-23 15:56:31 -0500 (Wed, 23 Feb 2005)
New Revision: 6081

Modified:
   tinysofa/releases/1.2/cdrtools/current/sources/cdrtools-2.01a27-dvd-fix.patch
Log:
- don't refer to red hat bugzilla


Modified: tinysofa/releases/1.2/cdrtools/current/sources/cdrtools-2.01a27-dvd-fix.patch
===================================================================
--- tinysofa/releases/1.2/cdrtools/current/sources/cdrtools-2.01a27-dvd-fix.patch	2005-02-23 19:17:45 UTC (rev 6080)
+++ tinysofa/releases/1.2/cdrtools/current/sources/cdrtools-2.01a27-dvd-fix.patch	2005-02-23 20:56:31 UTC (rev 6081)
@@ -5,7 +5,7 @@
    		printf("Note: This version is an unofficial (modified) version with DVD support\n");
                  printf("Note: and therefore may have bugs that are not present in the original.\n");
 -                printf("Note: Please send bug reports or support requests to <warly at mandrakesoft.com>.\n");           
-+                printf("Note: Please send bug reports or support requests to http://bugzilla.redhat.com/bugzilla\n");           
++                printf("Note: Please send bug reports or support requests to http://classic.tinysofa.org/\n");           
                  printf("Note: The author of cdrecord should not be bothered with problems in this version.\n");
  
  #if	defined(SOURCE_MODIFIED) || !defined(IS_SCHILY_XCONFIG)



From svn at tinysofa.org  Wed Feb 23 21:29:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Feb 2005 16:29:26 -0500 (EST)
Subject: [tinysofa-svn] r6082 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050223212926.D78AA344280@minbar.tinysofa.org>

Author: jh
Date: 2005-02-23 16:29:21 -0500 (Wed, 23 Feb 2005)
New Revision: 6082

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
- remove ostat
- remove dev86


Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-23 20:56:31 UTC (rev 6081)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-23 21:29:21 UTC (rev 6082)
@@ -139,7 +139,6 @@
        <packagereq type="default">groff-perl</packagereq>
        <packagereq type="default">lsof</packagereq>
        <packagereq type="default">mt-st</packagereq>
-       <packagereq type="default">ostat</packagereq>
        <packagereq type="default">slocate</packagereq>
        <packagereq type="default">sudo</packagereq>
        <packagereq type="optional">sysstat</packagereq>
@@ -410,7 +409,6 @@
        <packagereq type="default">bison</packagereq>
        <packagereq type="default">byacc</packagereq>
        <packagereq type="default">cpp</packagereq>
-       <packagereq type="default" basearchonly="true">dev86</packagereq>
        <packagereq type="default">flex</packagereq>
        <packagereq type="default">gcc</packagereq>
        <packagereq type="default">gcc-c++</packagereq>



From svn at tinysofa.org  Thu Feb 24 12:39:02 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 07:39:02 -0500 (EST)
Subject: [tinysofa-svn] r6084 - in
	tinysofa/releases/1.2/cyrus-imapd/current: sources specs
Message-ID: <20050224123902.9CEB4344555@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 07:38:09 -0500 (Thu, 24 Feb 2005)
New Revision: 6084

Added:
   tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.12.tar.gz
Removed:
   tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.10.tar.gz
Modified:
   tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-master.conf
   tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- 2.1.12, which fixes vulnerabilities
- enable idled


Deleted: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.10.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.12.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.12.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-master.conf
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-master.conf	2005-02-24 06:50:39 UTC (rev 6083)
+++ tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-master.conf	2005-02-24 12:38:09 UTC (rev 6084)
@@ -5,7 +5,7 @@
   recover	cmd="ctl_cyrusdb -r"
 
   # this is only necessary if using idled for IMAP IDLE
-#  idled		cmd="idled"
+  idled		cmd="idled"
 }
 
 # UNIX sockets start with a slash and are put into /var/spool/cyrus-imap/socket
@@ -35,3 +35,4 @@
   # this is only necessary if caching TLS sessions
   tlsprune	cmd="tls_prune" at=0400
 }
+

Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-24 06:50:39 UTC (rev 6083)
+++ tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-24 12:38:09 UTC (rev 6084)
@@ -1,7 +1,7 @@
 Summary: A high-performance mail store with IMAP and POP3 support.
 Name: cyrus-imapd
-Version: 2.2.10
-Release: 6gd
+Version: 2.2.12
+Release: 1jh
 License: BSD
 Group: main
 URL: http://asg.web.cmu.edu/cyrus/imapd/
@@ -92,12 +92,14 @@
 	--enable-netscapehack \
 	--enable-annotatemore \
 	--enable-listext \
+	--with-idle=idled \
 	--with-perl=%{__perl} \
 	--with-libwrap \
 	--with-openssl \
 	--with-sasl \
 	--with-com_err \
 	--with-krb=no \
+	--without-snmp \
 	--with-cyrus-prefix=%{_libdir}/%{name} \
 	--sysconfdir=%{_sysconfdir}/%{name}
 
@@ -291,6 +293,10 @@
 
 
 %changelog
+* Thu Feb 24 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.2.12-1jh
+- 2.1.12, which fixes vulnerabilities
+- enable idled
+
 * Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.10-6gd
 - changed group to main
 



From svn at tinysofa.org  Thu Feb 24 12:46:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 07:46:08 -0500 (EST)
Subject: [tinysofa-svn] r6085 -
	tinysofa/releases/1.2/cyrus-imapd/current/specs
Message-ID: <20050224124608.A1C18344555@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 07:46:01 -0500 (Thu, 24 Feb 2005)
New Revision: 6085

Modified:
   tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- bump up release


Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-24 12:38:09 UTC (rev 6084)
+++ tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-02-24 12:46:01 UTC (rev 6085)
@@ -1,7 +1,7 @@
 Summary: A high-performance mail store with IMAP and POP3 support.
 Name: cyrus-imapd
 Version: 2.2.12
-Release: 1jh
+Release: 2jh
 License: BSD
 Group: main
 URL: http://asg.web.cmu.edu/cyrus/imapd/



From svn at tinysofa.org  Thu Feb 24 13:51:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 08:51:54 -0500 (EST)
Subject: [tinysofa-svn] r6086 - contrib/1.1/mach/current/sources
Message-ID: <20050224135154.079F434440F@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 08:51:48 -0500 (Thu, 24 Feb 2005)
New Revision: 6086

Modified:
   contrib/1.1/mach/current/sources/tinysofa-1.2
Log:
- fix reference to 1.1


Modified: contrib/1.1/mach/current/sources/tinysofa-1.2
===================================================================
--- contrib/1.1/mach/current/sources/tinysofa-1.2	2005-02-24 12:46:01 UTC (rev 6085)
+++ contrib/1.1/mach/current/sources/tinysofa-1.2	2005-02-24 13:51:48 UTC (rev 6086)
@@ -23,7 +23,7 @@
                 'unzip bzip2 diffutils cpio elfutils',
 }
 sourceslist['tinysofa-1.2'] = {
-    'tinysofa-1.1': ('os', )
+    'tinysofa-1.2': ('os', )
 }
 config['tinysofa-1.2'] = {}
 aliases['tinysofa-1.2'] = ('ts12', 'ts-1.2', )



From svn at tinysofa.org  Thu Feb 24 13:56:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 08:56:30 -0500 (EST)
Subject: [tinysofa-svn] r6087 - tinysofa/releases/1.2/postfix/current/specs
Message-ID: <20050224135630.08D8E344448@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 08:55:48 -0500 (Thu, 24 Feb 2005)
New Revision: 6087

Modified:
   tinysofa/releases/1.2/postfix/current/specs/postfix.spec
Log:
- bump up release


Modified: tinysofa/releases/1.2/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-24 13:51:48 UTC (rev 6086)
+++ tinysofa/releases/1.2/postfix/current/specs/postfix.spec	2005-02-24 13:55:48 UTC (rev 6087)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
 Version: 2.0.20
-Release: 6jh
+Release: 7jh
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz



From svn at tinysofa.org  Thu Feb 24 18:21:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 13:21:49 -0500 (EST)
Subject: [tinysofa-svn] r6088 - in contrib/1.2/unace/current: sources specs
Message-ID: <20050224182149.7814F34458E@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 13:21:39 -0500 (Thu, 24 Feb 2005)
New Revision: 6088

Added:
   contrib/1.2/unace/current/sources/unace.security.patch
Modified:
   contrib/1.2/unace/current/specs/unace.spec
Log:
- don't use the binary!
- add security patch (CAN-2005-0160, CAN-2005-0161)


Added: contrib/1.2/unace/current/sources/unace.security.patch
===================================================================
--- contrib/1.2/unace/current/sources/unace.security.patch	2005-02-24 13:55:48 UTC (rev 6087)
+++ contrib/1.2/unace/current/sources/unace.security.patch	2005-02-24 18:21:39 UTC (rev 6088)
@@ -0,0 +1,167 @@
+--- uac_crt.h.old	1998-07-01 10:29:00.000000000 +0200
++++ uac_crt.h	2005-02-14 00:48:35.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ #include "acestruc.h"
+ 
+-CHAR *ace_fname(CHAR * s, thead * head, INT nopath);
++CHAR *ace_fname(CHAR * s, thead * head, INT nopath, unsigned int size);
+ INT  create_dest_file(CHAR * file, INT a);
+ 
+ #ifdef UNIX
+--- uac_crt.c.old	1998-07-01 10:29:00.000000000 +0200
++++ uac_crt.c	2005-02-14 02:46:02.000000000 +0100
+@@ -33,12 +33,15 @@
+ 
+ /* gets file name from header
+  */
+-CHAR *ace_fname(CHAR * s, thead * head, INT nopath)
++CHAR *ace_fname(CHAR * s, thead * head, INT nopath, unsigned int size)
+ {
+-   INT  i;
++   unsigned int i;
+    char *cp;
+ 
+-   strncpy(s, (*(tfhead *) head).FNAME, i = (*(tfhead *) head).FNAME_SIZE);
++   i = (*(tfhead *) head).FNAME_SIZE;
++   if (i > (size - 1))
++     i = size - 1;
++   strncpy(s, (*(tfhead *) head).FNAME, i);
+    s[i] = 0;
+ 
+    if (nopath)
+@@ -56,22 +59,72 @@ CHAR *ace_fname(CHAR * s, thead * head, 
+    }
+ #endif
+ 
++   cp = s;
++   while (*cp == '/') cp++;
++   if (cp != s)
++     memmove(s, cp, strlen(cp) + 1);
++
+    return s;
+ }
+ 
++int is_directory_traversal(char *str)
++{
++  unsigned int mode, countdots;
++  /* mode 0 = fresh, 1 = just dots, 2 = not just dots */
++  char ch;
++
++  mode = countdots = 0;
++
++  while (ch = *str++)
++  {
++    if ((ch == '/') && (mode == 1) && (countdots > 1))
++      return 1;
++
++    if (ch == '/')
++    {
++       mode = countdots = 0;
++       continue;
++    }
++
++    if (ch == '.')
++    {
++      if (mode == 0)
++        mode = 1;
++
++      countdots++;
++    }
++    else
++      mode = 2;
++  }
++
++  if ((mode == 1) && (countdots > 1))
++    return 1;
++
++  return 0;
++}
++
+ void check_ext_dir(CHAR * f)        // checks/creates path of file
+ {
+    CHAR *cp,
+         d[PATH_MAX];
+-   INT  i;
++   unsigned int i;
+ 
+    d[0] = 0;
+ 
++   if (is_directory_traversal(f))
++   {
++      f_err = ERR_WRITE;
++      printf("\n    Directory traversal attempt:  %s\n", f);
++      return;
++   }
++
+    for (;;)
+    {
+       if ((cp = (CHAR *) strchr(&f[strlen(d) + 1], DIRSEP))!=NULL)
+       {
+          i = cp - f;
++         if (i > (PATH_MAX - 1))
++           i = PATH_MAX - 1;
+          strncpy(d, f, i);
+          d[i] = 0;
+       }
+--- unace.c.old	1998-07-01 10:29:00.000000000 +0200
++++ unace.c	2005-02-14 01:43:28.000000000 +0100
+@@ -240,6 +240,7 @@ INT read_arc_head(void)         // searc
+ INT  open_archive(INT print_err)        // opens archive (or volume)
+ {
+    CHAR av_str[80];
++   unsigned int copylen;
+ 
+    archan = open(aname, O_RDONLY | O_BINARY);   // open file
+ 
+@@ -263,8 +264,11 @@ INT  open_archive(INT print_err)        
+       sprintf(av_str, "\ncreated on %d.%d.%d by ",
+               ts_day(adat.time_cr), ts_month(adat.time_cr), ts_year(adat.time_cr));
+       printf(av_str);
+-      strncpy(av_str, mhead.AV, mhead.AV_SIZE);
+-      av_str[mhead.AV_SIZE] = 0;
++      copylen = mhead.AV_SIZE;
++      if (copylen > 79)
++        copylen = 79;
++      strncpy(av_str, mhead.AV, copylen);
++      av_str[copylen] = 0;
+       printf("%s\n\n", av_str);
+    }
+    comment_out("Main comment:");        // print main comment
+@@ -300,7 +304,7 @@ void get_next_volname(void)             
+ INT  proc_vol(void)                     // opens volume
+ {
+    INT  i;
+-   CHAR s[80];
++   CHAR s[PATH_MAX + 80];
+ 
+    // if f_allvol_pr is 2 we have -y and should never ask
+    if ((!fileexists_insense(aname) && f_allvol_pr != 2) || !f_allvol_pr)
+@@ -428,7 +432,7 @@ void extract_files(int nopath, int test)
+       if (head.HEAD_TYPE == FILE_BLK)
+       {
+          comment_out("File comment:");   // show file comment
+-         ace_fname(file, &head, nopath); // get file name
++         ace_fname(file, &head, nopath, sizeof(file)); // get file name
+          printf("\n%s", file);
+          flush;
+          dcpr_init_file();               // initialize decompression of file
+@@ -496,7 +500,7 @@ void list_files(int verbose)
+       if (head.HEAD_TYPE == FILE_BLK)
+       {
+          ULONG ti=fhead.FTIME;
+-         ace_fname(file, &head, verbose ? 0 : 1); // get file name
++         ace_fname(file, &head, verbose ? 0 : 1, sizeof(file)); // get file name
+ 
+          size  += fhead.SIZE;
+          psize +=
+@@ -588,7 +592,8 @@ int main(INT argc, CHAR * argv[])       
+ 
+       init_unace();                              // initialize unace
+ 
+-      strcpy(aname, argv[arg_cnt]);              // get archive name
++      strncpy(aname, argv[arg_cnt], sizeof(aname) - 4);  // get archive name
++      aname[sizeof(aname) - 5] = '\0';
+       if (!(s = (CHAR *) strrchr(aname, DIRSEP)))
+          s = aname;
+       if (!strrchr(s, '.'))

Modified: contrib/1.2/unace/current/specs/unace.spec
===================================================================
--- contrib/1.2/unace/current/specs/unace.spec	2005-02-24 13:55:48 UTC (rev 6087)
+++ contrib/1.2/unace/current/specs/unace.spec	2005-02-24 18:21:39 UTC (rev 6088)
@@ -1,13 +1,14 @@
 Name:         unace
 URL:          http://www.winace.com
 Version:      2.5
-Release: 2jh
+Release: 3jh
 Summary:      ACE archive extractor
 License:      distributable
 Group: contrib
 Source0:      unace.tar.bz2
 Source1:      linunace25.tar.bz2
 Patch:        unace.dif
+Patch1:       unace.security.patch
 BuildRoot:    %{_tmppath}/%{name}-build
 
 %description
@@ -15,38 +16,32 @@
 
 %prep
 %setup -n unace -c -T
-%ifarch %ix86
-tar xjvf  %{SOURCE1}
-chmod 755 unace
-%else
 tar xjvf  %{SOURCE0}
 mv unace/* .
 rmdir unace
 %patch
+%patch1
 cp unix/gccmaked unix/makefile .
 cp unix/readme.txt readme.txt.unix
-%endif
 
 %build
-%ifnarch %ix86
-make -f makefile
-%endif
+make -f makefile \
+	CFLAGS="$RPM_OPT_FLAGS -DUNIX -DCASEINSENSE"
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 755 unace $RPM_BUILD_ROOT/usr/bin
-chmod 644 licence file_id.diz
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 unace $RPM_BUILD_ROOT%{_bindir}
 
 %files
 %defattr(-,root,root)
-%ifarch %ix86
-%doc licence file_id.diz
-%else
-%doc readme.txt readme.txt.unix file_id.diz changes.log
-%endif
-/usr/bin/unace
+%doc %attr(644,root,root) readme.txt readme.txt.unix file_id.diz changes.log
+%{_bindir}/unace
 
 %changelog
+* Thu Feb 24 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5-3jh
+- don't use the binary!
+- add security patch (CAN-2005-0160, CAN-2005-0161)
+
 * Mon Feb  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5-2jh
 - add missing defattr
 



From svn at tinysofa.org  Thu Feb 24 18:27:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 13:27:52 -0500 (EST)
Subject: [tinysofa-svn] r6089 - in contrib/1.1/unace/current: sources specs
Message-ID: <20050224182752.6AFC9344593@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 13:27:44 -0500 (Thu, 24 Feb 2005)
New Revision: 6089

Added:
   contrib/1.1/unace/current/sources/unace.security.patch
Modified:
   contrib/1.1/unace/current/specs/unace.spec
Log:
- merge unace update


Copied: contrib/1.1/unace/current/sources/unace.security.patch (from rev 6088, contrib/1.2/unace/current/sources/unace.security.patch)

Modified: contrib/1.1/unace/current/specs/unace.spec
===================================================================
--- contrib/1.1/unace/current/specs/unace.spec	2005-02-24 18:21:39 UTC (rev 6088)
+++ contrib/1.1/unace/current/specs/unace.spec	2005-02-24 18:27:44 UTC (rev 6089)
@@ -1,13 +1,14 @@
 Name:         unace
 URL:          http://www.winace.com
 Version:      2.5
-Release: 2jh
+Release: 3jh
 Summary:      ACE archive extractor
 License:      distributable
 Group: contrib
 Source0:      unace.tar.bz2
 Source1:      linunace25.tar.bz2
 Patch:        unace.dif
+Patch1:       unace.security.patch
 BuildRoot:    %{_tmppath}/%{name}-build
 
 %description
@@ -15,38 +16,32 @@
 
 %prep
 %setup -n unace -c -T
-%ifarch %ix86
-tar xjvf  %{SOURCE1}
-chmod 755 unace
-%else
 tar xjvf  %{SOURCE0}
 mv unace/* .
 rmdir unace
 %patch
+%patch1
 cp unix/gccmaked unix/makefile .
 cp unix/readme.txt readme.txt.unix
-%endif
 
 %build
-%ifnarch %ix86
-make -f makefile
-%endif
+make -f makefile \
+	CFLAGS="$RPM_OPT_FLAGS -DUNIX -DCASEINSENSE"
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 755 unace $RPM_BUILD_ROOT/usr/bin
-chmod 644 licence file_id.diz
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 unace $RPM_BUILD_ROOT%{_bindir}
 
 %files
 %defattr(-,root,root)
-%ifarch %ix86
-%doc licence file_id.diz
-%else
-%doc readme.txt readme.txt.unix file_id.diz changes.log
-%endif
-/usr/bin/unace
+%doc %attr(644,root,root) readme.txt readme.txt.unix file_id.diz changes.log
+%{_bindir}/unace
 
 %changelog
+* Thu Feb 24 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5-3jh
+- don't use the binary!
+- add security patch (CAN-2005-0160, CAN-2005-0161)
+
 * Mon Feb  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5-2jh
 - add missing defattr
 



From svn at tinysofa.org  Thu Feb 24 20:36:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 15:36:30 -0500 (EST)
Subject: [tinysofa-svn] r6090 - tinysofa/releases/1.2/apt/current/specs
Message-ID: <20050224203630.D681C344663@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 15:36:20 -0500 (Thu, 24 Feb 2005)
New Revision: 6090

Modified:
   tinysofa/releases/1.2/apt/current/specs/apt.spec
Log:
- change tsrel to 1.2


Modified: tinysofa/releases/1.2/apt/current/specs/apt.spec
===================================================================
--- tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-24 18:27:44 UTC (rev 6089)
+++ tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-24 20:36:20 UTC (rev 6090)
@@ -1,5 +1,5 @@
 # for mirror-select.conf
-%define tsrel 1.1
+%define tsrel 1.2
 
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt



From svn at tinysofa.org  Thu Feb 24 22:24:20 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 17:24:20 -0500 (EST)
Subject: [tinysofa-svn] r6091 - tinysofa/releases/1.2/kernel/current/specs
Message-ID: <20050224222420.E60EC344391@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 17:24:07 -0500 (Thu, 24 Feb 2005)
New Revision: 6091

Modified:
   tinysofa/releases/1.2/kernel/current/specs/kernel.spec
Log:
- unify %post scripts


Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-24 20:36:20 UTC (rev 6090)
+++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec	2005-02-24 22:24:07 UTC (rev 6091)
@@ -167,7 +167,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 1jh
+Release: 2jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -1587,7 +1587,7 @@
 fi
 
 %post smp
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}smp
 
 %post smp-devel
 if [ -x /usr/sbin/hardlink ] ; then
@@ -1599,7 +1599,7 @@
 fi
 
 %post hugemem
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-hugemem --mkinitrd --depmod --install %{KVERREL}hugemem
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}hugemem
 
 %post hugemem-devel
 if [ -x /usr/sbin/hardlink ] ; then



From svn at tinysofa.org  Thu Feb 24 23:09:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Feb 2005 18:09:05 -0500 (EST)
Subject: [tinysofa-svn] r6092 - in tinysofa/releases/1.2/apt/current:
	sources specs
Message-ID: <20050224230905.6E7683441AE@minbar.tinysofa.org>

Author: jh
Date: 2005-02-24 18:08:49 -0500 (Thu, 24 Feb 2005)
New Revision: 6092

Modified:
   tinysofa/releases/1.2/apt/current/sources/default.conf
   tinysofa/releases/1.2/apt/current/specs/apt.spec
Log:
- fix libdir for apt scripts

Modified: tinysofa/releases/1.2/apt/current/sources/default.conf
===================================================================
--- tinysofa/releases/1.2/apt/current/sources/default.conf	2005-02-24 22:24:07 UTC (rev 6091)
+++ tinysofa/releases/1.2/apt/current/sources/default.conf	2005-02-24 23:08:49 UTC (rev 6092)
@@ -55,3 +55,9 @@
   Set-Default "false"; // never set this true on tinysofa classic server
   Module-Prefix { "kernel-module-"; };
 }
+
+Dir
+{
+  Bin::scripts "@LIBDIR@/apt/scripts";
+}
+

Modified: tinysofa/releases/1.2/apt/current/specs/apt.spec
===================================================================
--- tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-24 22:24:07 UTC (rev 6091)
+++ tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-24 23:08:49 UTC (rev 6092)
@@ -4,7 +4,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 7jh
+Release: 8jh
 Epoch: 0
 Group: main
 URL: https://moin.conectiva.com.br/AptRpm
@@ -68,6 +68,7 @@
 BuildRequires: perl, readline-devel, ncurses-devel, gcc-c++
 # for version detection to work 
 BuildRequires: release
+BuildRequires: sed
 
 %if %{with_selinux}
 BuildRequires: libselinux-devel
@@ -190,6 +191,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' \
+	$RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
@@ -359,6 +362,9 @@
 exit 0
 
 %changelog
+* Fri Feb 25 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.5.15cnc6-8jh
+- fix libdir for apt scripts
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 0.5.15cnc6-6ts
 - current (0.5.15cnc6-6jh) integrated as 0.5.15cnc6-6ts for release 1.1-U3
 



From svn at tinysofa.org  Fri Feb 25 05:27:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 00:27:44 -0500 (EST)
Subject: [tinysofa-svn] r6093 - tinysofa/releases/1.2/apt/current/specs
Message-ID: <20050225052744.56AA9344587@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 00:27:36 -0500 (Fri, 25 Feb 2005)
New Revision: 6093

Modified:
   tinysofa/releases/1.2/apt/current/specs/apt.spec
Log:
- run sed on correct file


Modified: tinysofa/releases/1.2/apt/current/specs/apt.spec
===================================================================
--- tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-24 23:08:49 UTC (rev 6092)
+++ tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-25 05:27:36 UTC (rev 6093)
@@ -191,8 +191,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' \
-	$RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
@@ -202,6 +200,10 @@
 for cnf in %{SOURCE150} %{SOURCE151} %{SOURCE153}; do
 	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 done
+
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' \
+	$RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/default.conf
+
 # fix mirror-select path
 perl -pi -e "s/TSREL/%{tsrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
 perl -pi -e "s/ARCH/%{_arch}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf



From svn at tinysofa.org  Fri Feb 25 05:41:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 00:41:03 -0500 (EST)
Subject: [tinysofa-svn] r6094 - in tinysofa/releases/1.2/bison/current:
	sources specs
Message-ID: <20050225054103.A05AC3445C7@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 00:40:29 -0500 (Fri, 25 Feb 2005)
New Revision: 6094

Added:
   tinysofa/releases/1.2/bison/current/sources/bison-2.0.tar.gz
Removed:
   tinysofa/releases/1.2/bison/current/sources/bison-1.875c.tar.gz
Modified:
   tinysofa/releases/1.2/bison/current/specs/bison.spec
Log:
- 2.0

Deleted: tinysofa/releases/1.2/bison/current/sources/bison-1.875c.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/bison/current/sources/bison-2.0.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/bison/current/sources/bison-2.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/bison/current/specs/bison.spec
===================================================================
--- tinysofa/releases/1.2/bison/current/specs/bison.spec	2005-02-25 05:27:36 UTC (rev 6093)
+++ tinysofa/releases/1.2/bison/current/specs/bison.spec	2005-02-25 05:40:29 UTC (rev 6094)
@@ -1,7 +1,7 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
-Version: 1.875c
-Release: 2jh
+Version: 2.0
+Release: 1jh
 License: GPL
 Group: development
 #Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Feb 25 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.0-1jh
+- 2.0
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 1.875c-1ts
 - current (1.875c-1jh) integrated as 1.875c-1ts for release 1.1-U3
 



From svn at tinysofa.org  Fri Feb 25 06:31:41 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 01:31:41 -0500 (EST)
Subject: [tinysofa-svn] r6095 - tinysofa/releases/1.2/apt/current/specs
Message-ID: <20050225063141.22A353444B0@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 01:31:34 -0500 (Fri, 25 Feb 2005)
New Revision: 6095

Modified:
   tinysofa/releases/1.2/apt/current/specs/apt.spec
Log:
- fif gnupg dir permissions


Modified: tinysofa/releases/1.2/apt/current/specs/apt.spec
===================================================================
--- tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-25 05:40:29 UTC (rev 6094)
+++ tinysofa/releases/1.2/apt/current/specs/apt.spec	2005-02-25 06:31:34 UTC (rev 6095)
@@ -310,7 +310,7 @@
 %dir %{_sysconfdir}/apt/vendors.list.d
 %dir %{_sysconfdir}/apt/apt.conf.d
 %dir %{_sysconfdir}/apt/gpg
-%attr(600,root,root) %dir %{_sysconfdir}/apt/gpg/gnupg
+%attr(700,root,root) %dir %{_sysconfdir}/apt/gpg/gnupg
 %{_sysconfdir}/apt/gpg/gpg-pubkey*
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/preferences



From svn at tinysofa.org  Fri Feb 25 08:15:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 03:15:49 -0500 (EST)
Subject: [tinysofa-svn] r6096 - in contrib/1.2: glib12/current/specs
	gtk12+/current/specs
Message-ID: <20050225081549.43FC1344666@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 03:15:37 -0500 (Fri, 25 Feb 2005)
New Revision: 6096

Modified:
   contrib/1.2/glib12/current/specs/glib12.spec
   contrib/1.2/gtk12+/current/specs/gtk12+.spec
Log:
- don't own mandir


Modified: contrib/1.2/glib12/current/specs/glib12.spec
===================================================================
--- contrib/1.2/glib12/current/specs/glib12.spec	2005-02-25 06:31:34 UTC (rev 6095)
+++ contrib/1.2/glib12/current/specs/glib12.spec	2005-02-25 08:15:37 UTC (rev 6096)
@@ -44,6 +44,9 @@
 install -m 644 glibconfig.h $RPM_BUILD_ROOT/usr/include/glib-1.2/
 rm $RPM_BUILD_ROOT/usr/lib/glib/include/glibconfig.h
 
+%nuke_info
+
+
 %clean
 %clean_buildroot
 
@@ -62,8 +65,9 @@
 %{_libdir}/*a
 %{_libdir}/pkgconfig/*
 %{_prefix}/include/*
-%{_prefix}/share
+%{_prefix}/share/aclocal/*
 %{_prefix}/bin/*
+%{_mandir}/man?/*
 
 %changelog
 * Mon Feb 14 2005 Gerald Dachs <gda at tinysofa dot org> 1.2.10-3gd

Modified: contrib/1.2/gtk12+/current/specs/gtk12+.spec
===================================================================
--- contrib/1.2/gtk12+/current/specs/gtk12+.spec	2005-02-25 06:31:34 UTC (rev 6095)
+++ contrib/1.2/gtk12+/current/specs/gtk12+.spec	2005-02-25 08:15:37 UTC (rev 6096)
@@ -157,7 +157,7 @@
 %{_datadir}/aclocal/*
 %{_datadir}/locale/*
 %{_bindir}/*
-%{_mandir}
+%{_mandir}/man?/*
 
 
 %changelog



From svn at tinysofa.org  Fri Feb 25 08:21:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 03:21:47 -0500 (EST)
Subject: [tinysofa-svn] r6097 - tinysofa/releases/1.2/gawk/current/specs
Message-ID: <20050225082147.50D3A344667@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 03:21:41 -0500 (Fri, 25 Feb 2005)
New Revision: 6097

Modified:
   tinysofa/releases/1.2/gawk/current/specs/gawk.spec
Log:
- don't own system directories

Modified: tinysofa/releases/1.2/gawk/current/specs/gawk.spec
===================================================================
--- tinysofa/releases/1.2/gawk/current/specs/gawk.spec	2005-02-25 08:15:37 UTC (rev 6096)
+++ tinysofa/releases/1.2/gawk/current/specs/gawk.spec	2005-02-25 08:21:41 UTC (rev 6097)
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.4
-Release: 2jh
+Release: 3jh
 License: GPL
 Group: main
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -74,7 +74,7 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_libexecdir}/awk
-%{_datadir}
+%{_datadir}/awk
 
 %files doc
 %defattr(-,root,root)
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Fri Feb 25 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.1.4-3jh
+- don't own system directories
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 3.1.4-1ts
 - current (3.1.4-1jh) integrated as 3.1.4-1ts for release 1.1-U3
 



From svn at tinysofa.org  Fri Feb 25 08:51:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 03:51:24 -0500 (EST)
Subject: [tinysofa-svn] r6098 - in tinysofa/releases/1.2/tar/current:
	sources specs
Message-ID: <20050225085124.BDF64344686@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 03:51:04 -0500 (Fri, 25 Feb 2005)
New Revision: 6098

Added:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.010.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010.tar.gz
Removed:
   tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.009.tar.gz
   tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009.tar.gz
Modified:
   tinysofa/releases/1.2/tar/current/specs/tar.spec
Log:
- 1.02.010

Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.009.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.010.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.010.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.009.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-25 08:21:41 UTC (rev 6097)
+++ tinysofa/releases/1.2/tar/current/specs/tar.spec	2005-02-25 08:51:04 UTC (rev 6098)
@@ -1,8 +1,8 @@
-%define libarchive_version	1.02.009
+%define libarchive_version	1.02.010
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.009
+Version: 1.02.010
 Release: 1jh
 License: BSD
 Group: main
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Feb 25 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.010-1jh
+- 1.02.010
+
 * Wed Feb 23 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.009-1jh
 - 1.02.009
 



From svn at tinysofa.org  Fri Feb 25 16:53:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 11:53:19 -0500 (EST)
Subject: [tinysofa-svn] r6102 - in tinysofa/releases/1.2/anaconda/current:
	sources specs
Message-ID: <20050225165319.1733634458F@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 11:53:10 -0500 (Fri, 25 Feb 2005)
New Revision: 6102

Modified:
   tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch
   tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
Log:
- polish startup message


Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch
===================================================================
--- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-02-25 16:13:00 UTC (rev 6101)
+++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-02-25 16:53:10 UTC (rev 6102)
@@ -370,7 +370,7 @@
  splash.lss
  
 - -  To install or upgrade 02Red Hat07 Enterprise Linux in graphical mode, 
-+ -  To install or upgrade 0ftinysofa07 classic server, 
++ -  To install 0ftinysofa07 classic server, 
      press the 0f<ENTER>07 key.
  
 - -  To install or upgrade 02Red Hat07 Enterprise Linux in text mode, type: 
@@ -417,7 +417,7 @@
   
  
 - -  To install or upgrade 02Red Hat07 Enterprise Linux in graphical mode, 
-+ -  To install or upgrade 02tinysofa07 classic server, 
++ -  To install 02tinysofa07 classic server, 
      press the 0f<ENTER>07 key.
  
 - -  To install or upgrade 02Red Hat07 Enterprise Linux in text mode, type: 

Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-25 16:13:00 UTC (rev 6101)
+++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec	2005-02-25 16:53:10 UTC (rev 6102)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 0.16jh
+Release: 0.17jh
 License: GPL
 Summary: installation program
 Group: development



From svn at tinysofa.org  Fri Feb 25 16:01:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 11:01:12 -0500 (EST)
Subject: [tinysofa-svn] r6099 - in tinysofa/releases/1.2/mysql/current:
	sources specs
Message-ID: <20050225160112.0D3D83446D5@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 10:52:39 -0500 (Fri, 25 Feb 2005)
New Revision: 6099

Added:
   tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10-socklen.patch
   tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10.tar.gz
Removed:
   tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.9.tar.gz
Modified:
   tinysofa/releases/1.2/mysql/current/specs/mysql.spec
Log:
- 4.1.10
- make it build with new gcc


Added: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10-socklen.patch
===================================================================
--- tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10-socklen.patch	2005-02-25 08:51:04 UTC (rev 6098)
+++ tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10-socklen.patch	2005-02-25 15:52:39 UTC (rev 6099)
@@ -0,0 +1,20 @@
+--- mysql-4.1.10/sql/mysqld.cc.socklen~	2005-02-12 15:37:30.000000000 -0500
++++ mysql-4.1.10/sql/mysqld.cc	2005-02-25 09:05:33.000000000 -0500
+@@ -3538,7 +3538,7 @@
+ #endif /* NO_FCNTL_NONBLOCK */
+     for (uint retry=0; retry < MAX_ACCEPT_RETRY; retry++)
+     {
+-      size_socket length=sizeof(struct sockaddr_in);
++      socklen_t length=sizeof(struct sockaddr_in);
+       new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
+ 			&length);
+ #ifdef __NETWARE__ 
+@@ -3610,7 +3610,7 @@
+ #endif /* HAVE_LIBWRAP */
+ 
+     {
+-      size_socket dummyLen;
++      socklen_t dummyLen;
+       struct sockaddr dummy;
+       dummyLen = sizeof(struct sockaddr);
+       if (getsockname(new_sock,&dummy, &dummyLen) < 0)

Added: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.9.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.2/mysql/current/specs/mysql.spec	2005-02-25 08:51:04 UTC (rev 6098)
+++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec	2005-02-25 15:52:39 UTC (rev 6099)
@@ -5,13 +5,14 @@
 Summary: A SQL database engine
 Name: mysql
 Group: main
-Version: 4.1.9
+Version: 4.1.10
 Release: 1jh
 License: GPL / LGPL
 Source: http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/mysql-%{version}.tar.gz
 Source2: mysql.init
 Source3: mysql.conf
 Patch: mysql-4.0.20-fixpath.patch
+Patch1: mysql-4.1.10-socklen.patch
 URL: http://www.mysql.com/
 Provides: msqlormysql MySQL-server
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -89,7 +90,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .fixpath
+%patch -p1 -b .fixpath~
+%patch1 -p1 -b .socklen~
 
 
 %build
@@ -301,10 +303,13 @@
 %{_datadir}/mysql-test
 %{_bindir}/mysqlmanager-pwgen
 %{_bindir}/mysqlmanagerc
-%{_bindir}/client_test
 
 
 %changelog
+* Fri Feb 25 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.1.10-1jh
+- 4.1.10
+- make it build with new gcc
+
 * Fri Jan 14 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - 4.1.9
 



From svn at tinysofa.org  Fri Feb 25 16:05:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 11:05:29 -0500 (EST)
Subject: [tinysofa-svn] r6100 - tinysofa/misc/comps/releases/1.2
Message-ID: <20050225160529.B1A8334490B@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 11:04:58 -0500 (Fri, 25 Feb 2005)
New Revision: 6100

Modified:
   tinysofa/misc/comps/releases/1.2/comps.xml
Log:
- add reiserfsprogs


Modified: tinysofa/misc/comps/releases/1.2/comps.xml
===================================================================
--- tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-25 15:52:39 UTC (rev 6099)
+++ tinysofa/misc/comps/releases/1.2/comps.xml	2005-02-25 16:04:58 UTC (rev 6100)
@@ -67,6 +67,7 @@
       <packagereq type="mandatory">psmisc</packagereq>
       <packagereq type="mandatory">dhcp-client</packagereq>
       <packagereq type="mandatory">readline</packagereq>
+      <packagereq type="mandatory">reiserfsprogs</packagereq>
       <packagereq type="mandatory">release</packagereq>
       <packagereq type="mandatory">rootfiles</packagereq>
       <packagereq type="mandatory">rpm</packagereq>



From svn at tinysofa.org  Fri Feb 25 16:13:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 11:13:08 -0500 (EST)
Subject: [tinysofa-svn] r6101 - tinysofa/releases/1.2/mysql/current/specs
Message-ID: <20050225161308.C62D8344A16@minbar.tinysofa.org>

Author: jh
Date: 2005-02-25 11:13:00 -0500 (Fri, 25 Feb 2005)
New Revision: 6101

Modified:
   tinysofa/releases/1.2/mysql/current/specs/mysql.spec
Log:
- re-add client test with the new name

Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.2/mysql/current/specs/mysql.spec	2005-02-25 16:04:58 UTC (rev 6100)
+++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec	2005-02-25 16:13:00 UTC (rev 6101)
@@ -303,6 +303,7 @@
 %{_datadir}/mysql-test
 %{_bindir}/mysqlmanager-pwgen
 %{_bindir}/mysqlmanagerc
+%{_bindir}/mysql_client_test
 
 
 %changelog



From svn at tinysofa.org  Fri Feb 25 20:08:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Feb 2005 15:08:34 -0500 (EST)
Subject: [tinysofa-svn] r6103 - in contrib/1.1/firefox/current: sources specs
Message-ID: <20050225200834.6D0AB344475@minbar.tinysofa.org>

Author: gda
Date: 2005-02-25 14:56:37 -0500 (Fri, 25 Feb 2005)
New Revision: 6103

Added:
   contrib/1.1/firefox/current/sources/firefox-1.0.1-source.tar.bz2
Removed:
   contrib/1.1/firefox/current/sources/firefox-1.0-source.tar.bz2
Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
1.0.1

Deleted: contrib/1.1/firefox/current/sources/firefox-1.0-source.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/1.1/firefox/current/sources/firefox-1.0.1-source.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/firefox/current/sources/firefox-1.0.1-source.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2005-02-25 16:53:10 UTC (rev 6102)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2005-02-25 19:56:37 UTC (rev 6103)
@@ -9,8 +9,8 @@
 
 Summary: Mozilla Firefox web browser
 Name: firefox
-Version: 1.0
-Release: 2gd
+Version: 1.0.1
+Release: 1gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -245,6 +245,9 @@
 %endif
 
 %changelog
+* Fri Feb 25 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.1-1gd
+- 1.0.1
+
 * Mon Feb 14 2005 Gerald Dachs <gda at tinysofa dot org> 1.0-2gd
 - patches for bsd tar
 



From svn at tinysofa.org  Sat Feb 26 23:57:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 26 Feb 2005 18:57:49 -0500 (EST)
Subject: [tinysofa-svn] r6104 - in contrib/1.1/abiword/current: sources specs
Message-ID: <20050226235749.D7EBC344A24@minbar.tinysofa.org>

Author: gda
Date: 2005-02-26 18:47:20 -0500 (Sat, 26 Feb 2005)
New Revision: 6104

Added:
   contrib/1.1/abiword/current/sources/abiword-2.2.4.tar.gz
Removed:
   contrib/1.1/abiword/current/sources/abiword-2.0.11-desktop.patch
   contrib/1.1/abiword/current/sources/abiword-2.0.14.tar.bz2
   contrib/1.1/abiword/current/sources/abiword-2.0.9-windowshelppaths.patch
Modified:
   contrib/1.1/abiword/current/specs/abiword.spec
Log:
2.2.4

Deleted: contrib/1.1/abiword/current/sources/abiword-2.0.11-desktop.patch
===================================================================
--- contrib/1.1/abiword/current/sources/abiword-2.0.11-desktop.patch	2005-02-25 19:56:37 UTC (rev 6103)
+++ contrib/1.1/abiword/current/sources/abiword-2.0.11-desktop.patch	2005-02-26 23:47:20 UTC (rev 6104)
@@ -1,20 +0,0 @@
-diff -ru abiword-2.0.11.orig/abi/src/pkg/linux/rpm/data/abiword.desktop abiword-2.0.11/abi/src/pkg/linux/rpm/data/abiword.desktop
---- abiword-2.0.11.orig/abi/src/pkg/linux/rpm/data/abiword.desktop	2004-09-06 12:20:36.270659886 +0100
-+++ abiword-2.0.11/abi/src/pkg/linux/rpm/data/abiword.desktop	2004-09-06 12:24:27.420537695 +0100
-@@ -1,6 +1,10 @@
- [Desktop Entry]
- Name=Word Processor
- Comment=AbiWord Word Processor
-+Name[de]=Textverarbeitung
-+Comment[de]=AbiWord Textverarbeitung
-+Name[no]=Tekstbehandler
-+Comment[no]=AbiWord Tekstbehandler
- Exec=abiword
- Icon=abiword_48.png
- Terminal=false
-@@ -8,4 +12,4 @@
- Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
- StartupNotify=true
- Encoding=UTF-8
--
-+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;

Deleted: contrib/1.1/abiword/current/sources/abiword-2.0.14.tar.bz2
===================================================================
(Binary files differ)

Deleted: contrib/1.1/abiword/current/sources/abiword-2.0.9-windowshelppaths.patch
===================================================================
--- contrib/1.1/abiword/current/sources/abiword-2.0.9-windowshelppaths.patch	2005-02-25 19:56:37 UTC (rev 6103)
+++ contrib/1.1/abiword/current/sources/abiword-2.0.9-windowshelppaths.patch	2005-02-26 23:47:20 UTC (rev 6104)
@@ -1,254 +0,0 @@
-diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw
---- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw	2004-07-28 19:00:11.612412860 +0100
-+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw	2004-07-28 19:00:49.785296529 +0100
-@@ -23,7 +23,7 @@
- <p style="Normal"><c props="lang:fr-FR">Il est presque in?vitable qu'? un certain moment, vous aurez le besoin d'exp?dier un document que vous avez cr?? avec AbiWord ? une personne utilisant Microsoft Word ou ouvrir un document cr?? avec Microsoft Word avec AbiWord. Heureusement, il est facile de r?aliser ces transferts.</c><c props="lang:fr-FR"></c></p>
- <p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser un document AbiWord avec Microsoft Word</c><c style="Heading 2" props="lang:fr-FR"></c></p>
- <p style="Normal"><c props="lang:fr-FR">Jusqu'? ce que Microsoft annonce le support des fichiers d'AbiWord, les documents cr??s avec AbiWord n?cessiteront d'?tre export?s dans un format que Word peut lire. L'enregistrement au format </c><c props="lang:fr-FR"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:fr-FR">Rich Text Format </c><c props="lang:fr-FR">permet de r?aliser facilement cette exportation.</c></p>
--<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
-+<p style="Normal"><image dataid="/usr/src/abiword/commit/gettingstarted.abw.png_1" props="height:6.91in; width:5.63in"/></p>
- <p style="Normal"></p>
- <p style="Normal"><c props="lang:fr-FR">Le format Rich Text est couramment utilis? par les produits Microsoft Office et ils n'auront aucune difficult? ? importer les documents enregistr?s ainsi.</c><c props="lang:fr-FR"></c></p>
- <p style="Heading 2"><c style="Heading 2" props="lang:fr-FR">Visualiser les documents Word avec AbiWord</c><c style="Heading 2" props="lang:fr-FR"></c></p>
-@@ -31,7 +31,7 @@
- <p style="Normal"><c props="lang:fr-FR">Si vous rencontrez des probl?mes, demandez ? l'utilisateur de Word d'enregistrer le document au format </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Rich Text Format (.rtf)</c><c props="lang:fr-FR">. Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de mani?re fiable.</c></p>
- </section>
- <data>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\howto\gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/gettingstarted.abw.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA
- CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5
- 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9
-diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw
---- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw	2004-07-28 19:00:11.595415583 +0100
-+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw	2004-07-28 19:00:49.786296369 +0100
-@@ -16,7 +16,7 @@
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section>
- <p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">Dialogue remplacer</c></p>
--<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" props="height:1.77in; width:4.93in"/></p>
-+<p style="Normal"><image dataid="/usr/src/abiword/commit/replace.png_0" props="height:1.77in; width:4.93in"/></p>
- <p style="Heading 2"><c props="lang:fr-FR">Rechercher</c><c props="lang:fr-FR"></c></p>
- <p style="Normal"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">Entrez le mot que vous d?sirez rechercher dans cette bo?te. Il s'agit de la cha?ne de recherche. Cette commande recherche la cha?ne de caract?res ou de nombres que vous entrez. Ainsi, si vous recherchez </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"></c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">, vous trouverez les deux lettres au milieu du mot </c><c props="font-family:Times New Roman
 ; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">dent</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt"> tout autant que le mot </c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; font-size:12pt">en</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; font-size:12pt">.</c></p>
- <p style="Heading 2"><c props="lang:fr-FR">Respecter la casse</c><c props="lang:fr-FR"></c></p>
-@@ -33,7 +33,7 @@
- <p style="Normal"><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Ce bouton ferme le dialogue </c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:italic; text-decoration:none">Remplacer</c><c props="font-family:Times New Roman; font-size:12pt; color:000000; lang:fr-FR; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">.</c></p>
- </section>
- <data>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\replace.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/replace.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa
- UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+
- P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d
-diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw
---- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw	2004-07-28 19:00:11.604414141 +0100
-+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw	2004-07-28 19:00:49.789295889 +0100
-@@ -23,24 +23,24 @@
- <section header="26414915">
- <p style="Heading 1"><c props="lang:fr-CA"></c><c props="lang:fr-FR">L'espace de travail d'AbiWord</c></p>
- <p style="Normal"><c props="lang:fr-FR">AbiWord a une apparence tr?s similaire ? d'autres traitements de texte, ce qui, nous l'esp?rons, met ? l'aise toute personne qui d?bute avec le logiciel.</c><c props="lang:fr-FR"></c></p>
--<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" props="height:4.14in; width:6.75in"/></p>
-+<p style="Normal"><image dataid="/usr/src/abiword/commit/full_window.png_1" props="height:4.14in; width:6.75in"/></p>
- <p style="Normal"><c props="lang:fr-FR">L'interface famili?re devrait permettre ? la plupart des personnes de d?marrer le travail imm?diatement. Cependant, certaines caract?ristiques sont peut-?tre nouvelles.</c><c props="lang:fr-FR"></c></p>
- <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Titre de fen?tre</c><c props="lang:fr-FR"></c></p>
--<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
-+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_1" props="height:0.23in; width:6.73in"/></p>
- <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La fen?tre de titre est similaire ? cette de toute autre application, avec une diff?rence toutefois. Notez le caract?re </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">*</c><c props="lang:fr-FR"> pr?s de </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR">. L'ast?rique signifie que </c><c props="font-style:italic; lang:fr-FR">Document10</c><c props="lang:fr-FR"> a ?t? modifi?. Ceci fourni un mani?re simple d'identifier si le document doit ?tre enregistr?.</c></p>
- <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Les barres de fonction</c><c props="lang:fr-FR"></c></p>
--<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La premi?re, nomm?e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr?f?rable d'y d?buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
-+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_1" props="height:0.98in; width:6.63in"/><c props="lang:fr-FR">Voici les trois plus importantes barres de fonctions. La premi?re, nomm?e barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est pr?f?rable d'y d?buter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.</c><c props="lang:fr-FR"></c></p>
- <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">La seconde est la barre d'outils standard et la troisi?me (au bas) est la barre d'outils de mise en forme.</c><c props="lang:fr-FR"></c></p>
- <p level="1" listid="0" parentid="0" style="Heading 2"><c props="lang:fr-FR">Manipuler les barres</c><c props="lang:fr-FR"></c></p>
- <p level="1" listid="0" parentid="0" style="Normal"><c props="lang:fr-FR">AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises v?rifiez le menu </c><c props="lang:fr-FR"></c><c props="font-style:italic; lang:fr-FR">Affichage</c><c props="lang:fr-FR"> &gt; </c><c props="font-style:italic; lang:fr-FR">Barres d'outils</c><c props="lang:fr-FR">.</c></p>
--<p level="1" listid="0" parentid="0" style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
-+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:3.19in; width:5.76in"/></p>
- <p style="Heading 2"><c props="lang:fr-FR">Barre de saisie</c><c props="lang:fr-FR"></c></p>
- <p style="Normal"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
- <p style="Normal"><c props="lang:fr-FR">Pour ceux qui ex?cutent AbiWord sous GNOME, La barre de saisie localis?e ? l'extr?mit? gauche de chaque barre d'outils repr?sente une mani?res simple offerte ? chacun de modifier l'interface ? leur convenance. Cliquez la barre de saisie et d?placez-l?. La barre d'outils suivra la souris, permettant m?me ? la barre d'outil de survoler une partie quelconque de l'?cran.</c><c props="lang:fr-FR"></c></p>
- <p style="Heading 2"><c props="lang:fr-FR">Barre d'?tat</c><c props="lang:fr-FR"></c></p>
- <p style="Normal"><image dataid="/usr/src/abiword/commit/images/statusbar.png_0" props="height:0.22in; width:5.04in"/></p>
- <p style="Normal"><c props="lang:fr-FR">La barre d'?tat permet une vue rapide de l'?tat du document. A la gauche, AbiWord note la page courante. La bo?te du milieu, qui est habituellement vide, affiche un message d'aide rapide d?crivant l'option de menu courante.</c><c props="lang:fr-FR"></c></p>
--<p style="Normal"><image dataid="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
-+<p style="Normal"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_1" props="height:1.61in; width:6.49in"/></p>
- <p style="Heading 2"><c props="lang:fr-FR">Les r?gles</c><c props="lang:fr-FR"></c></p>
- <p style="Normal"><image dataid="/usr/src/abiword/commit/images/ruler.png_0" props="height:0.32in; width:5.55in"/></p>
- <p style="Normal"><c props="lang:fr-FR">En employant les r?gles, il devient facile de fixer les marges de la page et les tabulations.</c><c props="lang:fr-FR"></c></p>
-@@ -49,7 +49,7 @@
- <p style="Normal" props="text-align:left"></p>
- </section>
- <data>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\full_window.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/full_window.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR
- vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY
- WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur
-@@ -732,7 +732,7 @@
- Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
- iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
- </d>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ
- AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO
- Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1
-@@ -1135,7 +1135,7 @@
- MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu
- QmCC
- </d>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\functionbars.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/functionbars.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ
- AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ
- BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB
-@@ -1496,7 +1496,7 @@
- DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC
- QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC
- </d>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\titlebar.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/titlebar.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ
- AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me
- 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99
-@@ -1550,7 +1550,7 @@
- N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm
- ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg==
- </d>
--<d name="F:\AbiSource\abiword-docs\ABW\fr-FR\interface\statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ
- AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd
- ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ
-diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw
---- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw	2004-07-28 19:00:11.584417345 +0100
-+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw	2004-07-28 19:00:49.791295568 +0100
-@@ -24,7 +24,7 @@
- <p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgl?d dokument?w AbiWorda w programie Microsoft Word</c></p>
- <p style="Normal"><c props="lang:en-US">Jakkolwiek Microsoft zapowiada wsparcie dla plik?w AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny by? eksportowane do formatu czytelnego dla programu Microsoft Word. Naj?atwiej to zrobi? przez zapisanie pliku w postaci Rich Text Format.</c></p>
- <p style="Normal"></p>
--<p style="Normal"><image dataid="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
-+<p style="Normal"><image dataid="/usr/src/abiword/commit/howtoword.png_0" props="height:3.40in; width:5.04in"/></p>
- <p style="Normal"></p>
- <p style="Normal"><c props="lang:en-US">Rich Text Format cz?sto jest u?ywany przez pakiet oprogramowania biurowego firmy Microsoft i nie b?dzie problem?w z importem dokument?w zapisanych w ten spos?b.</c></p>
- <p style="Heading 2"><c style="Heading 2" props="lang:en-US">Podgl?d dokument?w Microsoft Word w AbiWordzie</c></p>
-@@ -32,7 +32,7 @@
- <p style="Normal"><c props="lang:en-US">Je?li napotykasz problemy, to popro? u?ytkownika programu Microsoft Word, aby zapisywa? dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mog? zapisywa? pliki w tym formacie, a AbiWord potrafi wiernie odczytywa? pliki typu RTF.</c></p>
- </section>
- <data>
--<d name="E:\nowyAbiWord\abiword-doc\docs 9.1\ok---howto\howtoword.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/howtoword.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg
- Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp
-diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw
---- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw	2004-07-28 19:00:11.576418627 +0100
-+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw	2004-07-28 19:00:49.962268173 +0100
-@@ -25,24 +25,24 @@
- <p style="Heading 1"><c props="lang:pl-PL">Obszar roboczy </c><c props="lang:pl-PL"></c>AbiWorda</p>
- <p style="Normal">Obszar roboczy jest podobny do tych, jakie znamy z innych edytor?w tekstu. Dlatego ka?dy nowy u?ytkownik <c props="lang:en-US">AbiWorda mo?e si? czu? jak u siebie w domu</c><c props="lang:en-US"></c>.</p>
- <p style="doc_normal"></p>
--<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" props="height:3.68in; width:6.96in"/></p>
-+<p style="doc_normal" props="text-indent:0.0000in; text-align:center"><image dataid="/usr/src/abiword/commit/full_window.png_0" props="height:3.68in; width:6.96in"/></p>
- <p style="doc_normal"></p>
- <p level="1" listid="0" parentid="0" style="Normal">Znajomy interfejs pozwala wi?kszo?ci u?ytkownikom <c props="lang:en-US">od razu rozpocz?? prac?</c><c props="lang:en-US"></c>. Tym niemniej niekt?re mo?liwo?ci b?d? nowo?ci?.</p>
- <p level="1" listid="0" parentid="0" style="Normal"></p>
- <p level="1" listid="0" parentid="0" style="Heading 3">Okno tytu?u</p>
- <p level="1" listid="0" parentid="0" style="doc_normal" props="text-indent:-0.5000in"></p>
--<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
-+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/titlebar.png_0" props="height:0.25in; width:6.99in"/></p>
- <p level="1" listid="0" parentid="0" style="Normal"></p>
- <p level="1" listid="0" parentid="0" style="Normal">Okno tytu?u jest podobne do okien innych aplikacji, z jedn? jednak r??nic?. Zw?? uwag? na gwiazdk? * obok ?Dokument_10?. Gwiazdka oznacza, ?e ?Dokument_10? zosta? zmodyfikowany. W ten prosty spos?b AbiWord podpowiada ci, ?e dokument powinien by? zapisany.</p>
- <p level="1" listid="0" parentid="0" style="Heading 3">Paski funkcji</p>
--<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
-+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars.png_0" props="height:0.90in; width:6.99in"/></p>
- <p level="1" listid="0" parentid="0" style="Normal"></p>
- <p level="1" listid="0" parentid="0" style="Normal">Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapozna? si? z AbiWordem. Najlepiej po prostu przejrzyj ka?de menu, wtedy poznasz wszystkie komendy, jakich AbiWord mo?e u?y? do dokument?w.</p>
- <p level="1" listid="0" parentid="0" style="Normal">Drugi to pasek ?Standardowy?, trzeci z wy?ej pokazanych (na dole) to pasek "Formatowanie".</p>
- <p level="1" listid="0" parentid="0" style="Heading 3">Paski robocze</p>
- <p level="1" listid="0" parentid="0" style="Normal">AbiWord pozwala na ukrywanie pask?w narz?dzi. Je?li kt?rego? brakuje albo nie jest potrzebny, sprawd? w Widok &gt; Paski narz?dzi.</p>
- <p level="1" listid="0" parentid="0" style="Normal"></p>
--<p level="1" listid="0" parentid="0" style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
-+<p level="1" listid="0" parentid="0" style="Normal"><image dataid="/usr/src/abiword/commit/functionbars_hiding.png_1" props="height:1.67in; width:3.54in"/></p>
- <p style="Heading 3">Pasek uchwytu</p>
- <p style="doc_normal"></p>
- <p style="Normal" props="text-align:left"><image dataid="/usr/src/abiword/commit/images/grabbar_shaded.png_0" props="height:1.08in; width:1.35in"/></p>
-@@ -50,14 +50,14 @@
- <p style="Normal" props="lang:en-US">U?ytkownicy, kt?rzy uruchamiaj? AbiWorda w ?rodowisku GNOME, znajd? pasek uchwytu umieszczony na skraju lewej cz??ci ka?dego z pask?w narz?dziowych, kt?ry pozwala w prosty spos?b zmodyfikowa? interfejs wedle ?yczenia. Kliknij na pasek uchwytu i przeci?gnij. Pasek narz?dziowy b?dzie przesuwa? si? wzd?u? toru myszki, mo?e nawet wisie? nad dowoln? cz??ci? ekranu.</p>
- <p style="Heading 3">Pasek statusu</p>
- <p style="doc_normal"></p>
--<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
-+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar.png_0" props="height:0.24in; width:6.96in"/></p>
- <p style="doc_normal" props="text-indent:0.5000in; margin-left:0.0000in"></p>
- <p style="Normal" props="text-indent:0.5000in">W pasku statusu znajdziesz skr?towy opis statusu dokumentu. W lewej cz??ci paska<c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"> AbiWord</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; font-size:12pt; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c> wy?wietla kolejny numer strony oraz liczb? wszystkich stron. Nast?pnie w ?rodkowej cz??ci, kt?ra najcz??ciej jest pusta, wy?wietlany jest kr?tki pomocniczy opis bie??cej opcji menu. W prawej cz??ci paska podany jest tryb pracy klawiatury (<c props="font-weight:bold">+INS</c>, czyli tryb wstawiania, albo <c props="font-weight:bold">-ins</c>, czyli tryb zast?powania) oraz nazwa aktualnego szablonu.</p>
- <p style="Normal" props="text-indent:0.5000in"></p>
--<p style="Normal" props="text-indent:0.0000in"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
-+<p style="Normal" props="text-indent:0.0000in"><image dataid="/usr/src/abiword/commit/statusbar_quickhelp.png_0" props="height:2.48in; width:6.97in"/></p>
- <p style="Heading 3">Linijka</p>
- <p style="doc_normal"></p>
--<p style="Normal"><image dataid="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" props="height:0.34in; width:8.85in"/></p>
-+<p style="Normal"><image dataid="/usr/src/abiword/commit/ruler.png_0" props="height:0.34in; width:8.85in"/></p>
- <p style="Normal"></p>
- <p style="Normal">U?ywaj?c linijki mo?esz w ?atwy spos?b definiowa? <c props="lang:en-US">na stronie </c><c props="lang:en-US"></c>marginesy oraz tabulatory.</p>
- </section>
-@@ -65,7 +65,7 @@
- <p style="Normal" props="text-align:left"></p>
- </section>
- <data>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\full_window.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/full_window.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi
- d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK
-@@ -1458,7 +1458,7 @@
- Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW
- iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg==
- </d>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\titlebar.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/titlebar.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As
- qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at
-@@ -1824,7 +1824,7 @@
- U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT
- F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC
- </d>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/statusbar_quickhelp.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii
- kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty
-@@ -2753,7 +2753,7 @@
- rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA
- AElFTkSuQmCC
- </d>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\statusbar.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/statusbar.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc
- 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L
-@@ -2837,7 +2837,7 @@
- pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/
- vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg==
- </d>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/functionbars.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t
- ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU
-@@ -3416,7 +3416,7 @@
- bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV
- AAAAAElFTkSuQmCC
- </d>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\ruler.png_0" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/ruler.png_0" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H
- c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA
-@@ -3486,7 +3486,7 @@
- 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m
- FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII=
- </d>
--<d name="D:\Dane\ap-ABIword\abiword-doc9.1b\docs 9.1\images\functionbars_hiding.png_1" mime-type="image/png" base64="yes">
-+<d name="/usr/src/abiword/commit/functionbars_hiding.png_1" mime-type="image/png" base64="yes">
- iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78
- AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8
- ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3

Added: contrib/1.1/abiword/current/sources/abiword-2.2.4.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/abiword/current/sources/abiword-2.2.4.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/1.1/abiword/current/specs/abiword.spec
===================================================================
--- contrib/1.1/abiword/current/specs/abiword.spec	2005-02-25 19:56:37 UTC (rev 6103)
+++ contrib/1.1/abiword/current/specs/abiword.spec	2005-02-26 23:47:20 UTC (rev 6104)
@@ -2,11 +2,11 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.0.14
+Version: 2.2.4
 Release: 1gd
 Group: contrib
 License: GPL
-Source: http://prdownloads.sourceforge.net/abiword/abiword-%{version}.tar.bz2
+Source: http://prdownloads.sourceforge.net/abiword/abiword-%{version}.tar.gz
 Source11: abiword.mime
 Requires: libxml2 >= 2.6.8 libglade fribidi
 
@@ -20,17 +20,12 @@
 
 URL: http://www.abisource.com/
 
-Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.0.11-desktop.patch
-
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
 AbiWord full-featured, and remain lean.
 
 %prep
 %setup -q 
-%patch0 -p1 -b .windowshelppaths
-%patch1 -p1 -b .desktop
 
 %build
 cd abi
@@ -46,7 +41,7 @@
 
 # now make the docs
 cd ../abiword-docs
-ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.0 ./make-html.sh
+ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.2 ./make-html.sh
 
 %install
 cd abi
@@ -56,20 +51,20 @@
 
 # install the docs
 cd ../abiword-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.0/AbiWord/help
-cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.0/AbiWord/help/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help
+cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/
 # some of the help dirs have bad perms (#109261)
-find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.0/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
+find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.0/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
+cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.2/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
 install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/ttf*
 # nuke .la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.0/plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.2/plugins/*.la
 
 %if %{icewm_menu}
 mkdir -p %{buildroot}%{_datadir}/icewm/programs
@@ -90,11 +85,11 @@
 %files
 %defattr(-,root,root)
 %doc abi/docs 
-%{_bindir}/AbiWord-2.0
+%{_bindir}/AbiWord-2.2
 %{_bindir}/abiword
-%{_libdir}/AbiWord-2.0
-%{_libdir}/bonobo/servers/*
-%{_datadir}/AbiSuite-2.0
+%{_libdir}/AbiWord-2.2
+%exclude %{_libdir}/bonobo/servers
+%{_datadir}/AbiSuite-2.2
 %{_datadir}/applications/*
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/*png
@@ -105,6 +100,9 @@
 
 
 %changelog
+* Sun Feb 27 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.4-1gd
+- 2.2.4
+
 * Sun Nov 28 2004 Gerald Dachs <gda at tinysofa dot org> 2.0.14-1gd
 - new upstream version