From svn at tinysofa.org  Fri Oct  1 07:22:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  1 Oct 2004 03:22:53 -0400 (EDT)
Subject: [tinysofa-svn] r4901 - in contrib/1.1/icewm/current: sources specs
Message-ID: <20041001072253.6BC88344189@minbar.tinysofa.org>

Author: jh
Date: 2004-10-01 03:22:52 -0400 (Fri, 01 Oct 2004)
New Revision: 4901

Added:
   contrib/1.1/icewm/current/sources/icewm-programs.sh
Modified:
   contrib/1.1/icewm/current/sources/icewm-menu
   contrib/1.1/icewm/current/specs/icewm.spec
Log:
- add programs menu framework

Modified: contrib/1.1/icewm/current/sources/icewm-menu
===================================================================
--- contrib/1.1/icewm/current/sources/icewm-menu	2004-09-30 22:09:06 UTC (rev 4900)
+++ contrib/1.1/icewm/current/sources/icewm-menu	2004-10-01 07:22:52 UTC (rev 4901)
@@ -10,5 +10,5 @@
 menuprog Gnome folder icewm-menu-gnome1 --list 
 menuprog Gnome folder icewm-menu-gnome2 --list 
 menuprog KDE folder icewm-menu-gnome --list 
-menufile Programs folder programs
+menuprog Programs folder icewm-programs
 menufile Tool_bar folder toolbar

Added: contrib/1.1/icewm/current/sources/icewm-programs.sh
===================================================================
--- contrib/1.1/icewm/current/sources/icewm-programs.sh	2004-09-30 22:09:06 UTC (rev 4900)
+++ contrib/1.1/icewm/current/sources/icewm-programs.sh	2004-10-01 07:22:52 UTC (rev 4901)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# this script generates icewm Programs menu
+#
+# JH <jh at tinysofa.org>
+
+SYSMENUDIR=/usr/share/icewm/programs
+USERMENUDIR=~/.icewm/programs
+
+for f in "$SYSMENUDIR"/* "$USERMENUDIR"/*; do
+	cat "$f"
+done 2> /dev/null | sort -k 2


Property changes on: contrib/1.1/icewm/current/sources/icewm-programs.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: contrib/1.1/icewm/current/specs/icewm.spec
===================================================================
--- contrib/1.1/icewm/current/specs/icewm.spec	2004-09-30 22:09:06 UTC (rev 4900)
+++ contrib/1.1/icewm/current/specs/icewm.spec	2004-10-01 07:22:52 UTC (rev 4901)
@@ -1,13 +1,14 @@
 Summary: A fast, small X Window System window manager.
 Name: icewm
 Version: 1.2.16
-Release: 3jh
+Release: 3.99jh
 License: LGPL
 Group: contrib
 Source0: %{name}-%{version}.tar.gz
 Source1: icewm-menu
 Source2: icewm-preferences
 Source3: icewm-programs
+Source4: icewm-programs.sh
 URL: http://icewm.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig font-utils gcc-c++ xorg-x11-devel gettext
@@ -53,8 +54,13 @@
 # install our default configuration
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icewm/menu
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icewm/preferences
-install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icewm/programs
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/icewm/programs.example
 
+# use our own system for programs menu
+rm -f %{buildroot}%{_datadir}/icewm/programs
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+install -m 755 %{SOURCE4} %{buildroot}%{_bindir}/icewm-programs
+
 %find_lang %{name}
 
 
@@ -70,6 +76,9 @@
 
 
 %changelog
+* Fri Oct  1 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.16-4jh
+- add programs menu framework
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.2.16-2jh
 - current (1.2.16-2jh) integrated as 1.2.16-2jh
 


From svn at tinysofa.org  Fri Oct  1 11:59:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  1 Oct 2004 07:59:34 -0400 (EDT)
Subject: [tinysofa-svn] r4902 - contrib/1.1/icewm/current/sources
Message-ID: <20041001115934.8EF3B344189@minbar.tinysofa.org>

Author: jh
Date: 2004-10-01 07:59:33 -0400 (Fri, 01 Oct 2004)
New Revision: 4902

Modified:
   contrib/1.1/icewm/current/sources/icewm-programs.sh
Log:
- script cleanup


Modified: contrib/1.1/icewm/current/sources/icewm-programs.sh
===================================================================
--- contrib/1.1/icewm/current/sources/icewm-programs.sh	2004-10-01 07:22:52 UTC (rev 4901)
+++ contrib/1.1/icewm/current/sources/icewm-programs.sh	2004-10-01 11:59:33 UTC (rev 4902)
@@ -6,6 +6,4 @@
 SYSMENUDIR=/usr/share/icewm/programs
 USERMENUDIR=~/.icewm/programs
 
-for f in "$SYSMENUDIR"/* "$USERMENUDIR"/*; do
-	cat "$f"
-done 2> /dev/null | sort -k 2
+cat "$SYSMENUDIR"/* "$USERMENUDIR"/* 2> /dev/null | sort -k 2


From svn at tinysofa.org  Fri Oct  1 20:26:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  1 Oct 2004 16:26:21 -0400 (EDT)
Subject: [tinysofa-svn] r4903 - in contrib/1.1/icewm/current: sources specs
Message-ID: <20041001202621.7C854344189@minbar.tinysofa.org>

Author: gda
Date: 2004-10-01 16:26:21 -0400 (Fri, 01 Oct 2004)
New Revision: 4903

Added:
   contrib/1.1/icewm/current/sources/iceicons-default-0.10.0.tar.gz
Modified:
   contrib/1.1/icewm/current/specs/icewm.spec
Log:
added some nice icons

Added: contrib/1.1/icewm/current/sources/iceicons-default-0.10.0.tar.gz
===================================================================
(Binary files differ)


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

Modified: contrib/1.1/icewm/current/specs/icewm.spec
===================================================================
--- contrib/1.1/icewm/current/specs/icewm.spec	2004-10-01 11:59:33 UTC (rev 4902)
+++ contrib/1.1/icewm/current/specs/icewm.spec	2004-10-01 20:26:21 UTC (rev 4903)
@@ -1,7 +1,7 @@
 Summary: A fast, small X Window System window manager.
 Name: icewm
 Version: 1.2.16
-Release: 3.99jh
+Release: 4gd
 License: LGPL
 Group: contrib
 Source0: %{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Source2: icewm-preferences
 Source3: icewm-programs
 Source4: icewm-programs.sh
+Source5: iceicons-default-0.10.0.tar.gz
 URL: http://icewm.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig font-utils gcc-c++ xorg-x11-devel gettext
@@ -27,6 +28,9 @@
 
 %prep
 %setup -q
+mkdir iceicons
+cd iceicons
+tar -xzf %{SOURCE5}
 
 
 %build
@@ -61,6 +65,14 @@
 mkdir -p %{buildroot}%{_datadir}/icewm/programs
 install -m 755 %{SOURCE4} %{buildroot}%{_bindir}/icewm-programs
 
+# install some nice icons
+install -d -m 755 %{buildroot}%{_datadir}/icewm/icons/menuitems
+install -m 644 iceicons/icons/*.png %{buildroot}%{_datadir}/icewm/icons
+install -m 644 iceicons/icons/*.xpm %{buildroot}%{_datadir}/icewm/icons
+install -m 644 iceicons/icons/menuitems/*.png %{buildroot}%{_datadir}/icewm/icons/menuitems
+install -m 644 iceicons/icons/menuitems/*.xpm %{buildroot}%{_datadir}/icewm/icons/menuitems
+install -m 644 iceicons/winoptions %{buildroot}%{_datadir}/icewm
+
 %find_lang %{name}
 
 
@@ -71,11 +83,15 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README COPYING CHANGES TODO BUGS doc/*.sgml
+%doc iceicons/CHANGELOG iceicons/README iceicons/TODO
 %{_datadir}/icewm
 %{_bindir}/*
 
 
 %changelog
+* Fri Oct  1 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.16-5gd
+- added some nice icons
+
 * Fri Oct  1 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.16-4jh
 - add programs menu framework
 


From svn at tinysofa.org  Sat Oct  2 08:28:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Oct 2004 04:28:21 -0400 (EDT)
Subject: [tinysofa-svn] r4904 - contrib/1.1/mach/current/sources
Message-ID: <20041002082821.5FD7434418D@minbar.tinysofa.org>

Author: jh
Date: 2004-10-02 04:28:20 -0400 (Sat, 02 Oct 2004)
New Revision: 4904

Modified:
   contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch
Log:
- fix mach-0.4.6-tinysofa.patch

Modified: contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch
===================================================================
--- contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch	2004-10-01 20:26:21 UTC (rev 4903)
+++ contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch	2004-10-02 08:28:20 UTC (rev 4904)
@@ -120,8 +120,8 @@
          #FIXME: add mach user and group
          self.do_chroot ("echo %s:x:500:500::/usr/src/rpm:/bin/bash >> /etc/passwd" % builduser, fatal = True)
          self.do_chroot ("echo %s::500:%s >> /etc/group" % (buildgroup, builduser), fatal = True)
--        self.do_chroot ("mkdir -m 775 -p /usr/src/rpm", fatal = True)
-+        self.do_chroot ("mkdir -p /usr/src/rpm", fatal = True)
+-        self.do_chroot ("mkdir -p /usr/src/rpm", fatal = True)
++        self.do_chroot ("mkdir -m 775 -p /usr/src/rpm", fatal = True)
          self.do_chroot ("chown -R %s:%s /usr/src/rpm" % (builduser, buildgroup), fatal = True)
          self.do_chroot ("su -c 'cp -p /etc/skel/.bashrc /usr/src/rpm/.bashrc || cp -p /etc/bashrc /usr/src/rpm/.bashrc || :' %s" % builduser, fatal = True)
  


From svn at tinysofa.org  Sat Oct  2 12:27:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Oct 2004 08:27:55 -0400 (EDT)
Subject: [tinysofa-svn] r4905 - in contrib/1.1/star/current: sources specs
Message-ID: <20041002122755.9EBCB34418F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-02 08:27:54 -0400 (Sat, 02 Oct 2004)
New Revision: 4905

Added:
   contrib/1.1/star/current/sources/star-1.5a49.tar.bz2
Removed:
   contrib/1.1/star/current/sources/star-1.5a40.tar.bz2
Modified:
   contrib/1.1/star/current/specs/star.spec
Log:
- 1.5a49
- add spax manual page


Deleted: contrib/1.1/star/current/sources/star-1.5a40.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/1.1/star/current/sources/star-1.5a49.tar.bz2
===================================================================
(Binary files differ)


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

Modified: contrib/1.1/star/current/specs/star.spec
===================================================================
--- contrib/1.1/star/current/specs/star.spec	2004-10-02 08:28:20 UTC (rev 4904)
+++ contrib/1.1/star/current/specs/star.spec	2004-10-02 12:27:54 UTC (rev 4905)
@@ -1,9 +1,9 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 0
+%if %{?with_selinux:0}%{!?with_selinux:1}
+%define with_selinux 0
 %endif
 Summary:	An archiving tool with ACL support
 Name:		star
-Version:	1.5a40
+Version:	1.5a49
 Release: 1jh
 URL:		http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html
 Source:		ftp://ftp.fokus.gmd.de/pub/unix/star/alpha/%{name}-%{version}.tar.bz2
@@ -29,7 +29,7 @@
 %patch1 -p1 -b .acl-fix
 %patch2 -p1 -b .nofsync
 %patch3 -p1 -b .davej
-%if %{WITH_SELINUX}
+%if %{with_selinux}
 %patch4 -p1 -b .selinux
 %endif
 
@@ -74,12 +74,13 @@
   %{__rm} -rf .%{_mandir}/man5
   %{__rm} -rf .%{_mandir}/man3
   %{__rm} -rf .%{_mandir}/man1/{tartest,rmt,match}.1*
+  %{__rm} -rf .%{_mandir}/man1/{gnutar,scpio,smt,suntar}.1*
   %{__rm} -rf .%{_prefix}/sbin
 )
 
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
+%clean_buildroot
 
 
 %files
@@ -90,9 +91,14 @@
 %{_bindir}/*star
 %{_bindir}/spax
 %{_mandir}/man1/star*
+%{_mandir}/man1/spax*
 
 
 %changelog
+* Sat Oct  2 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.5a49-1jh
+- 1.5a49
+- add spax manual page
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.5a40-1jh
 - current (1.5a40-1jh) integrated as 1.5a40-1jh
 


From svn at tinysofa.org  Sat Oct  2 13:46:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Oct 2004 09:46:23 -0400 (EDT)
Subject: [tinysofa-svn] r4906 - contrib/1.1/nedit/current/specs
Message-ID: <20041002134623.3EF6834418F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-02 09:46:22 -0400 (Sat, 02 Oct 2004)
New Revision: 4906

Modified:
   contrib/1.1/nedit/current/specs/nedit.spec
Log:
- add icewm menu file

Modified: contrib/1.1/nedit/current/specs/nedit.spec
===================================================================
--- contrib/1.1/nedit/current/specs/nedit.spec	2004-10-02 12:27:54 UTC (rev 4905)
+++ contrib/1.1/nedit/current/specs/nedit.spec	2004-10-02 13:46:22 UTC (rev 4906)
@@ -2,10 +2,11 @@
 %if %{desktop_file}
 %define desktop_file_utils_version 0.2.93
 %endif
+%define icewm_menu 1
 Summary: A GUI text editor for systems with X and Motif.
 Name: nedit
 Version: 5.4
-Release: 1jh
+Release: 2jh
 Source: http://nedit.org/ftp/v5_3/nedit-%{version}-source.tar.gz
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -60,6 +61,12 @@
         --add-category "Application;Development;X-Red-Hat-Extra" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Applications/nedit.desktop
 %endif
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Nedit Editor" nedit-icon.png nedit
+__EOF__
+%endif
 
 
 %clean
@@ -77,9 +84,14 @@
 %else
 %exclude %config /etc/X11/applnk/Applications/nedit.desktop
 %endif
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
+%changelog
+* Sat Oct  2 2004 Jaakko Heinonen <jh at tinysofa dot org> 5.4-2jh
+- add icewm menu file
 
-%changelog
 * Wed Sep 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 5.4-1jh
 - tinysofa
 - build against lesstif


From svn at tinysofa.org  Sat Oct  2 15:04:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Oct 2004 11:04:55 -0400 (EDT)
Subject: [tinysofa-svn] r4907 - contrib/1.1/nedit/current/specs
Message-ID: <20041002150455.DF60334418F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-02 11:04:55 -0400 (Sat, 02 Oct 2004)
New Revision: 4907

Modified:
   contrib/1.1/nedit/current/specs/nedit.spec
Log:
- bump up release

Modified: contrib/1.1/nedit/current/specs/nedit.spec
===================================================================
--- contrib/1.1/nedit/current/specs/nedit.spec	2004-10-02 13:46:22 UTC (rev 4906)
+++ contrib/1.1/nedit/current/specs/nedit.spec	2004-10-02 15:04:55 UTC (rev 4907)
@@ -6,7 +6,7 @@
 Summary: A GUI text editor for systems with X and Motif.
 Name: nedit
 Version: 5.4
-Release: 2jh
+Release: 3jh
 Source: http://nedit.org/ftp/v5_3/nedit-%{version}-source.tar.gz
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -89,7 +89,7 @@
 %endif
 
 %changelog
-* Sat Oct  2 2004 Jaakko Heinonen <jh at tinysofa dot org> 5.4-2jh
+* Sat Oct  2 2004 Jaakko Heinonen <jh at tinysofa dot org> 5.4-3jh
 - add icewm menu file
 
 * Wed Sep 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 5.4-1jh


From svn at tinysofa.org  Sat Oct  2 23:17:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Oct 2004 19:17:46 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4908 - in contrib/1.1/firefox/current: sources specs
Message-ID: <20041002231746.C1F0134418F@minbar.tinysofa.org>

Author: gda
Date: 2004-10-02 19:17:46 -0400 (Sat, 02 Oct 2004)
New Revision: 4908

Added:
   contrib/1.1/firefox/current/sources/firefox-1.0PR-source.tar.bz2
Removed:
   contrib/1.1/firefox/current/sources/firefox-0.9.2-extensions.patch
   contrib/1.1/firefox/current/sources/firefox-0.9.2-gcc34.patch
   contrib/1.1/firefox/current/sources/firefox-0.9.2-nsFormHistory-64bit.patch
   contrib/1.1/firefox/current/sources/firefox-0.9.3-source.tar.bz2
Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
new upstream version

Deleted: contrib/1.1/firefox/current/sources/firefox-0.9.2-extensions.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-0.9.2-extensions.patch	2004-10-02 15:04:55 UTC (rev 4907)
+++ contrib/1.1/firefox/current/sources/firefox-0.9.2-extensions.patch	2004-10-02 23:17:46 UTC (rev 4908)
@@ -1,153 +0,0 @@
-Index: toolkit/mozapps/extensions/public/nsIExtensionManager.idl
-===================================================================
-RCS file: /cvsroot/mozilla/toolkit/mozapps/extensions/public/nsIExtensionManager.idl,v
-retrieving revision 1.2.6.5
-diff -p -u -8 -r1.2.6.5 nsIExtensionManager.idl
---- toolkit/mozapps/extensions/public/nsIExtensionManager.idl	8 Jun 2004 10:09:55 -0000	1.2.6.5
-+++ toolkit/mozapps/extensions/public/nsIExtensionManager.idl	13 Jul 2004 10:14:33 -0000
-@@ -58,16 +58,18 @@ interface nsIExtensionManager : nsISuppo
- 
-   /** 
-    * Returns true if mismatches were found and the app needs to restart. 
-    */
-   boolean checkForMismatches();
- 
-   void handleCommandLineArgs();
- 
-+  void register();
-+
-   // Installing Extensions
-   const unsigned long FLAG_INSTALL_PROFILE = 0x01;
-   const unsigned long FLAG_INSTALL_GLOBAL  = 0x02;
- 
-   void installExtension(in nsIFile aXPIFile, in unsigned long aFlags);
-   void uninstallExtension(in string aExtensionID);
-   void enableExtension(in string aExtensionID);
-   void disableExtension(in string aExtensionID);
-Index: toolkit/mozapps/extensions/src/nsExtensionManager.js.in
-===================================================================
-RCS file: /cvsroot/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in,v
-retrieving revision 1.5.6.38
-diff -p -u -8 -r1.5.6.38 nsExtensionManager.js.in
---- toolkit/mozapps/extensions/src/nsExtensionManager.js.in	13 Jul 2004 08:08:35 -0000	1.5.6.38
-+++ toolkit/mozapps/extensions/src/nsExtensionManager.js.in	13 Jul 2004 10:14:38 -0000
-@@ -102,17 +102,16 @@ function getDirNoCreate(aKey, aSubDirs)
- {
-   return getDirInternal(aKey, aSubDirs, false);
- }
- 
- function getDirInternal(aKey, aSubDirs, aCreate)
- {
-   var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
-                               .getService(Components.interfaces.nsIProperties);
--  
-   var dir = fileLocator.get(aKey, Components.interfaces.nsIFile);
-   for (var i = 0; i < aSubDirs.length; ++i) {
-     dir.append(aSubDirs[i]);
-     if (aCreate && !dir.exists())
-       dir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
-   }
-   return dir;
- }
-@@ -1443,16 +1442,17 @@ function nsExtensionManager()
- 
-   ensureExtensionsFiles(false);
- }
- 
- nsExtensionManager.prototype = {
-   _extInstaller     : null,
-   _extUninstaller   : null,
-   _extEnabler       : null,
-+  _started          : false,
-   
-   /////////////////////////////////////////////////////////////////////////////
-   // nsIObserver
-   observe: function (aSubject, aTopic, aData)
-   {
-     switch (aTopic) {
-     case "quit-application-requested":
-       if (this._downloadCount > 0) {
-@@ -1489,16 +1489,18 @@ nsExtensionManager.prototype = {
-         PRBool.data = result;
-       }
-       break;  
-     }
-   },
-   
-   start: function (aIsDirty)
-   {
-+    this._started = true;
-+    
-     var needsRestart = false;
-   
-     ensureExtensionsFiles(true);
-     
-     // Somehow the component list went away, and for that reason the new one
-     // generated by this function is going to result in a different compreg.
-     // We must force a restart.
-     var componentList = getFile(KEY_PROFILEDIR, [FILE_COMPONENT_MANIFEST]);
-@@ -1637,16 +1639,33 @@ nsExtensionManager.prototype = {
-     var unlocked = cmdLineSvc.getCmdLineValue("-unlock-item");
-     if (unlocked) {
-       this._ensureDS();
-       this._ds.lockUnlockItem(unlocked, false);
-     }
-     
-     this._finishOperations();
-   },
-+  
-+  register: function ()
-+  {
-+    if (!this._started) {
-+      // Loads the datasource and installs any pre-configured items.
-+      this._ds = new nsExtensionsDataSource();
-+      this._ds.loadExtensions(false);
-+      
-+      // Write bin/extensions/Extensions.rdf
-+      //       bin/extensions/installed-extensions-processed.txt
-+      (new nsInstalledExtensionReader(this)).read();
-+
-+      // Write bin/components.ini
-+      var manifest = getFile(KEY_APPDIR, [FILE_COMPONENT_MANIFEST]);
-+      this._writeProfileFile(manifest, this._getComponentsDir, false);
-+    }
-+  },
- 
-   _cancelDownloads: function ()
-   {
-     var os = Components.classes["@mozilla.org/observer-service;1"]
-                         .getService(Components.interfaces.nsIObserverService);
-     for (var i = 0; i < this._transactions.length; ++i)
-       os.notifyObservers(this._transactions[i], "xpinstall-progress", "cancel");
-     os.removeObserver(this, "offline-requested");
-Index: toolkit/xre/nsAppRunner.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/toolkit/xre/nsAppRunner.cpp,v
-retrieving revision 1.27.2.1.4.32
-diff -p -u -8 -r1.27.2.1.4.32 nsAppRunner.cpp
---- toolkit/xre/nsAppRunner.cpp	7 Jul 2004 21:39:06 -0000	1.27.2.1.4.32
-+++ toolkit/xre/nsAppRunner.cpp	13 Jul 2004 10:14:43 -0000
-@@ -1703,16 +1703,22 @@ int xre_main(int argc, char* argv[], con
-     NS_ENSURE_SUCCESS(rv, 1);
- 
-     {
-       nsCOMPtr<nsIChromeRegistry> chromeReg
-         (do_GetService("@mozilla.org/chrome/chrome-registry;1"));
-       NS_ENSURE_TRUE(chromeReg, 1);
- 
-       chromeReg->CheckForNewChrome();
-+
-+      nsCOMPtr<nsIExtensionManager> em
-+        (do_GetService("@mozilla.org/extensions/manager;1"));
-+      NS_ENSURE_TRUE(em, 1);
-+
-+      em->Register();
-     }
-     return 0;
-   }
- 
- #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
-   // setup for private colormap.  Ideally we'd like to do this
-   // in nsAppShell::Create, but we need to get in before gtk
-   // has been initialized to make sure everything is running
-

Deleted: contrib/1.1/firefox/current/sources/firefox-0.9.2-gcc34.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-0.9.2-gcc34.patch	2004-10-02 15:04:55 UTC (rev 4907)
+++ contrib/1.1/firefox/current/sources/firefox-0.9.2-gcc34.patch	2004-10-02 23:17:46 UTC (rev 4908)
@@ -1,11 +0,0 @@
---- mozilla/xpinstall/src/nsSoftwareUpdate.cpp.orig	2004-06-16 12:58:28.236052698 +0300
-+++ mozilla/xpinstall/src/nsSoftwareUpdate.cpp	2004-06-16 12:58:33.812430303 +0300
-@@ -512,7 +512,7 @@
-                                          nsSoftwareUpdate::GetInstance)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallTrigger)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion)
--NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPInstallManager);
-+NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPInstallManager)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsSoftwareUpdateNameSet)
- 
- //----------------------------------------------------------------------

Deleted: contrib/1.1/firefox/current/sources/firefox-0.9.2-nsFormHistory-64bit.patch
===================================================================
--- contrib/1.1/firefox/current/sources/firefox-0.9.2-nsFormHistory-64bit.patch	2004-10-02 15:04:55 UTC (rev 4907)
+++ contrib/1.1/firefox/current/sources/firefox-0.9.2-nsFormHistory-64bit.patch	2004-10-02 23:17:46 UTC (rev 4908)
@@ -1,11 +0,0 @@
---- toolkit/components/satchel/src/nsFormHistory.cpp.~1~	2004-03-17 17:52:51.000000000 -0800
-+++ toolkit/components/satchel/src/nsFormHistory.cpp	2004-07-29 22:06:01.488644861 -0700
-@@ -745,7 +745,7 @@
-     for (i = 0; i < count; ++i)
-       items[i] = i;
- 
--    NS_QuickSort(items, count, sizeof(nsIMdbRow*),
-+    NS_QuickSort(items, count, sizeof(PRUint32),
-                  SortComparison, &matchingValues);
- 
-     for (i = 0; i < count; ++i) {

Deleted: contrib/1.1/firefox/current/sources/firefox-0.9.3-source.tar.bz2
===================================================================
(Binary files differ)

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


Property changes on: contrib/1.1/firefox/current/sources/firefox-1.0PR-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	2004-10-02 15:04:55 UTC (rev 4907)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-10-02 23:17:46 UTC (rev 4908)
@@ -7,8 +7,8 @@
 
 Summary: Mozilla Firefox web browser
 Name: firefox
-Version: 0.9.3
-Release: 1jh
+Version: 1.0PR
+Release: 1gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -18,11 +18,8 @@
 Source2: firefox.png
 Source3: bookmarks.html
 Source4: firefox.xpm
-Patch0: firefox-0.9.2-gcc34.patch
-Patch1: firefox-0.9.2-extensions.patch
 Patch2: firefox-0.9.3-uri.patch
 Patch3: mozilla-default-plugin-less-annoying.patch
-Patch4: firefox-0.9.2-nsFormHistory-64bit.patch
 Patch5: mozilla-1.7-psfonts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -42,11 +39,8 @@
 
 %prep
 %setup -q -n mozilla
-%patch0 -p1 -b .gcc34
-%patch1 -p0 -b .extensions
 %patch2 -p0 -b .uri
 %patch3 -p1 -b .plugin
-%patch4 -b .nsformhistory
 %patch5 -p1 -b .psfonts
 
 ### FIXME: Shouldn't the default firefox config be part of original source ?
@@ -208,6 +202,9 @@
 %{_datadir}/pixmaps/firefox.png
 
 %changelog
+* Sat Oct  2 2004 Gerald Dachs <gda at tinysofa dot de> 1.0PR
+- new upstream
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.9.3-1jh
 - current (0.9.3-1jh) integrated as 0.9.3-1jh
 


From svn at tinysofa.org  Sun Oct  3 16:12:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  3 Oct 2004 12:12:13 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4909 - in contrib/1.1: . kaffe kaffe/current kaffe/current/sources
	kaffe/current/specs
Message-ID: <20041003161213.B1F79344198@minbar.tinysofa.org>

Author: gda
Date: 2004-10-03 12:12:12 -0400 (Sun, 03 Oct 2004)
New Revision: 4909

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

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


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

Added: contrib/1.1/kaffe/current/specs/kaffe.spec
===================================================================
--- contrib/1.1/kaffe/current/specs/kaffe.spec	2004-10-02 23:17:46 UTC (rev 4908)
+++ contrib/1.1/kaffe/current/specs/kaffe.spec	2004-10-03 16:12:12 UTC (rev 4909)
@@ -0,0 +1,49 @@
+Summary: A free virtual machine to run Java(tm) code
+Name: kaffe
+Version: 1.1.4
+Release: 1gd
+Copyright: GPL
+Vendor: Transvirtual Technologies, Inc.
+Url: http://www.kaffe.org
+Group: contrib
+Source0: ftp://ftp.transvirtual.com/pub/kaffe/kaffe-%{version}.tar.gz
+BuildRequires: gmp-devel gcc-c++
+Buildroot: /var/tmp/kaffe-%{version}-root
+
+%description
+This is Kaffe, a virtual machine designed to execute Java bytecode.
+This machine can be configured in two modes.  In one mode it operates as
+a pure bytecode interpreter (not unlike Javasoft's machine); in the second
+mode if performs "just-in-time" code conversion from the abstract code to
+the host machine's native code.  This will ultimately allow execution of
+Java code at the same speed as standard compiled code but while maintaining
+the advantages and flexibility of code independence.
+
+%prep
+%setup -q
+%build
+./configure --prefix=/usr --libexecdir=%{_libdir}/kaffe/bin --mandir=%{_mandir}
+
+make
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+%clean_buildroot
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.* docs/* FAQ
+%doc INSTALL RELEASE-NOTES license-lesser.terms THIRDPARTY
+%doc license.terms WHATSNEW license-w3c.terms      
+/usr/*
+
+%changelog
+* Sat Oct  2 2004 Gerald Dachs <gda at tinysofa dot de> 1.1.4-1gd
+- new in contrib
+


From svn at tinysofa.org  Sun Oct  3 19:35:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  3 Oct 2004 15:35:40 -0400 (EDT)
Subject: [tinysofa-svn] r4910 - contrib/1.1/firefox/current/specs
Message-ID: <20041003193540.504AC344199@minbar.tinysofa.org>

Author: gda
Date: 2004-10-03 15:35:39 -0400 (Sun, 03 Oct 2004)
New Revision: 4910

Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
small changes

Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2004-10-03 16:12:12 UTC (rev 4909)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-10-03 19:35:39 UTC (rev 4910)
@@ -4,11 +4,12 @@
 %{?dist: %{expand: %%define %dist 1}}
 
 %define _without_freedesktop 1
+%define icewm_menu 1
 
 Summary: Mozilla Firefox web browser
 Name: firefox
 Version: 1.0PR
-Release: 1gd
+Release: 2gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -176,6 +177,16 @@
 ### Clean up buildroot
 find %{buildroot}%{_libdir}/firefox/chrome/*/ -type d -exec %{__rmdir} -p {} \; &>/dev/null
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Firefox Web Browser"              firefox.xpm firefox
+__EOF__
+%endif
+
+# compatiblity link
+%{__ln_s} -f %{_libdir}/firefox  %{buildroot}%{_libdir}/mozilla
+
 %post
 /sbin/ldconfig 2>/dev/null
 umask 022
@@ -199,10 +210,19 @@
 %doc LEGAL LICENSE README.txt
 %{_bindir}/firefox
 %{_libdir}/firefox/
+%{_libdir}/mozilla
 %{_datadir}/pixmaps/firefox.png
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
+
 %changelog
-* Sat Oct  2 2004 Gerald Dachs <gda at tinysofa dot de> 1.0PR
+* Sun Oct  3 2004 Gerald Dachs <gda at tinysofa dot de> 1.0PR-2gd
+- added icewm menu file
+- added compatiblity link
+
+* Sat Oct  2 2004 Gerald Dachs <gda at tinysofa dot de> 1.0PR-1gd
 - new upstream
 
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.9.3-1jh


From svn at tinysofa.org  Sun Oct  3 21:27:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  3 Oct 2004 17:27:18 -0400 (EDT)
Subject: [tinysofa-svn] r4911 - in contrib/1.1/mach/current: sources specs
Message-ID: <20041003212718.1790F34419C@minbar.tinysofa.org>

Author: jh
Date: 2004-10-03 17:27:16 -0400 (Sun, 03 Oct 2004)
New Revision: 4911

Modified:
   contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch
   contrib/1.1/mach/current/specs/mach.spec
Log:
- update tinysofa patch to fix various permissions errors caused by 077
  umask


Modified: contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch
===================================================================
--- contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch	2004-10-03 19:35:39 UTC (rev 4910)
+++ contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch	2004-10-03 21:27:16 UTC (rev 4911)
@@ -1,5 +1,5 @@
---- mach-0.4.6/scripts/mach.in.tinysofa	2004-09-30 22:22:02.831707176 +0300
-+++ mach-0.4.6/scripts/mach.in	2004-09-30 22:19:14.584284672 +0300
+--- mach-0.4.6/scripts/mach.in.tinysofa	2004-07-05 13:21:49.000000000 +0300
++++ mach-0.4.6/scripts/mach.in	2004-10-04 00:13:14.768602192 +0300
 @@ -5,7 +5,7 @@
  #
  # script to set up a chroot using packages and optionally perform builds in it
@@ -27,7 +27,7 @@
                  # sanity check the given file using "file"
                  # crap, this completely hangs on fedora core 0.94 :(
  #                command = "file -b -i -z %s" % file
-@@ -694,7 +696,7 @@
+@@ -694,23 +696,23 @@
                  shutil.copy2 (file, os.path.join (self.rootdir, 'tmp'))
                  self.do_chroot ("cd / && mv %s %s" % (
                                  os.path.join ('tmp', os.path.basename (file)),
@@ -36,17 +36,19 @@
  
              # remove the spec if it existed, then copy
              self.do_chroot ("cd / && rm -f %s" % (
-@@ -702,7 +704,7 @@
+                                 os.path.join ('tmp', os.path.basename (specfile))))
              shutil.copy2 (specfile, os.path.join (self.rootdir, 'tmp'))
-             self.do_chroot ("cd / && mv %s %s" % (
+-            self.do_chroot ("cd / && mv %s %s" % (
++            self.do_chroot ("umask 002;cd / && mv %s %s" % (
                              os.path.join ('tmp', os.path.basename (specfile)),
 -                            os.path.join ('usr', 'src', 'rpm', 'SPECS')))
 +                            os.path.join ('usr', 'src', 'rpm', 'specs')))
              # fix ownership on all of these
              self.do_chroot ("cd /usr/src/rpm && chown -R %s:%s *" %
                              (builduser, buildgroup))
-@@ -710,7 +712,7 @@
-                 self.do_chroot ("cd / && %s %s -bs --nodeps %s" \
+             try:
+-                self.do_chroot ("cd / && %s %s -bs --nodeps %s" \
++                self.do_chroot ("umask 002;cd / && %s %s -bs --nodeps %s" \
                                  % (self.config['root_rpmbuild'],
                                     optstring,
 -                                   os.path.join ('usr', 'src', 'rpm', 'SPECS',
@@ -74,7 +76,7 @@
 -            command = 'cp /usr/src/rpm/SPECS/%s /tmp/%s' % (specfile, specfile)
 +            command = 'cp /usr/src/rpm/specs/%s /tmp/%s' % (specfile, specfile)
 +            self.do_chroot (command)
-+            command = 'chmod 644 /tmp/%s' % specfile
++            command = 'chmod 644 /tmp/%s /usr/src/rpm/{specs,sources}/*' % specfile
              self.do_chroot (command)
 +
              # copy specfile to resultdir
@@ -103,7 +105,7 @@
              # this is fine now since we check for met buildrequires before.
  
 -            command = "su -c \"RPM_BUILD_NCPUS=%s %s --nodeps -ba %s /usr/src/rpm/SPECS/%s 2>&1\" - %s" % (nrcpus, self.config['root_rpmbuild'], join_quoted (options), specfile, builduser)
-+            command = "su -c \"RPM_BUILD_NCPUS=%s %s --nodeps -ba %s /usr/src/rpm/specs/%s 2>&1\" - %s" % (nrcpus, self.config['root_rpmbuild'], join_quoted (options), specfile, builduser)
++            command = "su -c \"umask 002; RPM_BUILD_NCPUS=%s %s --nodeps -ba %s /usr/src/rpm/specs/%s 2>&1\" - %s" % (nrcpus, self.config['root_rpmbuild'], join_quoted (options), specfile, builduser)
              (status, output) = self.do_chroot (command,
                                                 "Rebuilding source rpm %s" % srpmname,
                                                 True)

Modified: contrib/1.1/mach/current/specs/mach.spec
===================================================================
--- contrib/1.1/mach/current/specs/mach.spec	2004-10-03 19:35:39 UTC (rev 4910)
+++ contrib/1.1/mach/current/specs/mach.spec	2004-10-03 21:27:16 UTC (rev 4911)
@@ -2,7 +2,7 @@
 
 Name: mach
 Version: 0.4.6
-Release: 6jh
+Release: 8jh
 Summary: make a chroot buildsystem
 Group: contrib
 License: GPL
@@ -114,6 +114,10 @@
 
 
 %changelog
+* Mon Oct  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-8jh
+- update tinysofa patch to fix various permissions errors caused by 077
+  umask
+
 * Wed Sep 29 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-5jh
 - update tinysofa patch
 - merge 2.0 config


From svn at tinysofa.org  Mon Oct  4 09:12:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 05:12:10 -0400 (EDT)
Subject: [tinysofa-svn] r4912 - contrib/1.1/xorg-x11/current/specs
Message-ID: <20041004091210.931053441A2@minbar.tinysofa.org>

Author: jh
Date: 2004-10-04 05:12:09 -0400 (Mon, 04 Oct 2004)
New Revision: 4912

Modified:
   contrib/1.1/xorg-x11/current/specs/xorg-x11.spec
Log:
- update how ldcondfig is run

Modified: contrib/1.1/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/1.1/xorg-x11/current/specs/xorg-x11.spec	2004-10-03 21:27:16 UTC (rev 4911)
+++ contrib/1.1/xorg-x11/current/specs/xorg-x11.spec	2004-10-04 09:12:09 UTC (rev 4912)
@@ -24,7 +24,7 @@
 # Use very future proofed version number, until we know what upstream version
 # will really be.
 Version: 6.7.0
-Release: 11jh
+Release: 12jh
 #.%{cvs_release}
 
 %define build_maintainer_mode	%( hostname -f |grep -q capslock.lan && echo 1 || echo 0)
@@ -658,7 +658,7 @@
 %endif
 Requires: %{name}-libs-data = %{version}-%{release}
 #Requires(post,postun,verify): /sbin/ldconfig grep textutils
-Prereq: /sbin/ldconfig grep textutils
+Prereq: /sbin/ldconfig
 # FIXME: Currently the same libs are present, but that's soon to change
 Provides: XFree86-libs = 4.4.0
 
@@ -1893,14 +1893,16 @@
   fi
 }
         
-%post libs -p /sbin/ldconfig
+%post libs
+{
+	/sbin/ldconfig
+}
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+{
+	/sbin/ldconfig
+}
 
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
-
 %post Mesa-libGL -p /sbin/ldconfig
 
 %postun Mesa-libGL -p /sbin/ldconfig


From svn at tinysofa.org  Mon Oct  4 10:29:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 06:29:58 -0400 (EDT)
Subject: [tinysofa-svn] r4913 - contrib/1.1/libidl/current/specs
Message-ID: <20041004102958.C9AA83441A2@minbar.tinysofa.org>

Author: jh
Date: 2004-10-04 06:29:57 -0400 (Mon, 04 Oct 2004)
New Revision: 4913

Modified:
   contrib/1.1/libidl/current/specs/libidl.spec
Log:
- test %post and %postun script change

Modified: contrib/1.1/libidl/current/specs/libidl.spec
===================================================================
--- contrib/1.1/libidl/current/specs/libidl.spec	2004-10-04 09:12:09 UTC (rev 4912)
+++ contrib/1.1/libidl/current/specs/libidl.spec	2004-10-04 10:29:57 UTC (rev 4913)
@@ -37,8 +37,10 @@
 
 %post   -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 %clean_buildroot
 


From svn at tinysofa.org  Mon Oct  4 11:35:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 07:35:38 -0400 (EDT)
Subject: [tinysofa-svn] r4914 - contrib/1.1/libidl/current/specs
Message-ID: <20041004113538.DD0783441A2@minbar.tinysofa.org>

Author: jh
Date: 2004-10-04 07:35:38 -0400 (Mon, 04 Oct 2004)
New Revision: 4914

Modified:
   contrib/1.1/libidl/current/specs/libidl.spec
Log:
- include library symlinks to package

Modified: contrib/1.1/libidl/current/specs/libidl.spec
===================================================================
--- contrib/1.1/libidl/current/specs/libidl.spec	2004-10-04 10:29:57 UTC (rev 4913)
+++ contrib/1.1/libidl/current/specs/libidl.spec	2004-10-04 11:35:38 UTC (rev 4914)
@@ -1,13 +1,13 @@
 Summary: IDL parsing library
 Name: libidl
 Version: 0.6.8
-Release: 16gd
+Release: 17jh
 Source: http://andrewtv.org/libIDL/libIDL-%{version}.tar.gz
 License: LGPL
 Group: contrib
 Requires: glib12
 BuildRequires: glib12-devel flex
-BuildRoot: /var/tmp/libIDL-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 libIDL is a small library for creating parse trees of CORBA v2.2
@@ -18,7 +18,7 @@
 %package devel
 Summary:  Header files and libraries needed for libIDL development
 Group: contrib
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package includes the header files and libraries needed for
@@ -35,12 +35,12 @@
 %makeinstall prefix=$RPM_BUILD_ROOT/%{_prefix}
 %nuke_info 
 
+/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
+
 %post   -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
-
 %clean
 %clean_buildroot
 
@@ -48,19 +48,22 @@
 %defattr(-,root,root)
 %doc COPYING ChangeLog AUTHORS
 %doc README* NEWS BUGS tstidl.c
-%{_prefix}/lib/lib*.so.*.*
+%{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(-,root,root)
 %{_prefix}/bin/*
-%{_prefix}/lib/*.sh
-%{_prefix}/lib/lib*.a
-%{_prefix}/lib/lib*.la
-%{_prefix}/lib/lib*.so
-%{_prefix}/include/*
-%{_prefix}/share/aclocal/*
+%{_libdir}/*.sh
+%{_libdir}/lib*.a
+%{_libdir}/lib*.la
+%{_libdir}/lib*.so
+%{_includedir}/*
+%{_datadir}/aclocal/*
 
 %changelog
+* Mon Oct  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.6.8-17jh
+- include library symlinks to package
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.6.8-16gd
 - current (0.6.8-16gd) integrated as 0.6.8-16gd
 


From svn at tinysofa.org  Mon Oct  4 11:45:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 07:45:59 -0400 (EDT)
Subject: [tinysofa-svn] r4915 - contrib/1.1/libidl/current/specs
Message-ID: <20041004114559.90DBF3441A2@minbar.tinysofa.org>

Author: jh
Date: 2004-10-04 07:45:58 -0400 (Mon, 04 Oct 2004)
New Revision: 4915

Modified:
   contrib/1.1/libidl/current/specs/libidl.spec
Log:
- correct previous fix

Modified: contrib/1.1/libidl/current/specs/libidl.spec
===================================================================
--- contrib/1.1/libidl/current/specs/libidl.spec	2004-10-04 11:35:38 UTC (rev 4914)
+++ contrib/1.1/libidl/current/specs/libidl.spec	2004-10-04 11:45:58 UTC (rev 4915)
@@ -35,8 +35,6 @@
 %makeinstall prefix=$RPM_BUILD_ROOT/%{_prefix}
 %nuke_info 
 
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
-
 %post   -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -48,7 +46,7 @@
 %defattr(-,root,root)
 %doc COPYING ChangeLog AUTHORS
 %doc README* NEWS BUGS tstidl.c
-%{_libdir}/lib*.so.*.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root)


From svn at tinysofa.org  Mon Oct  4 13:46:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 09:46:20 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4916 - in contrib/1.1: . atk atk/current atk/current/sources
	atk/current/specs
Message-ID: <20041004134620.9378D3441A2@minbar.tinysofa.org>

Author: gda
Date: 2004-10-04 09:46:19 -0400 (Mon, 04 Oct 2004)
New Revision: 4916

Added:
   contrib/1.1/atk/
   contrib/1.1/atk/current/
   contrib/1.1/atk/current/sources/
   contrib/1.1/atk/current/sources/atk-1.7.3.tar.bz2
   contrib/1.1/atk/current/specs/
   contrib/1.1/atk/current/specs/atk.spec
   contrib/1.1/atk/pristine/
   contrib/1.1/atk/releases/
Log:
new in contrib

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


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

Added: contrib/1.1/atk/current/specs/atk.spec
===================================================================
--- contrib/1.1/atk/current/specs/atk.spec	2004-10-04 11:45:58 UTC (rev 4915)
+++ contrib/1.1/atk/current/specs/atk.spec	2004-10-04 13:46:19 UTC (rev 4916)
@@ -0,0 +1,224 @@
+%define glib_base_version 2.3.0
+%define glib_version %{glib_base_version}-1
+
+Summary: Interfaces for accessibility support.
+Name: atk
+Version: 1.7.3
+Release: 2gd
+License: LGPL
+Group: contrib
+Source: ftp://ftp.gtk.org/pub/gtk/v2.0/atk-%{version}.tar.bz2
+URL: http://developer.gnome.org/projects/gap/
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildPreReq: glib-devel >= %{glib_version}
+BuildPreReq: libtool
+BuildPreReq: autoconf
+BuildPreReq: automake
+BuildPreReq: gcc-c++
+BuildPreReq: gettext
+BuildPreReq: pkgconfig
+
+%description
+The ATK library provides a set of interfaces for adding accessibility
+support to applications and graphical user interface toolkits. By
+supporting the ATK interfaces, an application or toolkit can be used
+with tools such as screen readers, magnifiers, and alternative input
+devices.
+
+%package devel
+Summary: System for layout and rendering of internationalized text.
+Group: contrib
+Requires: atk = %{version}
+Requires: glib-devel >= %{glib_version}
+
+%description devel
+The atk-devel package includes the static libraries, header files, and
+developer docs for the atk package.
+
+Install atk-devel if you want to develop programs which will use ATK.
+
+%prep
+%setup -q
+
+%build
+
+%configure --disable-gtk-doc
+make
+
+%install
+%makeinstall
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang atk10
+
+%clean
+%clean_buildroot
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files -f atk10.lang
+%defattr(-, root, root)
+%doc README AUTHORS COPYING ChangeLog
+%{_libdir}/libatk*.so.*
+
+%files devel
+%defattr(-, root, root)
+%{_libdir}/libatk*.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_datadir}/gtk-doc/
+
+%changelog
+* Sun Oct  3 2004 Gerald Dachs <gda at tinysofa dot org> 1.7.3-2gd
+- taken from tinysofa enterprise server
+
+* Fri Jul 30 2004 Matthias Clasen <clasen at redhat.com> 1.7.3-1
+- update to 2.7.3
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Mar 12 2004 Alex Larsson <alexl at redhat.com> 1.6.0-1
+- update to 2.6.0
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Feb 25 2004 Mark McLoughlin <markmc at redhat.com> 1.5.5-1
+- Update to 1.5.5.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Jan 23 2004 Jonathan Blandford <jrb at redhat.com> 1.5.2-1
+- new version
+
+* Tue Sep  9 2003 Jonathan Blandford <jrb at redhat.com> 1.4.0-1
+- new version
+
+* Tue Aug 19 2003 Jonathan Blandford <jrb at redhat.com> 1.3.5-1
+- new version for 2.4
+
+* Wed Jul  9 2003 Owen Taylor <otaylor at redhat.com> 1.2.4-3.0
+- Remove specific version requirement from libtool
+
+* Tue Jul  8 2003 Owen Taylor <otaylor at redhat.com> 1.2.4-2.0
+- Bump for rebuild
+
+* Tue Jun 10 2003 Owen Taylor <otaylor at redhat.com> 1.2.4-1
+- Version 1.2.4
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Fri Dec 20 2002 Owen Taylor <otaylor at redhat.com>
+- Package documentation, instead of blowing it away
+- Version 1.2.0
+
+* Wed Nov 27 2002 Tim Powers <timp at redhat.com> 1.0.3-3
+- remove unpackaged files from the buildroot
+
+* Mon Oct  7 2002 Havoc Pennington <hp at redhat.com>
+- require glib 2.0.6-3
+
+* Wed Jul 31 2002 Owen Taylor <otaylor at redhat.com>
+- Remove fixed-ltmain.sh
+- Version 1.0.3
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Jun 04 2002 Havoc Pennington <hp at redhat.com>
+- rebuild in different environment
+
+* Tue Jun  4 2002 Havoc Pennington <hp at redhat.com>
+- 1.0.2
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Apr 24 2002 Havoc Pennington <hp at redhat.com>
+ - rebuild in different environment
+
+* Wed Apr  3 2002 Alex Larsson <alexl at redhat.com>
+- Update to version 1.0.1
+
+* Fri Mar  8 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.0.0
+
+* Mon Feb 25 2002 Alex Larsson <alexl at redhat.com>
+- Update to 0.13
+
+* Thu Feb 21 2002 Alex Larsson <alexl at redhat.com>
+- Bump for rebuild
+
+* Mon Feb 18 2002 Havoc Pennington <hp at redhat.com>
+- rebuild for glib 1.3.14
+
+* Fri Feb 15 2002 Havoc Pennington <hp at redhat.com>
+- add horrible buildrequires hack
+
+* Thu Feb 14 2002 Havoc Pennington <hp at redhat.com>
+- 0.12.90 cvs snap
+
+* Tue Jan 29 2002 Owen Taylor <otaylor at redhat.com>
+- Version 0.10
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jan  2 2002 Havoc Pennington <hp at redhat.com>
+- new snap 0.8.90
+
+* Sun Nov 25 2001 Havoc Pennington <hp at redhat.com>
+- rebuild with glib hacked to work on 64-bit
+
+* Sun Nov 25 2001 Havoc Pennington <hp at redhat.com>
+- Version 0.7
+- add explicit check for required glib2 version before we do the build,
+  so we don't end up with bad RPMs on --nodeps builds
+
+* Fri Oct 26 2001 Havoc Pennington <hp at redhat.com>
+- rebuild due to hosage on ia64 build system causing link to old glib
+
+* Thu Oct 25 2001 Owen Taylor <otaylor at redhat.com>
+- Version 0.6
+
+* Thu Sep 27 2001 Havoc Pennington <hp at redhat.com>
+- 0.5
+- sync with Owen's version
+
+* Wed Sep 19 2001 Havoc Pennington <hp at redhat.com>
+- 0.4
+- fix requires
+- --enable-static
+- put static libs back in file list
+
+* Mon Sep 10 2001 Havoc Pennington <hp at redhat.com>
+- update to CVS snapshot
+
+* Wed Sep 05 2001 Havoc Pennington <hp at redhat.com>
+- require specific pango version
+- fix ltmain.sh to destroy all relinking BS
+
+* Tue Sep  4 2001 root <root at dhcpd37.meridian.redhat.com>
+- Version 0.2
+
+* Sat Jul 21 2001 Owen Taylor <otaylor at redhat.com>
+- Configure with --disable-gtk-doc
+
+* Tue Jul 10 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- Add post- and postun-sections running ldconfig
+
+* Wed Jun 13 2001 Havoc Pennington <hp at redhat.com>
+- 0.2
+
+* Fri May  4 2001 Owen Taylor <otaylor at redhat.com>
+- Initial version


From svn at tinysofa.org  Mon Oct  4 14:03:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 10:03:17 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4917 - in contrib/1.1: . pango pango/current pango/current/sources
	pango/current/specs
Message-ID: <20041004140317.8BB7B3441A2@minbar.tinysofa.org>

Author: gda
Date: 2004-10-04 10:03:16 -0400 (Mon, 04 Oct 2004)
New Revision: 4917

Added:
   contrib/1.1/pango/
   contrib/1.1/pango/current/
   contrib/1.1/pango/current/sources/
   contrib/1.1/pango/current/sources/pango-1.0.99.020606-xfonts.patch
   contrib/1.1/pango/current/sources/pango-1.2.5-lib64.patch
   contrib/1.1/pango/current/sources/pango-1.3.2-thai.patch
   contrib/1.1/pango/current/sources/pango-1.4.0.tar.bz2
   contrib/1.1/pango/current/sources/pango-slighthint.patch
   contrib/1.1/pango/current/specs/
   contrib/1.1/pango/current/specs/pango.spec
   contrib/1.1/pango/pristine/
   contrib/1.1/pango/releases/
Log:
new in contrib

Added: contrib/1.1/pango/current/sources/pango-1.0.99.020606-xfonts.patch
===================================================================
--- contrib/1.1/pango/current/sources/pango-1.0.99.020606-xfonts.patch	2004-10-04 13:46:19 UTC (rev 4916)
+++ contrib/1.1/pango/current/sources/pango-1.0.99.020606-xfonts.patch	2004-10-04 14:03:16 UTC (rev 4917)
@@ -0,0 +1,98 @@
+--- pango-1.0.99.020606/examples/pangox.aliases.xfonts	Mon Jun 24 20:19:34 2002
++++ pango-1.0.99.020606/examples/pangox.aliases	Mon Jun 24 20:26:34 2002
+@@ -4,6 +4,7 @@
+ 
+ sans normal normal normal normal \
+   "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -22,6 +23,7 @@
+ 
+ sans italic normal normal normal \
+   "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -40,6 +42,7 @@
+ 
+ sans normal normal bold normal \
+   "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -58,6 +61,7 @@
+ 
+ sans italic normal bold normal \
+   "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -78,6 +82,7 @@
+ serif normal normal normal normal \
+   "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -96,6 +101,7 @@
+ serif italic normal normal normal \
+   "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -114,6 +120,7 @@
+ serif normal normal bold normal \
+   "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -132,6 +139,7 @@
+ serif italic normal bold normal \
+   "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -150,6 +158,7 @@
+ monospace normal normal normal normal \
+   "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -168,6 +177,7 @@
+ monospace italic normal normal normal \
+   "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -186,6 +196,7 @@
+ monospace normal normal bold normal \
+   "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -204,6 +215,7 @@
+ monospace italic normal bold normal \
+   "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\

Added: contrib/1.1/pango/current/sources/pango-1.2.5-lib64.patch
===================================================================
--- contrib/1.1/pango/current/sources/pango-1.2.5-lib64.patch	2004-10-04 13:46:19 UTC (rev 4916)
+++ contrib/1.1/pango/current/sources/pango-1.2.5-lib64.patch	2004-10-04 14:03:16 UTC (rev 4917)
@@ -0,0 +1,30 @@
+--- pango-1.2.5/pango/Makefile.am.lib64	2003-08-25 10:12:45.000000000 -0400
++++ pango-1.2.5/pango/Makefile.am	2003-12-08 18:43:51.000000000 -0500
+@@ -16,6 +16,7 @@
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
+ 	-DG_DISABLE_DEPRECATED				\
+--- pango-1.2.5/pango/modules.c.lib64	2002-12-06 19:54:27.000000000 -0500
++++ pango-1.2.5/pango/modules.c	2003-12-08 18:43:51.000000000 -0500
+@@ -353,6 +353,7 @@
+ 
+   if (!file_str)
+     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
++				 HOST,
+ 				 "pango.modules",
+ 				 NULL);
+ 
+--- pango-1.2.5/pango/Makefile.in.lib64	2003-12-09 10:48:24.000000000 -0500
++++ pango-1.2.5/pango/Makefile.in	2003-12-09 10:48:32.000000000 -0500
+@@ -135,6 +135,7 @@
+ 	-DPANGO_ENABLE_BACKEND				\
+ 	-DPANGO_ENABLE_ENGINE				\
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
++	-DHOST=\"$(host_triplet)\"			\
+ 	-DLIBDIR=\"$(libdir)\"				\
+ 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
+ 	-DG_DISABLE_DEPRECATED				\

Added: contrib/1.1/pango/current/sources/pango-1.3.2-thai.patch
===================================================================
--- contrib/1.1/pango/current/sources/pango-1.3.2-thai.patch	2004-10-04 13:46:19 UTC (rev 4916)
+++ contrib/1.1/pango/current/sources/pango-1.3.2-thai.patch	2004-10-04 14:03:16 UTC (rev 4917)
@@ -0,0 +1,11 @@
+--- pango-1.3.2/modules/thai/thai-shaper.h.thai	2003-09-23 19:11:56.000000000 -0400
++++ pango-1.3.2/modules/thai/thai-shaper.h	2004-01-23 02:03:48.000000000 -0500
+@@ -1,6 +1,8 @@
+ #ifndef __THAI_SHAPER_H__
+ #define __THAI_SHAPER_H__
+ 
++#include "config.h"
++
+ #define isthai(wc)      (wc >= 0xE00 && wc < 0xE80)
+ #define ucs2tis(wc)     (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
+ #define tis2uni(c)      ((gunichar)(c) - 0xA0 + 0x0E00)

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


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

Added: contrib/1.1/pango/current/sources/pango-slighthint.patch
===================================================================
--- contrib/1.1/pango/current/sources/pango-slighthint.patch	2004-10-04 13:46:19 UTC (rev 4916)
+++ contrib/1.1/pango/current/sources/pango-slighthint.patch	2004-10-04 14:03:16 UTC (rev 4917)
@@ -0,0 +1,34 @@
+--- pango-1.2.2/pango/pangoft2.c.slighthint	2003-05-29 18:34:36.000000000 -0400
++++ pango-1.2.2/pango/pangoft2.c	2003-05-29 19:39:08.000000000 -0400
+@@ -210,6 +210,7 @@
+   FcPattern *pattern;
+   FcChar8 *filename;
+   FcBool antialias, hinting, autohint;
++  int hintstyle;
+   int id;
+ 
+   pattern = ft2font->font_pattern;
+@@ -233,8 +234,21 @@
+                             FC_HINTING, 0, &hinting) != FcResultMatch)
+ 	hinting = FcTrue;
+ 
+-      if (!hinting)
+-        ft2font->load_flags |= FT_LOAD_NO_HINTING;
++      if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
++	hintstyle = FC_HINT_FULL;
++
++      if (!hinting || hintstyle == FC_HINT_NONE)
++          ft2font->load_flags |= FT_LOAD_NO_HINTING;
++      
++      switch (hintstyle) {
++      case FC_HINT_SLIGHT:
++      case FC_HINT_MEDIUM:
++	ft2font->load_flags |= FT_LOAD_TARGET_LIGHT;
++	break;
++      default:
++	ft2font->load_flags |= FT_LOAD_TARGET_NORMAL;
++	break;
++      }
+ 
+       /* force autohinting if requested */
+       if (FcPatternGetBool (pattern,

Added: contrib/1.1/pango/current/specs/pango.spec
===================================================================
--- contrib/1.1/pango/current/specs/pango.spec	2004-10-04 13:46:19 UTC (rev 4916)
+++ contrib/1.1/pango/current/specs/pango.spec	2004-10-04 14:03:16 UTC (rev 4917)
@@ -0,0 +1,491 @@
+%define glib_base_version 2.4.0
+%define glib_version %{glib_base_version}-1
+%define pkgconfig_version 0.12
+%define freetype_version 2.1.3-3
+%define fontconfig_version 2.0
+%define xft_version 1.9.1.020626.1517-1
+
+Summary: System for layout and rendering of internationalized text.
+Name: pango
+Version: 1.4.0
+Release: 3gd
+License: LGPL
+Group: contrib
+Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
+URL: http://www.pango.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+# We need to prereq this so we can run pango-querymodules
+Prereq: glib >= %{glib_version}
+Requires: freetype >= %{freetype_version}
+BuildRequires: libtool >= 1.4.2-10
+BuildRequires: glib-devel >= %{glib_version}
+BuildRequires: pkgconfig >= %{pkgconfig_version}
+BuildRequires: freetype-devel >= %{freetype_version}
+BuildRequires: fontconfig-devel >= %{fontconfig_version}
+BuildRequires: xorg-x11-devel >= 6.7.0
+BuildRequires: gcc-c++
+
+Patch1: pango-slighthint.patch
+Patch3: pango-1.0.99.020606-xfonts.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=121488
+Patch4: pango-1.3.2-thai.patch
+# Look for pango.modules in an arch-specific directory
+Patch5: pango-1.2.5-lib64.patch
+
+%description
+Pango is a system for layout and rendering of internationalized text.
+
+
+%package devel
+Summary: System for layout and rendering of internationalized text.
+Group: contrib
+Requires: pango = %{PACKAGE_VERSION}
+Requires: XFree86-devel >= 4.2.99
+Requires: glib-devel >= %{glib_version}
+Requires: freetype-devel >= %{freetype_version}
+Requires: fontconfig-devel >= %{fontconfig_version}
+
+%description devel
+The pango-devel package includes the static libraries, header files,
+and developer docs for the pango package.
+
+Install pango-devel if you want to develop programs which will use
+pango.
+
+%prep
+%setup -q -n pango-%{version}
+
+%patch1 -p1 -b .slighthint
+%patch3 -p1 -b .xfonts
+%patch4 -p1 -b .thai
+%patch5 -p1 -b .lib64
+
+%build
+
+## FIXME remove this hack when X is fixed
+export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/X11R6/lib64/pkgconfig
+if ! pkg-config --exists xft ; then
+        echo "No xft.pc!"
+        exit 1
+fi
+
+%configure --without-qt --disable-gtk-doc
+make
+
+%install
+
+# Deriving /etc/pango/$host location
+# NOTE: Duplicated below
+#
+# autoconf changes linux to linux-gnu
+case "%{_host}" in
+  *linux) host="%{_host}-gnu"
+  ;;
+  *) host="%{_host}"
+  ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+# Make sure that the host value that is passed to the compile 
+# is the same as the host that we're using in the spec file
+#
+compile_host=`grep 'host_triplet =' pango/Makefile | sed "s/.* = //"`
+
+if test "x$compile_host" != "x$host" ; then
+  echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1
+fi
+
+%makeinstall
+
+# Remove files that should not be packaged
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
+if ! test -e $PANGOXFT_SO; then
+        echo "$PANGOXFT_SO not found; did not build with Xft support?"
+        ls $RPM_BUILD_ROOT%{_libdir}
+        exit 1
+fi      
+
+# We need to have separate 32-bit and 64-bit pango-querymodules binaries
+# for places where we have two copies of the Pango libraries installed.
+# (we might have x86_64 and i686 packages on the same system, for example.)
+case "$host" in
+  alpha*|ia64*|ppc64*|s390x*|x86_64*)
+   mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-64
+   ;;
+  *)
+   mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-32
+   ;;
+esac
+
+rm $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pango/$host
+touch $RPM_BUILD_ROOT%{_sysconfdir}/pango/$host/pango.modules
+
+#
+# We need the substitution of $host so we use an external
+# file list
+#
+echo %dir %{_sysconfdir}/pango/$host > modules.files
+echo %ghost %{_sysconfdir}/pango/$host/pango.modules >> modules.files
+
+%clean
+%clean_buildroot
+
+%post
+/sbin/ldconfig
+
+# Deriving /etc/pango/$host location
+#
+# autoconf changes linux to linux-gnu
+case "%{_host}" in
+  *linux) host="%{_host}-gnu"
+  ;;
+  *) host="%{_host}"
+  ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+case "$host" in
+  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+   %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules
+   ;;
+  *)
+   %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules
+   ;;
+esac
+
+%postun -p /sbin/ldconfig
+
+%files -f modules.files
+%defattr(-, root, root)
+%doc README AUTHORS COPYING ChangeLog TODO
+%doc examples/HELLO.utf8
+%{_libdir}/libpango*-*.so.*
+%{_bindir}/pango-querymodules*
+%{_libdir}/pango
+%{_mandir}/man1/*
+
+%dir %{_sysconfdir}/pango
+%config %{_sysconfdir}/pango/pangox.aliases
+
+
+%files devel
+%defattr(-, root, root)
+%{_libdir}/libpango*.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_datadir}/gtk-doc/*
+
+
+%changelog
+* Sun Oct  3 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.0-3gd
+- taken from tinysofa enterprise server
+
+* Wed Mar 17 2004 Owen Taylor <otaylor at redhat.com> 1.4.0-2
+- Fix location for modules file on ppc/ppc64 (#114399)
+- Make the spec file check to avoid further mismatches
+
+* Wed Mar 17 2004 Alex Larsson <alexl at redhat.com> 1.4.0-1
+- update to 1.4.0
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc at redhat.com> 1.3.6-1
+- Update to 1.3.6
+- Bump required glib2 to 2.3.1
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Mar 02 2004 Mark McLoughlin <markmc at redhat.com> 1.3.5-1
+- Update to 1.3.5
+
+* Wed Feb 25 2004 Mark McLoughlin <markmc at redhat.com> 1.3.3-1
+- Update to 1.3.3
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Jan 23 2004 Jonathan Blandford <jrb at redhat.com> 1.3.2-1
+- new version
+- add man page
+
+* Thu Dec 18 2003 Owen Taylor <otaylor at redhat.com> 1.2.5-4
+- Deal with autoconf changing -linux to -linux-gnu (#112387)
+
+* Mon Dec  8 2003 Owen Taylor <otaylor at redhat.com> 1.2.5-3.0
+- Package pango-querymodules as pango-querymodules-{32,64}; look for 
+  pango.modules in an architecture-specific directory.
+  (Fixes #111511, Justin M. Forbes)
+
+* Mon Sep  8 2003 Owen Taylor <otaylor at redhat.com> 1.2.5-2.0
+- Fix problem with corrupt Thai shaper
+
+* Wed Aug 27 2003 Owen Taylor <otaylor at redhat.com> 1.2.5-1.1
+- Version 1.2.5
+
+* Tue Aug 26 2003 Owen Taylor <otaylor at redhat.com> 1.2.4-1.1
+- Version 1.2.4
+
+* Tue Jul  8 2003 Owen Taylor <otaylor at redhat.com> 1.2.3-2.0
+- Bump for rebuild
+
+* Mon Jun  9 2003 Owen Taylor <otaylor at redhat.com>
+- Version 1.2.3
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Jun  2 2003 Owen Taylor <otaylor at redhat.com>
+- Use the right version-1.2.2 tarball
+
+* Thu May 29 2003 Owen Taylor <otaylor at redhat.com>
+- Version 1.2.2
+
+* Thu Feb 13 2003 Tim Powers <timp at redhat.com> 1.2.1-3
+- remove deps on Xft and Xft-devel since XFree86 no longer has the
+  virtual prvodes. Instead, require XFree86-devel > 4.2.99
+
+* Tue Feb 11 2003 Owen Taylor <otaylor at redhat.com>
+- Fix problem where language tag wasn't causing relookup of font (#84034)
+
+* Sun Feb  2 2003 Owen Taylor <otaylor at redhat.com>
+- Version 1.2.1
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Tue Jan 14 2003 Owen Taylor <otaylor at redhat.com>
+- Patch from CVS to synthesize GDEF tables for fonts
+  without them, like the Kacst fonts in fonts-arabic
+
+* Thu Jan  9 2003 Owen Taylor <otaylor at redhat.com>
+- Make requires freetype, not freetype-devel (#81423)
+
+* Tue Jan  7 2003 Owen Taylor <otaylor at redhat.com>
+- Update slighthint patch for freetype-2.1.3 (#81125)
+
+* Fri Dec 20 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.2.0
+
+* Mon Dec 16 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.1.6
+
+* Wed Dec 11 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.1.5
+
+* Tue Dec  3 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.1.4
+
+* Thu Nov 21 2002 Havoc Pennington <hp at redhat.com>
+- change PKG_CONFIG_PATH hack to also search /usr/X11R6/lib64/pkgconfig
+
+* Wed Nov 20 2002 Havoc Pennington <hp at redhat.com>
+- explicitly require pangoxft to be built, so we catch situations such
+  as xft.pc moving to /usr/X11R6
+- also add /usr/X11R6/lib/pkgconfig to PKG_CONFIG_PATH as a temporary 
+  hack
+
+* Thu Nov  7 2002 Havoc Pennington <hp at redhat.com>
+- 1.1.3
+
+* Thu Oct 31 2002 Owen Taylor <otaylor at redhat.com> 1.1.1-5
+- Require the necessary freetype version, don't just
+  BuildRequires it (#74744)
+
+* Thu Oct 31 2002 Owen Taylor <otaylor at redhat.com> 1.1.1-4
+- Own /etc/pango (#73962, Enrico Scholz)
+- Remove .la files from the build root
+
+* Mon Oct  7 2002 Havoc Pennington <hp at redhat.com>
+- require glib 2.0.6-3, try rebuild on more arches
+
+* Wed Aug 21 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.1.1 (main change, fixes font selection for FT2 backend, 
+  as in gdmgreeter)
+
+* Thu Aug 15 2002 Owen Taylor <otaylor at redhat.com>
+- Fix linked list manipulation problem that was causing hang for anaconda
+- Fix warning from loading mini-fonts with context == NULL
+
+* Wed Aug 14 2002 Owen Taylor <otaylor at redhat.com>
+- Fix major memory leak in the last patch
+
+* Tue Aug 13 2002 Owen Taylor <otaylor at redhat.com>
+- Actually use language tags at the rendering layer (should fix #68211)
+
+* Mon Jul 15 2002 Owen Taylor <otaylor at redhat.com>
+- Remove fixed-ltmain.sh, relibtoolize; to fix relink problems without 
+- Fix bug causing hex boxes to be misrendered
+  leaving RPATH (#66005)
+- For FT2 backend, supply FT_LOAD_NO_BITMAP to avoid problems with 
+  fonts with embedded bitmaps (#67851)
+
+* Mon Jul  8 2002 Owen Taylor <otaylor at redhat.com>
+- Make basic-x shaper work with our big-5 fonts
+
+* Wed Jul  3 2002 Owen Taylor <otaylor at redhat.com>
+- New upstream tarball with hooks for change-on-the fly font rendering
+
+* Tue Jun 25 2002 Owen Taylor <otaylor at redhat.com>
+- Up FreeType version to deal with FreeType-2.0.x / 2.1.x \
+  ABI changes for pango's OpenType code.
+
+* Mon Jun 24 2002 Owen Taylor <otaylor at redhat.com>
+- Add some Korean aliases that the installer wants
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sat Jun  8 2002 Havoc Pennington <hp at redhat.com>
+- devel package requires fontconfig/Xft devel packages
+
+* Fri Jun 07 2002 Havoc Pennington <hp at redhat.com>
+- rebuild in different environment
+
+* Thu Jun  6 2002 Owen Taylor <otaylor at redhat.com>
+- Snapshot with Xft2/fontconfig support
+
+* Wed May 29 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.0.2
+- Patch for charmaps problem
+
+* Sun May 26 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed May 22 2002 Havoc Pennington <hp at redhat.com>
+- rebuild in different environment
+
+* Wed May 22 2002 Havoc Pennington <hp at redhat.com>
+- add patch to adjust to newer version of freetype
+
+* Wed Apr  3 2002 Alex Larsson <alexl at redhat.com>
+- Update to version 1.0.1, remove patch
+
+* Tue Mar 19 2002 Owen Taylor <otaylor at redhat.com>
+- Patch from CVS for big speedup with FreeType-2.0.9
+
+* Mon Mar 11 2002 Owen Taylor <otaylor at redhat.com>
+- Rebuild
+
+* Fri Mar  8 2002 Owen Taylor <otaylor at redhat.com>
+- Version 1.0.0
+
+* Mon Feb 25 2002 Alex Larsson <alexl at redhat.com>
+- Update to 0.26
+
+* Thu Feb 21 2002 Alex Larsson <alexl at redhat.com>
+- Bump for rebuild
+
+* Mon Feb 18 2002 Alex Larsson <alexl at redhat.com>
+- Update to 0.25
+
+* Fri Feb 15 2002 Havoc Pennington <hp at redhat.com>
+- add horrible buildrequires hack
+
+* Thu Feb 14 2002 Havoc Pennington <hp at redhat.com>
+- 0.24.90 cvs snap
+
+* Tue Jan 29 2002 Owen Taylor <otaylor at redhat.com>
+- Version 0.24
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jan  2 2002 Havoc Pennington <hp at redhat.com>
+- new snap 0.23.90
+
+* Sun Nov 25 2001 Havoc Pennington <hp at redhat.com>
+- rebuild with 64-bit-fixed glib
+
+* Sun Nov 25 2001 Havoc Pennington <hp at redhat.com>
+- Version 0.22
+- add explicit check for required glib2 version before we do the build,
+  so we don't end up with bad RPMs on --nodeps builds
+- PreReq the glib2_version version, instead of 1.3.8 hardcoded that 
+  no one had updated recently
+
+* Thu Oct 25 2001 Owen Taylor <otaylor at redhat.com>
+- Version 0.21
+
+* Thu Oct  4 2001 Havoc Pennington <hp at redhat.com>
+- cvs snap
+- new cvs snap with a bugfix
+
+* Thu Sep 27 2001 Havoc Pennington <hp at redhat.com>
+- sync with Owen's changes, fix up dependency versions
+
+* Wed Sep 19 2001 Havoc Pennington <hp at redhat.com>
+- 0.19
+
+* Mon Sep 10 2001 Havoc Pennington <hp at redhat.com>
+- build CVS snap
+
+* Wed Sep 05 2001 Havoc Pennington <hp at redhat.com>
+- no relinking junk
+
+* Tue Sep  4 2001 root <root at dhcpd37.meridian.redhat.com>
+- Version 0.18
+
+* Fri Jul 20 2001 Owen Taylor <otaylor at redhat.com>
+- Configure --disable-gtk-doc
+- BuildRequires freetype-devel, XFree86-devel
+
+* Tue Jun 12 2001 Havoc Pennington <hp at redhat.com>
+- 0.17
+- libtool hackarounds
+
+* Fri May 04 2001 Owen Taylor <otaylor at redhat.com>
+- 0.16, rename back to pango from pango-gtkbeta
+
+* Fri Feb 16 2001 Owen Taylor <otaylor at redhat.com>
+- Obsolete fribidi-gtkbeta
+
+* Mon Dec 11 2000 Havoc Pennington <hp at redhat.com>
+- Remove that patch I just put in
+
+* Mon Dec 11 2000 Havoc Pennington <hp at redhat.com>
+- Patch pangox.pc.in to include -Iincludedir
+
+* Fri Nov 17 2000 Owen Taylor <otaylor at redhat.com>
+- final 0.13
+
+* Tue Nov 14 2000 Owen Taylor <otaylor at redhat.com>
+- New 0.13 tarball
+
+* Mon Nov 13 2000 Owen Taylor <otaylor at redhat.com>
+- 0.13pre1
+
+* Sun Aug 13 2000 Owen Taylor <otaylor at redhat.com>
+- Rename to 0.12b to avoid versioning problems
+
+* Thu Aug 10 2000 Havoc Pennington <hp at redhat.com>
+- Move to a CVS snapshot
+
+* Fri Jul 07 2000 Owen Taylor <otaylor at redhat.com>
+- Move back to /usr
+- Version 0.12
+
+* Mon Jun 19 2000  Owen Taylor <otaylor at redhat.com>
+- Add missing %%defattr
+
+* Thu Jun 8 2000  Owen Taylor <otaylor at redhat.com>
+- Rebuild with a prefix of /opt/gtk-beta
+
+* Wed May 31 2000 Owen Taylor <otaylor at redhat.com>
+- version 0.11
+- add --without-qt
+
+* Wed Apr 26 2000 Owen Taylor <otaylor at redhat.com>
+- Make the devel package require *-gtkbeta-* not the normal packages.
+
+* Tue Apr 25 2000 Owen Taylor <otaylor at redhat.com>
+- GTK+ snapshot version installing in /opt/gtk-beta
+
+* Fri Feb 11 2000 Owen Taylor <otaylor at redhat.com>
+- Created spec file


From svn at tinysofa.org  Mon Oct  4 19:09:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Oct 2004 15:09:18 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4919 - in contrib/1.1: . libglade2 libglade2/current
	libglade2/current/sources libglade2/current/specs
Message-ID: <20041004190918.1577E3441A2@minbar.tinysofa.org>

Author: gda
Date: 2004-10-04 15:09:17 -0400 (Mon, 04 Oct 2004)
New Revision: 4919

Added:
   contrib/1.1/libglade2/
   contrib/1.1/libglade2/current/
   contrib/1.1/libglade2/current/sources/
   contrib/1.1/libglade2/current/sources/libglade-2.0.1-nowarning.patch
   contrib/1.1/libglade2/current/sources/libglade-2.4.0.tar.bz2
   contrib/1.1/libglade2/current/specs/
   contrib/1.1/libglade2/current/specs/libglade2.spec
   contrib/1.1/libglade2/pristine/
   contrib/1.1/libglade2/releases/
Log:
new in contrib

Added: contrib/1.1/libglade2/current/sources/libglade-2.0.1-nowarning.patch
===================================================================
--- contrib/1.1/libglade2/current/sources/libglade-2.0.1-nowarning.patch	2004-10-04 15:36:19 UTC (rev 4918)
+++ contrib/1.1/libglade2/current/sources/libglade-2.0.1-nowarning.patch	2004-10-04 19:09:17 UTC (rev 4919)
@@ -0,0 +1,39 @@
+--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
++++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
+@@ -639,9 +639,8 @@
+ 		if (!strcmp (childinfo->properties[j].name, "label")) {
+ 		    label = childinfo->properties[j].value;
+ 		    break;
+-		} else {
+-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
+ 		}
++		/* Ignore all other properties */
+ 	    }
+ 
+ 	    if (label) {
+@@ -683,6 +682,7 @@
+ 	    char *icon = NULL;
+ 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
+ 	    gboolean use_underline = FALSE;
++	    gboolean sensitive = TRUE;
+ 	    GtkWidget *iconw = NULL;
+ 	    int j;
+ 
+@@ -708,6 +708,8 @@
+ 		    group_name = value;
+ 		} else if (!strcmp (name, "new_group")) {
+ 		    new_group = BOOL (value);
++		} else if (!strcmp (name, "sensitive")) {
++		    sensitive = BOOL (value);
+ 		} else if (!strcmp (name, "visible")) {
+ 		    /* ignore for now */
+ 		} else if (!strcmp (name, "tooltip")) {
+@@ -785,6 +787,8 @@
+ 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
+ 					     TRUE);
+ 	    }
++	    
++	    gtk_widget_set_sensitive (child, sensitive);
+ 
+ 	    glade_xml_set_common_params (xml, child, childinfo->child);
+ 	} else {

Added: contrib/1.1/libglade2/current/sources/libglade-2.4.0.tar.bz2
===================================================================
(Binary files differ)


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

Added: contrib/1.1/libglade2/current/specs/libglade2.spec
===================================================================
--- contrib/1.1/libglade2/current/specs/libglade2.spec	2004-10-04 15:36:19 UTC (rev 4918)
+++ contrib/1.1/libglade2/current/specs/libglade2.spec	2004-10-04 19:09:17 UTC (rev 4919)
@@ -0,0 +1,248 @@
+%define libxml2_version 2.4.12-0.7
+%define gtk2_version 2.3.2
+%define pango_version 1.3.2
+
+Summary: The libglade library for loading user interfaces.
+Name: libglade2
+Version: 2.4.0
+Release: 2gd
+Copyright: LGPL
+Group: contrib
+Source: libglade-%{version}.tar.bz2
+URL: http://www.gnome.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: libxml2 >= %{libxml2_version}
+BuildRequires: libxml2-devel >= %{libxml2_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: fontconfig
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: libtool
+BuildRequires: python
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=121025
+Patch1: libglade-2.0.1-nowarning.patch
+
+%description
+Libglade is a small library that allows a program to load its user
+interface from am XML description at runtime. Libglade uses the XML
+file format used by the GLADE user interface builder GLADE, so
+libglade acts as an alternative to GLADE's code generation
+approach. Libglade also provides a simple interface for connecting
+handlers to the various signals in the interface (on platforms where
+the gmodule library works correctly, it is possible to connect all the
+handlers with a single function call). Once the interface has been
+instantiated, libglade gives no overhead, so other than the short
+initial interface loading time, there is no performance tradeoff.
+
+%package devel
+Summary: The files needed for libglade application development.
+Group: contrib
+Requires: %name = %{PACKAGE_VERSION}
+Requires: libxml2-devel >= %{libxml2_version}
+Requires: gtk2-devel >= %{gtk2_version}
+Conflicts: libglade < 0.17
+
+%description devel
+The libglade-devel package contains the libraries and include files
+that you can use to develop libglade applications.
+
+%prep
+%setup -q -n libglade-%{version}
+
+%patch1 -p1 -b .nowarning
+
+%build
+libtoolize --force --copy
+#aclocal
+#automake
+
+export LD_LIBRARY_PATH=/usr/X11R6/lib
+%configure --disable-gtk-doc
+make %{?_smp_mflags}
+
+%install
+%makeinstall
+
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+%clean_buildroot
+
+%post   -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog NEWS README COPYING
+%{_libdir}/lib*.so.*
+%{_datadir}/xml
+
+%files devel
+%defattr(-, root, root)
+%doc test-libglade.c
+%{_bindir}/*
+%{_libdir}/lib*.so
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+%{_datadir}/gtk-doc
+
+%changelog
+* Mon Oct  4 2004 Gerald Dachs <gda at tinysofa dot org> 2.4.0-2gd
+- taken from tinysofa enterprise server
+
+* Thu May 20 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.0-1
+- Upgrade to 2.4.0
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc at redhat.com> 2.3.6-1
+- Update to 2.3.6
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Jan 23 2004 Alexander Larsson <alexl at redhat.com> 2.3.2-1
+- Update to 2.3.2
+
+* Fri Aug 29 2003 Owen Taylor <otaylor at redhat.com> 2.0.1-5.0
+- Fix a couple of warnings for unknown properties GtkToolbar (Hardy Merrill, 
+  #85384) and GtkCList.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 14 2003 Tim Powers <timp at redhat.com> 2.0.1-3
+- remove BuildRequires on Xft
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Fri Nov  8 2002 Havoc Pennington <hp at redhat.com>
+- 2.0.1
+
+* Tue Oct  8 2002 Havoc Pennington <hp at redhat.com>
+- destroy .la files
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sat Jun 15 2002 Havoc Pennington <hp at redhat.com>
+- 2.0.0
+- check over file list, add XML DTD to it
+
+* Fri May 17 2002 Havoc Pennington <hp at redhat.com>
+- rebuild in different environment
+
+* Fri May 17 2002 Havoc Pennington <hp at redhat.com>
+- don't run auto*
+
+* Fri May 17 2002 Havoc Pennington <hp at redhat.com>
+- 1.99.12
+- remove gtk-doc hack, --disable-gtk-doc now works
+
+* Thu May  2 2002 Havoc Pennington <hp at redhat.com>
+- 1.99.11
+
+* Thu Apr  4 2002 Jeremy Katz <katzj at redhat.com>
+- 1.99.10
+
+* Tue Mar 19 2002 Alex Larsson <alexl at redhat.com>
+- Update autoconf dependency to 2.53
+
+* Mon Mar 11 2002 Alex Larsson <alexl at redhat.com>
+- Update to 1.99.9
+
+* Mon Feb 25 2002 Alex Larsson <alexl at redhat.com>
+- Bump for rebuild
+
+* Thu Feb 21 2002 Alex Larsson <alexl at redhat.com>
+- Bump for rebuild
+
+* Tue Feb 19 2002 Alex Larsson <alexl at redhat.com>
+- Add horrible buildroot check hacks. Require new Gtk+.
+
+* Thu Feb 14 2002 Havoc Pennington <hp at redhat.com>
+- rebuild for new gtk
+
+* Wed Jan 30 2002 Owen Taylor <otaylor at redhat.com>
+- Rebuild against new GTK+
+
+* Tue Jan 22 2002 Havoc Pennington <hp at redhat.com>
+- put "nogtkdoc" patch back, it avoids X display requirement
+- automake14
+
+* Wed Jan  2 2002 Havoc Pennington <hp at redhat.com>
+- 1.99.5.90 snap
+- comment out "nogtkdoc" patch, don't run autoconf
+
+* Mon Nov 26 2001 Havoc Pennington <hp at redhat.com>
+- new 1.99.4.91 snap with Jacob's fixes, he 
+  assures me we are 1.99.4.90 ABI-compatible
+
+* Mon Nov 26 2001 Havoc Pennington <hp at redhat.com>
+- new 1.99.4.90 snap, gtk 1.3.11
+
+* Fri Oct 26 2001 Havoc Pennington <hp at redhat.com>
+- new snap, rebuild on gtk 1.3.10
+
+* Sat Oct  6 2001 Havoc Pennington <hp at redhat.com>
+- new snap, add hack to avoid trying to build docs
+- add the ltmain.sh hack to avoid relinking
+
+* Mon Sep 24 2001 Havoc Pennington <hp at redhat.com>
+- new snap
+
+* Fri Sep 21 2001 Havoc Pennington <hp at redhat.com>
+- convert libglade rpm to libglade2 rpm, initial build of libglade2
+
+* Mon Aug 20 2001 Jonathan Blandford <jrb at redhat.com>
+- Escape strings, #51966
+
+* Sun Jul 22 2001 Havoc Pennington <hp at redhat.com>
+- add build requires, bug #49508
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
+- New Version.
+
+* Thu Mar 01 2001 Owen Taylor <otaylor at redhat.com>
+- Rebuild for GTK+-1.2.9 include paths
+
+* Thu Feb 08 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- add libtoolize to make porting to new archs easy
+
+* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
+- 0.14
+- added patch for gtk-doc scanner linkage
+
+* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
+- Up Epoch and release
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Thu Jun 29 2000 Owen Taylor <otaylor at redhat.com>
+- specfile fixes
+
+* Wed May 31 2000 Owen Taylor <otaylor at redhat.com>
+- Upgraded to libglade-0.13
+- Use %makeinstall, since that is required when %configure is used.
+
+* Fri May 19 2000 Owen Taylor <otaylor at redhat.com>
+- Upgraded to libglade-0.12
+
+* Tue Sep 07 1999 Elliot Lee <sopwith at redhat.com>
+- Updated RHL 6.1 package to libglade-0.5
+
+* Sun Nov  1 1998 James Henstridge <james at daa.com.au>
+
+- Updated the dependencies of the devel package, so users must have gtk+-devel.
+
+* Sun Oct 25 1998 James Henstridge <james at daa.com.au>
+
+- Initial release 0.0.1


From svn at tinysofa.org  Tue Oct  5 16:10:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Oct 2004 12:10:27 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4920 - in tinysofa/releases/1.1/mysql/current: sources specs
Message-ID: <20041005161027.B74CC3440E1@minbar.tinysofa.org>

Author: jh
Date: 2004-10-05 12:10:26 -0400 (Tue, 05 Oct 2004)
New Revision: 4920

Added:
   tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.21-initgroups.patch
Modified:
   tinysofa/releases/1.1/mysql/current/specs/mysql.spec
Log:
- use more macros
- work around nss_ldap problem (Bug ID: #10)


Added: tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.21-initgroups.patch
===================================================================
--- tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.21-initgroups.patch	2004-10-04 19:09:17 UTC (rev 4919)
+++ tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.21-initgroups.patch	2004-10-05 16:10:26 UTC (rev 4920)
@@ -0,0 +1,11 @@
+--- mysql-4.0.21/configure.orig	2004-10-05 19:03:21.554987816 +0300
++++ mysql-4.0.21/configure	2004-10-05 19:03:49.282772552 +0300
+@@ -31009,7 +31009,7 @@
+  pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \
+  pthread_attr_getstacksize pthread_key_delete \
+  pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
+- fsync fdatasync fchmod getpass getpassphrase initgroups mlockall
++ fsync fdatasync fchmod getpass getpassphrase mlockall
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5

Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.1/mysql/current/specs/mysql.spec	2004-10-04 19:09:17 UTC (rev 4919)
+++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec	2004-10-05 16:10:26 UTC (rev 4920)
@@ -2,7 +2,7 @@
 Name: mysql
 Group: main
 Version: 4.0.21
-Release: 1jh
+Release: 2jh
 License: GPL / LGPL
 %define shared_libversion	12:0:0
 %define mysqld_user		mysql
@@ -10,6 +10,7 @@
 Source2: mysql.init
 Source3: mysql.conf
 Patch: mysql-4.0.20-fixpath.patch
+Patch1: mysql-4.0.21-initgroups.patch
 URL: http://www.mysql.com/
 Provides: msqlormysql MySQL-server
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -89,6 +90,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch -p1 -b .fixpath
+%patch1 -p1 -b .initgroups
 
 %build
 export CC="${MYSQL_BUILD_CC:-gcc}"
@@ -98,7 +100,7 @@
 ./configure \
             --prefix=/ \
             --exec-prefix=%{_exec_prefix} \
-            --datadir=/usr/share \
+            --datadir=%{_datadir} \
             --libexecdir=%{_sbindir} \
             --localstatedir=/var/lib/mysql \
 	    --mandir=%{_mandir} \
@@ -126,7 +128,7 @@
 	    # --with-debug
 
 
-make benchdir_root=$RPM_BUILD_ROOT/usr/share/
+make benchdir_root=$RPM_BUILD_ROOT%{_datadir}/
 ## seperate symbold from mysqld (for debugging) [bg]
 #nm --numeric-sort sql/mysqld > sql/mysqld.sym
 
@@ -134,22 +136,22 @@
 RBR=$RPM_BUILD_ROOT
 MBD=$RPM_BUILD_DIR/mysql-%{version}
 # Ensure that needed directories exists
-install -d $RBR/etc/logrotate.d
+install -d $RBR%{_sysconfdir}/logrotate.d
 install -d $RBR%{_initrddir}
 install -d $RBR/var/lib/mysql/mysql
-install -d $RBR/usr/share/sql-bench
-install -d $RBR/usr/share/mysql-test
+install -d $RBR%{_datadir}/sql-bench
+install -d $RBR%{_datadir}/mysql-test
 install -d $RBR/usr/{sbin,share,man,include}
 install -d $RBR/usr/doc/MySQL-%{version}
 install -d $RBR%{_libdir}/mysql
 
 # Make install
-make install-strip DESTDIR=$RBR benchdir_root=/usr/share/
+make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}/
 
 # Install logrotate and autostart
-install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql
+install -m644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
 install -m755 %{SOURCE2} $RBR%{_initrddir}/mysql
-install -m600 %{SOURCE3} $RBR/etc/my.cnf
+install -m600 %{SOURCE3} $RBR%{_sysconfdir}/my.cnf
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 cat << __EOF__ > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
@@ -162,8 +164,8 @@
 
 pushd Docs
   makeinfo --html --no-split manual.texi
-  install -d -m755 $RBR/usr/share/html/%{name}
-  install -m644 mysql.html $RBR/usr/share/html/%{name}/
+  install -d -m 755 $RBR%{_htmldir}/%{name}
+  install -m644 mysql.html $RBR%{_htmldir}/%{name}/
 popd
 
 %nuke_info
@@ -241,46 +243,46 @@
 %doc Docs/manual.ps Docs/manual_toc.html Docs/manual.html
 %doc support-files/*.cnf
 
-/usr/bin/isamchk
-/usr/bin/isamlog
-/usr/bin/myisamchk
-/usr/bin/myisamlog
-/usr/bin/myisampack
-/usr/bin/myisam_ftdump
-/usr/bin/mysql_fix_privilege_tables
-/usr/bin/mysql_convert_table_format
-/usr/bin/mysql_install
-/usr/bin/mysql_install_db
-/usr/bin/mysql_setpermission
-/usr/bin/mysql_zap
-/usr/bin/mysqlbug
-/usr/bin/mysqltest
-/usr/bin/mysqlhotcopy
-/usr/bin/mysqlmanager
-/usr/bin/pack_isam
-/usr/bin/perror
-/usr/bin/replace
-/usr/bin/resolveip
-/usr/bin/mysqld_safe
-/usr/bin/mysql_explain_log
-/usr/bin/mysql_fix_extensions
-/usr/bin/mysql_secure_installation
-/usr/bin/resolve_stack_dump
-/usr/bin/mysqld_multi
-/usr/bin/my_print_defaults
+%{_bindir}/isamchk
+%{_bindir}/isamlog
+%{_bindir}/myisamchk
+%{_bindir}/myisamlog
+%{_bindir}/myisampack
+%{_bindir}/myisam_ftdump
+%{_bindir}/mysql_fix_privilege_tables
+%{_bindir}/mysql_convert_table_format
+%{_bindir}/mysql_install
+%{_bindir}/mysql_install_db
+%{_bindir}/mysql_setpermission
+%{_bindir}/mysql_zap
+%{_bindir}/mysqlbug
+%{_bindir}/mysqltest
+%{_bindir}/mysqlhotcopy
+%{_bindir}/mysqlmanager
+%{_bindir}/pack_isam
+%{_bindir}/perror
+%{_bindir}/replace
+%{_bindir}/resolveip
+%{_bindir}/mysqld_safe
+%{_bindir}/mysql_explain_log
+%{_bindir}/mysql_fix_extensions
+%{_bindir}/mysql_secure_installation
+%{_bindir}/resolve_stack_dump
+%{_bindir}/mysqld_multi
+%{_bindir}/my_print_defaults
 
-%exclude /usr/bin/make_win_src_distribution
-%exclude /usr/bin/make_win_binary_distribution
+%exclude %{_bindir}/make_win_src_distribution
+%exclude %{_bindir}/make_win_binary_distribution
 
-/usr/share/html/%{name}
+%{_htmldir}/%{name}
 
-/usr/sbin/mysqld
+%{_sbindir}/mysqld
 
-/etc/logrotate.d/mysql
+%{_sysconfdir}/logrotate.d/mysql
 %{_initrddir}/mysql
 %dir %attr(700, %{mysqld_user}, %{mysqld_user}) /var/lib/mysql
 %dir %attr(700, %{mysqld_user}, %{mysqld_user}) /var/lib/mysql/mysql
-/usr/share/mysql/
+%{_datadir}/mysql/
 
 %{_mandir}/man1/isamchk.1*
 %{_mandir}/man1/isamlog.1*
@@ -294,16 +296,16 @@
 
 %files client
 %defattr(-,root,root)
-/usr/bin/msql2mysql
-/usr/bin/mysql
-/usr/bin/mysqlaccess
-/usr/bin/mysql_find_rows
-/usr/bin/mysqldump
-/usr/bin/mysqlimport
-/usr/bin/mysqlshow
-/usr/bin/mysqlbinlog
-/usr/bin/mysql_waitpid
-/usr/bin/mysqlcheck
+%{_bindir}/msql2mysql
+%{_bindir}/mysql
+%{_bindir}/mysqlaccess
+%{_bindir}/mysql_find_rows
+%{_bindir}/mysqldump
+%{_bindir}/mysqlimport
+%{_bindir}/mysqlshow
+%{_bindir}/mysqlbinlog
+%{_bindir}/mysql_waitpid
+%{_bindir}/mysqlcheck
 
 %{_mandir}/man1/mysql.1*
 %{_mandir}/man1/mysqlaccess.1*
@@ -317,9 +319,9 @@
 %attr(644,root,root) %{_libdir}/mysql/*.a
 %attr(755,root,root) %{_libdir}/mysql/*.la
 %attr(755,root,root) %{_libdir}/mysql/*.so
-/usr/bin/comp_err
-/usr/include/mysql/
-/usr/bin/mysql_config
+%{_bindir}/comp_err
+%{_includedir}/mysql/
+%{_bindir}/mysql_config
 
 %files libs
 %defattr(-,root,root)
@@ -329,23 +331,27 @@
 
 %files shared
 %defattr(-,root,root)
-/usr/bin/mysqladmin
-%config(noreplace) %attr(600, root, root) /etc/my.cnf
-/usr/bin/mysql_tableinfo
-/usr/bin/mysqldumpslow
+%{_bindir}/mysqladmin
+%config(noreplace) %attr(600, root, root) %{_sysconfdir}/my.cnf
+%{_bindir}/mysql_tableinfo
+%{_bindir}/mysqldumpslow
 
 %files bench
 %defattr(-,root,root)
-/usr/share/sql-bench
-/usr/share/mysql-test
-/usr/bin/mysqlmanager-pwgen
-/usr/bin/mysqlmanagerc
+%{_datadir}/sql-bench
+%{_datadir}/mysql-test
+%{_bindir}/mysqlmanager-pwgen
+%{_bindir}/mysqlmanagerc
 
 %changelog
+* Tue Oct  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.21-2jh
+- use more macros
+- work around nss_ldap problem (Bug ID: #10)
+
 * Sun Sep 19 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.21-1jh
 - 4.0.21
 - use %%{_sysconfdir}/ld.so.conf.d/%%{name}.conf instead of editing
-  /etc/ld.so.conf
+  %{_sysconfdir}/ld.so.conf
 
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.0.20-4ts
 - current (4.0.20-4jh) integrated as 4.0.20-4ts for release 1.1
@@ -360,7 +366,7 @@
 - current (4.0.20-2jh) integrated as 4.0.20-2ts for release 1.0-U1
 
 * Wed May 19 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.20-2jh
-- add %{_libdir}/mysql to /etc/ld.so.conf
+- add %{_libdir}/mysql to %{_sysconfdir}/ld.so.conf
 
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.0.20-1ts
 - current (4.0.20-1ok) integrated as 4.0.20-1ts for release 1.0-U1
@@ -369,7 +375,7 @@
 - New Upstream: 4.0.20.
 
 * Sat May 15 2004 Tor Hveem <torh at tinysofa doc org> 4.0.19-2th
-- Exclude /usr/bin/make_win_binary_distribution
+- Exclude %{_bindir}/make_win_binary_distribution
 
 * Fri May 14 2004 Omar Kilani <omar at tinysofa dot org> 4.0.19-1ok
 - New upstream.
@@ -396,7 +402,7 @@
 
 * Tue Sep 10 2003 Goetz Bock <bock at trustix dot org> 4.0.15-2bg
 - cleaned up the spec file
-- made /etc/my.cnf a noreplace
+- made %{_sysconfdir}/my.cnf a noreplace
 - commented all the debug stuff out, it's not build anyway
   (look for [bg])
 - included static libs into -devel


From svn at tinysofa.org  Tue Oct  5 17:23:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Oct 2004 13:23:59 -0400 (EDT)
Subject: [tinysofa-svn] r4921 - tinysofa/releases/1.1/cdrtools/current/specs
Message-ID: <20041005172359.450FC3440E1@minbar.tinysofa.org>

Author: jh
Date: 2004-10-05 13:23:58 -0400 (Tue, 05 Oct 2004)
New Revision: 4921

Modified:
   tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec
Log:
- add epoch tag


Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec
===================================================================
--- tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec	2004-10-05 16:10:26 UTC (rev 4920)
+++ tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec	2004-10-05 17:23:58 UTC (rev 4921)
@@ -2,6 +2,7 @@
 Name: cdrtools
 Version: 2.01
 Release: 1jh
+Epoch: 0
 %define tarversion 2.01
 License: GPL
 Group: extra


From svn at tinysofa.org  Wed Oct  6 18:07:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  6 Oct 2004 14:07:28 -0400 (EDT)
Subject: [tinysofa-svn] r4924 - tinysofa/releases/1.1/gcc/current/specs
Message-ID: <20041006180728.231673441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-06 14:07:27 -0400 (Wed, 06 Oct 2004)
New Revision: 4924

Modified:
   tinysofa/releases/1.1/gcc/current/specs/gcc.spec
Log:
- correct release number

Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec
===================================================================
--- tinysofa/releases/1.1/gcc/current/specs/gcc.spec	2004-10-06 16:41:12 UTC (rev 4923)
+++ tinysofa/releases/1.1/gcc/current/specs/gcc.spec	2004-10-06 18:07:27 UTC (rev 4924)
@@ -22,7 +22,7 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: 9ts
+Release: 1jh
 Copyright: GPL
 Group: development
 Source0: gcc-%{version}.tar.bz2


From svn at tinysofa.org  Thu Oct  7 05:39:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 01:39:10 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4925 - in tinysofa/releases/1.1/squid/current: sources specs
Message-ID: <20041007053910.99A523441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 01:39:09 -0400 (Thu, 07 Oct 2004)
New Revision: 4925

Added:
   tinysofa/releases/1.1/squid/current/sources/squid-2.5.STABLE5-proxy_abuse.patch
Modified:
   tinysofa/releases/1.1/squid/current/specs/squid.spec
Log:
- add proxy-abuse patch
- change /etc/squid.conf attr to 640,root,squid


Added: tinysofa/releases/1.1/squid/current/sources/squid-2.5.STABLE5-proxy_abuse.patch
===================================================================
--- tinysofa/releases/1.1/squid/current/sources/squid-2.5.STABLE5-proxy_abuse.patch	2004-10-06 18:07:27 UTC (rev 4924)
+++ tinysofa/releases/1.1/squid/current/sources/squid-2.5.STABLE5-proxy_abuse.patch	2004-10-07 05:39:09 UTC (rev 4925)
@@ -0,0 +1,23 @@
+Index: squid/src/http.c
+diff -c squid/src/http.c:1.384.2.15 squid/src/http.c:1.384.2.16
+*** squid/src/http.c:1.384.2.15	Sat Apr 24 08:07:08 2004
+--- squid/src/http.c	Tue Jun  8 04:54:07 2004
+***************
+*** 65,71 ****
+      if (httpState == NULL)
+  	return;
+      if (httpState->body_buf) {
+! 	clientAbortBody(httpState->orig_request);
+  	if (httpState->body_buf) {
+  	    memFree(httpState->body_buf, MEM_8K_BUF);
+  	    httpState->body_buf = NULL;
+--- 65,73 ----
+      if (httpState == NULL)
+  	return;
+      if (httpState->body_buf) {
+! 	if (httpState->orig_request->body_connection) {
+! 	    clientAbortBody(httpState->orig_request);
+! 	}
+  	if (httpState->body_buf) {
+  	    memFree(httpState->body_buf, MEM_8K_BUF);
+  	    httpState->body_buf = NULL;

Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec
===================================================================
--- tinysofa/releases/1.1/squid/current/specs/squid.spec	2004-10-06 18:07:27 UTC (rev 4924)
+++ tinysofa/releases/1.1/squid/current/specs/squid.spec	2004-10-07 05:39:09 UTC (rev 4925)
@@ -35,6 +35,7 @@
 Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-CONNECT_timeout.patch
 Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-cache_swap_log.patch
 Patch110: http://www1.uk.squid-cache.org/squid/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_fetch_string.patch
+Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-proxy_abuse.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -80,6 +81,7 @@
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
+%patch111 -p1
 
 
 %build
@@ -172,7 +174,7 @@
 %attr(750,squid,squid) %dir %{_localstatedir}/log/squid
 %attr(750,squid,squid) %dir %{_localstatedir}/spool/squid
 %attr(644,root,root) %{_sysconfdir}/pam.d/squid
-%config(noreplace) %{_sysconfdir}/squid/squid.conf
+%config(noreplace) %attr(640,root,squid) %{_sysconfdir}/squid/squid.conf
 %config(noreplace) %{_sysconfdir}/squid/mime.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/squid
 %config(noreplace) %{_sysconfdir}/squid/msntauth.conf
@@ -305,6 +307,10 @@
 
 
 %changelog
+* Thu Oct  7 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- add proxy-abuse patch
+- change /etc/squid.conf attr to 640,root,squid
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 2.5.STABLE5-8ts
 - current (2.5.STABLE5-8jh) integrated as 2.5.STABLE5-8ts for release 1.1-U1
 


From svn at tinysofa.org  Thu Oct  7 05:39:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 01:39:42 -0400 (EDT)
Subject: [tinysofa-svn] r4926 - tinysofa/releases/1.1/squid/current/specs
Message-ID: <20041007053942.45A0D3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 01:39:41 -0400 (Thu, 07 Oct 2004)
New Revision: 4926

Modified:
   tinysofa/releases/1.1/squid/current/specs/squid.spec
Log:
- bump up release

Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec
===================================================================
--- tinysofa/releases/1.1/squid/current/specs/squid.spec	2004-10-07 05:39:09 UTC (rev 4925)
+++ tinysofa/releases/1.1/squid/current/specs/squid.spec	2004-10-07 05:39:41 UTC (rev 4926)
@@ -4,7 +4,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE5
-Release: 8ts
+Release: 9jh
 Epoch: 0
 License: GPL
 Group: extra


From svn at tinysofa.org  Thu Oct  7 07:24:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 03:24:36 -0400 (EDT)
Subject: [tinysofa-svn] r4927 - tinysofa/releases/1.1/binutils/current/specs
Message-ID: <20041007072436.EB6453441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 03:24:36 -0400 (Thu, 07 Oct 2004)
New Revision: 4927

Modified:
   tinysofa/releases/1.1/binutils/current/specs/binutils.spec
Log:
- exclude %{_bindir}/c++filt


Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec
===================================================================
--- tinysofa/releases/1.1/binutils/current/specs/binutils.spec	2004-10-07 05:39:41 UTC (rev 4926)
+++ tinysofa/releases/1.1/binutils/current/specs/binutils.spec	2004-10-07 07:24:36 UTC (rev 4927)
@@ -134,6 +134,7 @@
 %defattr(-,root,root)
 %doc README
 %{_prefix}/bin/*
+%exclude %{_bindir}/c++filt
 %{_mandir}/man1/*
 %{_prefix}/include/*
 %{_prefix}/%{_lib}/lib*


From svn at tinysofa.org  Thu Oct  7 07:25:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 03:25:49 -0400 (EDT)
Subject: [tinysofa-svn] r4928 - tinysofa/releases/1.1/gcc
Message-ID: <20041007072549.ABA6A3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 03:25:49 -0400 (Thu, 07 Oct 2004)
New Revision: 4928

Removed:
   tinysofa/releases/1.1/gcc/current/
Log:
- remove gcc/current



From svn at tinysofa.org  Thu Oct  7 07:26:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 03:26:41 -0400 (EDT)
Subject: [tinysofa-svn] r4929 - tinysofa/releases/1.1/gcc
Message-ID: <20041007072641.5627B3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 03:26:40 -0400 (Thu, 07 Oct 2004)
New Revision: 4929

Added:
   tinysofa/releases/1.1/gcc/current/
Log:
- go back to gcc 3.3.3


Copied: tinysofa/releases/1.1/gcc/current (from rev 4922, tinysofa/releases/1.1/gcc/current)


From svn at tinysofa.org  Thu Oct  7 07:46:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 03:46:48 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4930 - in tinysofa/releases/1.1/tinysofa-rpm-config/current:
	sources specs
Message-ID: <20041007074648.A19083441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 03:46:48 -0400 (Thu, 07 Oct 2004)
New Revision: 4930

Added:
   tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.6.tar.bz2
Removed:
   tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.5.tar.bz2
Modified:
   tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec
Log:
- tinysofa-rpm-config-1.1.6


Deleted: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.5.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.6.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.6.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec
===================================================================
--- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec	2004-10-07 07:26:40 UTC (rev 4929)
+++ tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec	2004-10-07 07:46:48 UTC (rev 4930)
@@ -1,6 +1,6 @@
 Summary: tinysofa specific rpm configuration files.
 Name: tinysofa-rpm-config
-Version: 1.1.5
+Version: 1.1.6
 Release: 1jh
 License: GPL
 Group: development


From svn at tinysofa.org  Thu Oct  7 11:35:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 07:35:37 -0400 (EDT)
Subject: [tinysofa-svn] r4931 - tinysofa/releases/1.1/glib/current/specs
Message-ID: <20041007113537.CBE173441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 07:35:36 -0400 (Thu, 07 Oct 2004)
New Revision: 4931

Modified:
   tinysofa/releases/1.1/glib/current/specs/glib.spec
Log:
- require correct version of the pkgconfig


Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec
===================================================================
--- tinysofa/releases/1.1/glib/current/specs/glib.spec	2004-10-07 07:46:48 UTC (rev 4930)
+++ tinysofa/releases/1.1/glib/current/specs/glib.spec	2004-10-07 11:35:36 UTC (rev 4931)
@@ -26,7 +26,7 @@
 %package devel
 Summary: The GIMP ToolKit (GTK+) and GIMP Drawing Kit (GDK) support library
 Group: development
-Requires: pkgconfig >= 1:0.8
+Requires: pkgconfig >= 0.8
 Requires: %{name} = %{version}
 Conflicts: glib-devel <= 1:1.2.8
 Provides: glib2-devel = %{version}


From svn at tinysofa.org  Thu Oct  7 11:45:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 07:45:16 -0400 (EDT)
Subject: [tinysofa-svn] r4932 - tinysofa/releases/1.1/glib/current/specs
Message-ID: <20041007114516.24FC73441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 07:45:15 -0400 (Thu, 07 Oct 2004)
New Revision: 4932

Modified:
   tinysofa/releases/1.1/glib/current/specs/glib.spec
Log:
- remove bogus conflict

Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec
===================================================================
--- tinysofa/releases/1.1/glib/current/specs/glib.spec	2004-10-07 11:35:36 UTC (rev 4931)
+++ tinysofa/releases/1.1/glib/current/specs/glib.spec	2004-10-07 11:45:15 UTC (rev 4932)
@@ -28,7 +28,6 @@
 Group: development
 Requires: pkgconfig >= 0.8
 Requires: %{name} = %{version}
-Conflicts: glib-devel <= 1:1.2.8
 Provides: glib2-devel = %{version}
 
 %description devel


From svn at tinysofa.org  Thu Oct  7 11:54:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 07:54:04 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4933 - tinysofa/releases/1.1/dosfstools/current/specs
Message-ID: <20041007115404.9266C3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 07:54:04 -0400 (Thu, 07 Oct 2004)
New Revision: 4933

Modified:
   tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec
Log:
- add BuildRequires: linux-libc-headers
- add types patch


Modified: tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec
===================================================================
--- tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec	2004-10-07 11:45:15 UTC (rev 4932)
+++ tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec	2004-10-07 11:54:04 UTC (rev 4933)
@@ -12,6 +12,8 @@
 Patch3: dosfstools-2.8-loopsize.patch
 Patch4: dosfstools-2.8-autofat32.patch
 Patch5: dosfstools-2.8-endian.patch
+Patch6: dosfstools-2.8-types.patch
+BuildRequires: linux-libc-headers
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -28,6 +30,7 @@
 %patch3 -p1 -b .loopsize
 %patch4 -p1 -b .autofat32
 %patch5 -p1 -b .endian
+%patch6 -p1 -b .types
 
 
 %build
@@ -65,6 +68,10 @@
 
 
 %changelog
+* Thu Oct  7 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- add BuildRequires: linux-libc-headers
+- add types patch
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.8-1ts
 - current (2.8-1jh) integrated as 2.8-1ts for release 1.1
 


From svn at tinysofa.org  Thu Oct  7 15:18:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:18:06 -0400 (EDT)
Subject: [tinysofa-svn] r4934 - tinysofa/releases/1.1/vim/current/specs
Message-ID: <20041007151806.B8B103441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:18:06 -0400 (Thu, 07 Oct 2004)
New Revision: 4934

Modified:
   tinysofa/releases/1.1/vim/current/specs/vim.spec
Log:
- very minor cleanups


Modified: tinysofa/releases/1.1/vim/current/specs/vim.spec
===================================================================
--- tinysofa/releases/1.1/vim/current/specs/vim.spec	2004-10-07 11:54:04 UTC (rev 4933)
+++ tinysofa/releases/1.1/vim/current/specs/vim.spec	2004-10-07 15:18:06 UTC (rev 4934)
@@ -85,7 +85,7 @@
 %prep
 %setup -q -n %{shortname}
 
-# All the patches does not apply clean as they contain patches for files
+# All the patches do not apply clean as they contain patches for files
 # not in the Source0. That's why -t option is used for patch.
 cd src
 for f in \
@@ -145,7 +145,7 @@
 # Split into packages
 find %{buildroot}%{_datadir}/vim/%{shortname} -type f > filelist.all
 sed -e "s|%{buildroot}||" filelist.all | \
-	egrep -v '/tools(/|$)' > filelist.nottols
+	egrep -v '/tools(/|$)' > filelist.nottools
 egrep -v '/(colors|compiler|ftplugin|indent|macros|plugin|syntax)(/|$)' \
 	filelist.nottols > filelist.nosyntax
 egrep -v '/doc(/|$)' filelist.nosyntax > filelist.left


From svn at tinysofa.org  Thu Oct  7 15:21:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:21:52 -0400 (EDT)
Subject: [tinysofa-svn] r4935 - contrib/1.1/nedit/current/specs
Message-ID: <20041007152152.CF2353441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:21:52 -0400 (Thu, 07 Oct 2004)
New Revision: 4935

Modified:
   contrib/1.1/nedit/current/specs/nedit.spec
Log:
- use correct icon file

Modified: contrib/1.1/nedit/current/specs/nedit.spec
===================================================================
--- contrib/1.1/nedit/current/specs/nedit.spec	2004-10-07 15:18:06 UTC (rev 4934)
+++ contrib/1.1/nedit/current/specs/nedit.spec	2004-10-07 15:21:52 UTC (rev 4935)
@@ -6,7 +6,7 @@
 Summary: A GUI text editor for systems with X and Motif.
 Name: nedit
 Version: 5.4
-Release: 3jh
+Release: 4jh
 Source: http://nedit.org/ftp/v5_3/nedit-%{version}-source.tar.gz
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -64,7 +64,7 @@
 %if %{icewm_menu}
 mkdir -p %{buildroot}%{_datadir}/icewm/programs
 cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
-prog "Nedit Editor" nedit-icon.png nedit
+prog "Nedit Editor" nedit nedit
 __EOF__
 %endif
 


From svn at tinysofa.org  Thu Oct  7 15:27:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:27:13 -0400 (EDT)
Subject: [tinysofa-svn] r4936 - contrib/1.1/icewm/current/specs
Message-ID: <20041007152713.4D7573441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:27:12 -0400 (Thu, 07 Oct 2004)
New Revision: 4936

Modified:
   contrib/1.1/icewm/current/specs/icewm.spec
Log:
- add icon directory /usr/share/icewm/icons to default config

Modified: contrib/1.1/icewm/current/specs/icewm.spec
===================================================================
--- contrib/1.1/icewm/current/specs/icewm.spec	2004-10-07 15:21:52 UTC (rev 4935)
+++ contrib/1.1/icewm/current/specs/icewm.spec	2004-10-07 15:27:12 UTC (rev 4936)
@@ -1,7 +1,7 @@
 Summary: A fast, small X Window System window manager.
 Name: icewm
 Version: 1.2.16
-Release: 4gd
+Release: 5jh
 License: LGPL
 Group: contrib
 Source0: %{name}-%{version}.tar.gz
@@ -89,7 +89,10 @@
 
 
 %changelog
-* Fri Oct  1 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.16-5gd
+* Thu Oct  7 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.16-5jh
+- add icon directory /usr/share/icewm/icons to default config
+
+* Fri Oct  1 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.16-4gd
 - added some nice icons
 
 * Fri Oct  1 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.16-4jh


From svn at tinysofa.org  Thu Oct  7 15:31:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:31:03 -0400 (EDT)
Subject: [tinysofa-svn] r4937 - tinysofa/releases/1.1/procps/current/specs
Message-ID: <20041007153103.345F23441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:31:02 -0400 (Thu, 07 Oct 2004)
New Revision: 4937

Modified:
   tinysofa/releases/1.1/procps/current/specs/procps.spec
Log:
- remove leftover reference to %SOURCE1

Modified: tinysofa/releases/1.1/procps/current/specs/procps.spec
===================================================================
--- tinysofa/releases/1.1/procps/current/specs/procps.spec	2004-10-07 15:27:12 UTC (rev 4936)
+++ tinysofa/releases/1.1/procps/current/specs/procps.spec	2004-10-07 15:31:02 UTC (rev 4937)
@@ -45,7 +45,6 @@
 %patch7 -p1 -b .top-vmsize-env
 %patch9 -p1 -b .dumb
 %patch10 -p1 -b .noproc
-cp %SOURCE1 .
 
 
 %build


From svn at tinysofa.org  Thu Oct  7 15:34:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:34:07 -0400 (EDT)
Subject: [tinysofa-svn] r4938 - tinysofa/releases/1.1/make/current/specs
Message-ID: <20041007153407.C9D1B3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:34:07 -0400 (Thu, 07 Oct 2004)
New Revision: 4938

Modified:
   tinysofa/releases/1.1/make/current/specs/make.spec
Log:
- remove second %install

Modified: tinysofa/releases/1.1/make/current/specs/make.spec
===================================================================
--- tinysofa/releases/1.1/make/current/specs/make.spec	2004-10-07 15:31:02 UTC (rev 4937)
+++ tinysofa/releases/1.1/make/current/specs/make.spec	2004-10-07 15:34:07 UTC (rev 4938)
@@ -112,7 +112,7 @@
 
 * Fri Jan 21 2000 Cristian Gafton <gafton at redhat.com>
 - apply patch to fiox a /tmp race condition from Thomas Biege
-- simplify %install
+- simplify install
 
 * Sat Nov 27 1999 Jeff Johnson <jbj at redhat.com>
 - update to 3.78.1.


From svn at tinysofa.org  Thu Oct  7 15:34:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:34:56 -0400 (EDT)
Subject: [tinysofa-svn] r4939 - tinysofa/releases/1.1/postfix/current/specs
Message-ID: <20041007153456.D45CF3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:34:56 -0400 (Thu, 07 Oct 2004)
New Revision: 4939

Modified:
   tinysofa/releases/1.1/postfix/current/specs/postfix.spec
Log:
- remove second %install

Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-10-07 15:34:07 UTC (rev 4938)
+++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-10-07 15:34:56 UTC (rev 4939)
@@ -494,7 +494,7 @@
 * Wed May 12 2004 Omar Kilani <omar at tinysofa dot org> 
 - Add BuildRequires: pam-devel
 - Add Requires: pam
-- Fix %install script.
+- Fix %%install script.
 
 * Thu Mar 25 2004 Omar Kilani <omar at tinysofa dot org> 2.0.19-1ts
 - New upstream.
@@ -755,7 +755,7 @@
 * Fri Apr  7 2000 Stian Storengen Olsen <stiano at tihlde dot org>
 - Added 'provides'
 - Moved 'useradd' and 'groupadd' to %pre
-- Changed 'chown' in %install from postfix.root to postfix.postfix
+- Changed 'chown' in %%install from postfix.root to postfix.postfix
 
 * Thu Mar  2 2000 Erlend Midttun <erlendbm at trustix dot com>
 - Added spool dirs


From svn at tinysofa.org  Thu Oct  7 15:36:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:36:46 -0400 (EDT)
Subject: [tinysofa-svn] r4940 - tinysofa/releases/1.1/procps/current/specs
Message-ID: <20041007153646.A3A083441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:36:45 -0400 (Thu, 07 Oct 2004)
New Revision: 4940

Modified:
   tinysofa/releases/1.1/procps/current/specs/procps.spec
Log:
- remove FAQ from %doc

Modified: tinysofa/releases/1.1/procps/current/specs/procps.spec
===================================================================
--- tinysofa/releases/1.1/procps/current/specs/procps.spec	2004-10-07 15:34:56 UTC (rev 4939)
+++ tinysofa/releases/1.1/procps/current/specs/procps.spec	2004-10-07 15:36:45 UTC (rev 4940)
@@ -66,7 +66,7 @@
 
 %files
 %defattr(0644,root,root,755)
-%doc NEWS BUGS TODO FAQ
+%doc NEWS BUGS TODO
 %attr(755,root,root) /%{_lib}/*
 %attr(755,root,root) /bin/ps
 %attr(755,root,root) /sbin/sysctl


From svn at tinysofa.org  Thu Oct  7 15:46:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:46:54 -0400 (EDT)
Subject: [tinysofa-svn] r4941 - tinysofa/releases/1.1/mdadm/current/specs
Message-ID: <20041007154654.5995C3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:46:53 -0400 (Thu, 07 Oct 2004)
New Revision: 4941

Modified:
   tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec
Log:
- remove second %install

Modified: tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec
===================================================================
--- tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec	2004-10-07 15:36:45 UTC (rev 4940)
+++ tinysofa/releases/1.1/mdadm/current/specs/mdadm.spec	2004-10-07 15:46:53 UTC (rev 4941)
@@ -118,14 +118,14 @@
 
 * Thu Jun 06 2002 Goetz Bock <bock at blacknet.de> 1.0.1-1bg
 - new upstream version: 1.0.1
-- cleaned up %install, as makefile now has install target  
+- cleaned up %%install, as makefile now has install target  
 
 * Thu Mar 21 2002 Goetz Bock <bock at blacknet.de> 0.7.2-2bn
 - moved mdadm to /sbin, it is required to boot
 
 * Thu Mar 21 2002 Goetz Bock <bock at blacknet.de> 0.7.2-1bn
 - updated to 0.7.2
-- sanitycheck for %clean and %install
+- sanitycheck for %clean and %%install
 - fixed type in $RPM_BUILD_ROOT, and some other mixups of % and $
  
 * Fri Mar 15 2002  <gleblanc at localhost.localdomain>


From svn at tinysofa.org  Thu Oct  7 15:47:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:47:30 -0400 (EDT)
Subject: [tinysofa-svn] r4942 - tinysofa/releases/1.1/modutils/current/specs
Message-ID: <20041007154730.E51063441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:47:30 -0400 (Thu, 07 Oct 2004)
New Revision: 4942

Modified:
   tinysofa/releases/1.1/modutils/current/specs/modutils.spec
Log:
- remove second %install

Modified: tinysofa/releases/1.1/modutils/current/specs/modutils.spec
===================================================================
--- tinysofa/releases/1.1/modutils/current/specs/modutils.spec	2004-10-07 15:46:53 UTC (rev 4941)
+++ tinysofa/releases/1.1/modutils/current/specs/modutils.spec	2004-10-07 15:47:30 UTC (rev 4942)
@@ -100,7 +100,7 @@
 
 * Thu Mar 21 2002 Goetz Bock <bock at blacknet.de> 2.4.14-1bn
 - New upstream version: 2.4.14
-- ugly hack to make %install work with --disable-combined
+- ugly hack to make %%install work with --disable-combined
 
 * Fri Jun  8 2001 Oystein Viggen <oysteivi at trustix dot com>
 - New upstream version: 2.4.6


From svn at tinysofa.org  Thu Oct  7 15:48:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 11:48:06 -0400 (EDT)
Subject: [tinysofa-svn] r4943 - tinysofa/releases/1.1/perl/current/specs
Message-ID: <20041007154806.E602D3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 11:48:06 -0400 (Thu, 07 Oct 2004)
New Revision: 4943

Modified:
   tinysofa/releases/1.1/perl/current/specs/perl.spec
Log:
- remove second %install

Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/1.1/perl/current/specs/perl.spec	2004-10-07 15:47:30 UTC (rev 4942)
+++ tinysofa/releases/1.1/perl/current/specs/perl.spec	2004-10-07 15:48:06 UTC (rev 4943)
@@ -583,7 +583,7 @@
 - add provides for perl modules (from kestes at staff.mail.com).
 
 * Mon Oct 04 1999 Cristian Gafton <gafton at redhat.com>
-- fix the %install so that the MD5 module gets actually installed correctly
+- fix the %%install so that the MD5 module gets actually installed correctly
 
 * Mon Aug 30 1999 Cristian Gafton <gafton at redhat.com>
 - make sure the package builds even when we don't have perl installed on the


From svn at tinysofa.org  Thu Oct  7 16:28:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 12:28:15 -0400 (EDT)
Subject: [tinysofa-svn] r4944 - tinysofa/releases/1.1/lilo/current/specs
Message-ID: <20041007162815.DC6FF3441A6@minbar.tinysofa.org>

Author: jh
Date: 2004-10-07 12:28:15 -0400 (Thu, 07 Oct 2004)
New Revision: 4944

Modified:
   tinysofa/releases/1.1/lilo/current/specs/lilo.spec
Log:
- 22.6

Modified: tinysofa/releases/1.1/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/releases/1.1/lilo/current/specs/lilo.spec	2004-10-07 15:48:06 UTC (rev 4943)
+++ tinysofa/releases/1.1/lilo/current/specs/lilo.spec	2004-10-07 16:28:15 UTC (rev 4944)
@@ -2,18 +2,16 @@
 Summary(pt_BR): Carregador de boot para Linux e outros sistemas operacionais
 Summary(es): Cargador de arranque para Linux y otros sistemas operativos
 Name: lilo
-Version: 22.3.2
-Release: 1ts
+Version: 22.6
+Release: 1jh
 License: MIT
 Group: main
 Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{version}.tar.gz
 Source2: keytab-lilo.c
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0: lilo-nolatexdoc.patch
-Patch1: lilo-22.5.8-lvm_ioctl_fixup.patch
-Patch2: lilo-22.3.3-page.patch
 PreReq: /sbin/grubby grep
-BuildRequires: dev86, nasm
+BuildRequires: dev86, nasm, sed
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Exclusivearch: i386 i586
 
@@ -41,8 +39,6 @@
 %prep
 %setup -q
 %patch0 -p1 
-%patch1 -p1 -b .lvm_ioctl-fixup
-%patch2 -p1 -b .page
 
 # we need a hack to properly use CFLAGS
 sed -e "s/^CFLAGS=/CFLAGS=$RPM_OPT_FLAGS /" < Makefile > Makefile.new
@@ -66,9 +62,7 @@
 
 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
@@ -88,14 +82,10 @@
 %defattr(644,root,root)
 %doc CHANGES COPYING INCOMPAT QuickInst README README.bitmaps
 %doc README.common.problems README.disk README.pseudo README.raid1
-# %doc doc
 %doc sample/lilo.raid.conf sample/lilo.sample.conf
-/usr/share/man/man5/lilo.conf.5*
-/usr/share/man/man8/lilo.8*
-/usr/share/man/man8/mkrescue.8*
-/boot/boot.b
-/boot/chain.b
-/boot/os2_d.b
+%{_mandir}/man5/lilo.conf.5*
+%{_mandir}/man8/lilo.8*
+%{_mandir}/man8/mkrescue.8*
 %defattr(-,root,root)
 /sbin/mkrescue
 /sbin/lilo
@@ -103,6 +93,9 @@
 
 
 %changelog
+* Thu Oct  7 2004 Jaakko Heinonen <jh at tinysofa dot org> 22.6-1jh
+- 22.6
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 22.3.2-1ts
 - current (22.3.2-1jh) integrated as 22.3.2-1ts for release 1.1
 


From svn at tinysofa.org  Thu Oct  7 17:38:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 13:38:10 -0400 (EDT)
Subject: [tinysofa-svn] r4946 - in contrib/1.1: . gtk/current/specs
Message-ID: <20041007173810.E6D6C3441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 13:38:10 -0400 (Thu, 07 Oct 2004)
New Revision: 4946

Added:
   contrib/1.1/gtk/
   contrib/1.1/gtk/current/specs/gtk.spec
Log:
gtk2 renamed to gtk

Copied: contrib/1.1/gtk (from rev 4918, contrib/1.1/gtk2)

Copied: contrib/1.1/gtk/current/specs/gtk.spec (from rev 4945, contrib/1.1/gtk2/current/specs/gtk.spec)


From svn at tinysofa.org  Thu Oct  7 18:08:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 14:08:37 -0400 (EDT)
Subject: [tinysofa-svn] r4947 - in contrib/1.1: . libglade libglade/current
	libglade/current/sources libglade/current/specs
Message-ID: <20041007180837.553D63441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 14:08:36 -0400 (Thu, 07 Oct 2004)
New Revision: 4947

Added:
   contrib/1.1/libglade/
   contrib/1.1/libglade/current/
   contrib/1.1/libglade/current/sources/
   contrib/1.1/libglade/current/sources/libglade-2.0.1-nowarning.patch
   contrib/1.1/libglade/current/sources/libglade-2.4.0.tar.bz2
   contrib/1.1/libglade/current/specs/
   contrib/1.1/libglade/current/specs/libglade.spec
   contrib/1.1/libglade/pristine/
   contrib/1.1/libglade/releases/
Log:
renamed libglade2 -> libglade

Added: contrib/1.1/libglade/current/sources/libglade-2.0.1-nowarning.patch
===================================================================
--- contrib/1.1/libglade/current/sources/libglade-2.0.1-nowarning.patch	2004-10-07 17:38:10 UTC (rev 4946)
+++ contrib/1.1/libglade/current/sources/libglade-2.0.1-nowarning.patch	2004-10-07 18:08:36 UTC (rev 4947)
@@ -0,0 +1,39 @@
+--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
++++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
+@@ -639,9 +639,8 @@
+ 		if (!strcmp (childinfo->properties[j].name, "label")) {
+ 		    label = childinfo->properties[j].value;
+ 		    break;
+-		} else {
+-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
+ 		}
++		/* Ignore all other properties */
+ 	    }
+ 
+ 	    if (label) {
+@@ -683,6 +682,7 @@
+ 	    char *icon = NULL;
+ 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
+ 	    gboolean use_underline = FALSE;
++	    gboolean sensitive = TRUE;
+ 	    GtkWidget *iconw = NULL;
+ 	    int j;
+ 
+@@ -708,6 +708,8 @@
+ 		    group_name = value;
+ 		} else if (!strcmp (name, "new_group")) {
+ 		    new_group = BOOL (value);
++		} else if (!strcmp (name, "sensitive")) {
++		    sensitive = BOOL (value);
+ 		} else if (!strcmp (name, "visible")) {
+ 		    /* ignore for now */
+ 		} else if (!strcmp (name, "tooltip")) {
+@@ -785,6 +787,8 @@
+ 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
+ 					     TRUE);
+ 	    }
++	    
++	    gtk_widget_set_sensitive (child, sensitive);
+ 
+ 	    glade_xml_set_common_params (xml, child, childinfo->child);
+ 	} else {

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


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

Added: contrib/1.1/libglade/current/specs/libglade.spec
===================================================================
--- contrib/1.1/libglade/current/specs/libglade.spec	2004-10-07 17:38:10 UTC (rev 4946)
+++ contrib/1.1/libglade/current/specs/libglade.spec	2004-10-07 18:08:36 UTC (rev 4947)
@@ -0,0 +1,248 @@
+%define libxml2_version 2.4.12-0.7
+%define gtk_version 2.3.2
+%define pango_version 1.3.2
+
+Summary: The libglade library for loading user interfaces.
+Name: libglade
+Version: 2.4.0
+Release: 2gd
+Copyright: LGPL
+Group: contrib
+Source: libglade-%{version}.tar.bz2
+URL: http://www.gnome.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: libxml2 >= %{libxml2_version}
+BuildRequires: libxml2-devel >= %{libxml2_version}
+BuildRequires: gtk-devel >= %{gtk_version}
+BuildRequires: fontconfig
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: libtool
+BuildRequires: python
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=121025
+Patch1: libglade-2.0.1-nowarning.patch
+
+%description
+Libglade is a small library that allows a program to load its user
+interface from am XML description at runtime. Libglade uses the XML
+file format used by the GLADE user interface builder GLADE, so
+libglade acts as an alternative to GLADE's code generation
+approach. Libglade also provides a simple interface for connecting
+handlers to the various signals in the interface (on platforms where
+the gmodule library works correctly, it is possible to connect all the
+handlers with a single function call). Once the interface has been
+instantiated, libglade gives no overhead, so other than the short
+initial interface loading time, there is no performance tradeoff.
+
+%package devel
+Summary: The files needed for libglade application development.
+Group: contrib
+Requires: %name = %{PACKAGE_VERSION}
+Requires: libxml2-devel >= %{libxml2_version}
+Requires: gtk-devel >= %{gtk_version}
+Conflicts: libglade < 0.17
+
+%description devel
+The libglade-devel package contains the libraries and include files
+that you can use to develop libglade applications.
+
+%prep
+%setup -q -n libglade-%{version}
+
+%patch1 -p1 -b .nowarning
+
+%build
+libtoolize --force --copy
+#aclocal
+#automake
+
+export LD_LIBRARY_PATH=/usr/X11R6/lib
+%configure --disable-gtk-doc
+make %{?_smp_mflags}
+
+%install
+%makeinstall
+
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+%clean_buildroot
+
+%post   -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog NEWS README COPYING
+%{_libdir}/lib*.so.*
+%{_datadir}/xml
+
+%files devel
+%defattr(-, root, root)
+%doc test-libglade.c
+%{_bindir}/*
+%{_libdir}/lib*.so
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+%{_datadir}/gtk-doc
+
+%changelog
+* Mon Oct  4 2004 Gerald Dachs <gda at tinysofa dot org> 2.4.0-2gd
+- taken from tinysofa enterprise server
+
+* Thu May 20 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.0-1
+- Upgrade to 2.4.0
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc at redhat.com> 2.3.6-1
+- Update to 2.3.6
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Jan 23 2004 Alexander Larsson <alexl at redhat.com> 2.3.2-1
+- Update to 2.3.2
+
+* Fri Aug 29 2003 Owen Taylor <otaylor at redhat.com> 2.0.1-5.0
+- Fix a couple of warnings for unknown properties GtkToolbar (Hardy Merrill, 
+  #85384) and GtkCList.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 14 2003 Tim Powers <timp at redhat.com> 2.0.1-3
+- remove BuildRequires on Xft
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Fri Nov  8 2002 Havoc Pennington <hp at redhat.com>
+- 2.0.1
+
+* Tue Oct  8 2002 Havoc Pennington <hp at redhat.com>
+- destroy .la files
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sat Jun 15 2002 Havoc Pennington <hp at redhat.com>
+- 2.0.0
+- check over file list, add XML DTD to it
+
+* Fri May 17 2002 Havoc Pennington <hp at redhat.com>
+- rebuild in different environment
+
+* Fri May 17 2002 Havoc Pennington <hp at redhat.com>
+- don't run auto*
+
+* Fri May 17 2002 Havoc Pennington <hp at redhat.com>
+- 1.99.12
+- remove gtk-doc hack, --disable-gtk-doc now works
+
+* Thu May  2 2002 Havoc Pennington <hp at redhat.com>
+- 1.99.11
+
+* Thu Apr  4 2002 Jeremy Katz <katzj at redhat.com>
+- 1.99.10
+
+* Tue Mar 19 2002 Alex Larsson <alexl at redhat.com>
+- Update autoconf dependency to 2.53
+
+* Mon Mar 11 2002 Alex Larsson <alexl at redhat.com>
+- Update to 1.99.9
+
+* Mon Feb 25 2002 Alex Larsson <alexl at redhat.com>
+- Bump for rebuild
+
+* Thu Feb 21 2002 Alex Larsson <alexl at redhat.com>
+- Bump for rebuild
+
+* Tue Feb 19 2002 Alex Larsson <alexl at redhat.com>
+- Add horrible buildroot check hacks. Require new Gtk+.
+
+* Thu Feb 14 2002 Havoc Pennington <hp at redhat.com>
+- rebuild for new gtk
+
+* Wed Jan 30 2002 Owen Taylor <otaylor at redhat.com>
+- Rebuild against new GTK+
+
+* Tue Jan 22 2002 Havoc Pennington <hp at redhat.com>
+- put "nogtkdoc" patch back, it avoids X display requirement
+- automake14
+
+* Wed Jan  2 2002 Havoc Pennington <hp at redhat.com>
+- 1.99.5.90 snap
+- comment out "nogtkdoc" patch, don't run autoconf
+
+* Mon Nov 26 2001 Havoc Pennington <hp at redhat.com>
+- new 1.99.4.91 snap with Jacob's fixes, he 
+  assures me we are 1.99.4.90 ABI-compatible
+
+* Mon Nov 26 2001 Havoc Pennington <hp at redhat.com>
+- new 1.99.4.90 snap, gtk 1.3.11
+
+* Fri Oct 26 2001 Havoc Pennington <hp at redhat.com>
+- new snap, rebuild on gtk 1.3.10
+
+* Sat Oct  6 2001 Havoc Pennington <hp at redhat.com>
+- new snap, add hack to avoid trying to build docs
+- add the ltmain.sh hack to avoid relinking
+
+* Mon Sep 24 2001 Havoc Pennington <hp at redhat.com>
+- new snap
+
+* Fri Sep 21 2001 Havoc Pennington <hp at redhat.com>
+- convert libglade rpm to libglade2 rpm, initial build of libglade2
+
+* Mon Aug 20 2001 Jonathan Blandford <jrb at redhat.com>
+- Escape strings, #51966
+
+* Sun Jul 22 2001 Havoc Pennington <hp at redhat.com>
+- add build requires, bug #49508
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
+- New Version.
+
+* Thu Mar 01 2001 Owen Taylor <otaylor at redhat.com>
+- Rebuild for GTK+-1.2.9 include paths
+
+* Thu Feb 08 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- add libtoolize to make porting to new archs easy
+
+* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
+- 0.14
+- added patch for gtk-doc scanner linkage
+
+* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
+- Up Epoch and release
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Thu Jun 29 2000 Owen Taylor <otaylor at redhat.com>
+- specfile fixes
+
+* Wed May 31 2000 Owen Taylor <otaylor at redhat.com>
+- Upgraded to libglade-0.13
+- Use %makeinstall, since that is required when %configure is used.
+
+* Fri May 19 2000 Owen Taylor <otaylor at redhat.com>
+- Upgraded to libglade-0.12
+
+* Tue Sep 07 1999 Elliot Lee <sopwith at redhat.com>
+- Updated RHL 6.1 package to libglade-0.5
+
+* Sun Nov  1 1998 James Henstridge <james at daa.com.au>
+
+- Updated the dependencies of the devel package, so users must have gtk+-devel.
+
+* Sun Oct 25 1998 James Henstridge <james at daa.com.au>
+
+- Initial release 0.0.1


From svn at tinysofa.org  Thu Oct  7 18:09:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 14:09:54 -0400 (EDT)
Subject: [tinysofa-svn] r4948 - contrib/1.1
Message-ID: <20041007180954.5B6C63441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 14:09:53 -0400 (Thu, 07 Oct 2004)
New Revision: 4948

Removed:
   contrib/1.1/libglade2/
Log:
renamed libglade2 -> libglade


From svn at tinysofa.org  Thu Oct  7 18:10:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 14:10:24 -0400 (EDT)
Subject: [tinysofa-svn] r4949 - contrib/1.1
Message-ID: <20041007181024.DC9533441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 14:10:24 -0400 (Thu, 07 Oct 2004)
New Revision: 4949

Removed:
   contrib/1.1/gtk2/
Log:
renamed gtk2 -> gtk


From svn at tinysofa.org  Thu Oct  7 18:10:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 14:10:55 -0400 (EDT)
Subject: [tinysofa-svn] r4950 - contrib/1.1/gtk/current/specs
Message-ID: <20041007181055.305323441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 14:10:54 -0400 (Thu, 07 Oct 2004)
New Revision: 4950

Removed:
   contrib/1.1/gtk/current/specs/gtk2.spec
Log:
renamed gtk2 -> gtk

Deleted: contrib/1.1/gtk/current/specs/gtk2.spec
===================================================================
--- contrib/1.1/gtk/current/specs/gtk2.spec	2004-10-07 18:10:24 UTC (rev 4949)
+++ contrib/1.1/gtk/current/specs/gtk2.spec	2004-10-07 18:10:54 UTC (rev 4950)
@@ -1,764 +0,0 @@
-# Note that this is NOT a relocatable package
-
-%define glib_base_version 2.4.0
-%define glib_version %{glib_base_version}-1
-%define pango_base_version 1.4.0
-%define pango_version %{pango_base_version}-1
-%define atk_base_version 1.6.0
-%define atk_version %{atk_base_version}-1
-%define libpng_version 1.2.2-16
-
-%define base_version 2.4.4
-%define bin_version 2.4.0
-
-Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
-Name: gtk2
-Version: %{base_version}
-Release: 3gd
-License: LGPL
-Group: contrib
-Source: gtk+-%{version}.tar.bz2
-Source1: update-scripts.tar.gz
-
-# Rename the 'Default' widget theme to 'Raleigh'
-Patch3: gtk+-2.3.2-themename.patch
-# Mark assembly files as noexec-stack
-Patch5: gtk+-2.2.2-noexecstack.patch
-Patch6: gtk+-2.4.1-lib64.patch
-
-BuildPrereq: atk-devel >= %{atk_version}
-BuildPrereq: pango-devel >= %{pango_version}
-BuildPrereq: glib-devel >= %{glib_version}
-BuildPrereq: libtiff-devel
-BuildPrereq: libjpeg-devel
-BuildPrereq: libpng-devel >= %{libpng_version}
-BuildPrereq: gcc-c++ gettext
-BuildPrereq: autoconf
-# needed for running aclocal
-# BuildPrereq: gtk-doc
-
-BuildRoot: %{_tmppath}/gtk-%{PACKAGE_VERSION}-root
-
-URL: http://www.gtk.org
-
-# We need to prereq these so we can run gtk-query-immodules-2.0
-Prereq: glib >= %{glib_version}
-Prereq: atk >= %{atk_version}
-Prereq: pango >= %{pango_version}
-
-%define _unpackaged_files_terminate_build      1
-%define _missing_doc_files_terminate_build     1
-
-
-%description
-GTK+ is a multi-platform toolkit for creating graphical user
-interfaces. Offering a complete set of widgets, GTK+ is suitable for
-projects ranging from small one-off tools to complete application
-suites.
-
-%package devel
-Summary: Development tools for GTK+ applications.
-Group: contrib
-Requires: gtk2 = %{version}
-Requires: pango-devel >= %{pango_version}
-Requires: atk-devel >= %{atk_version}
-Requires: glib-devel >= %{glib_version}
-Requires: xorg-x11-devel
-
-%description devel
-The gtk+-devel package contains the header files and developer
-docs for the GTK+ widget toolkit.  
-
-%prep
-%setup -q -n gtk+-%{version}
-
-(cd .. && tar xzf %{SOURCE1})
-
-%patch5 -p1 -b .noexecstack
-%patch6 -p1 -b .lib64
-
-for i in config.guess config.sub ; do
-	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
-done
-
-%build
-
-
-# Patch3 modifies Makefile.am
-# aclocal-1.8
-# automake-1.8
-
-autoconf
-
-if ! pkg-config --exists pangoxft ; then
-        echo "No pangoxft.pc!"
-        exit 1
-fi
-
-export LD_LIBRARY_PATH=/usr/X11R6/lib
-%configure --with-xinput=xfree --disable-gtk-doc
-
-## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 
-## past gtk 2.1.2
-make ## %{?_smp_mflags}
-
-%install
-# Deriving /etc/gtk-2.0/$host location
-# NOTE: Duplicated below
-#
-# autoconf changes linux to linux-gnu
-case "%{_host}" in
-  *linux) host="%{_host}-gnu"
-  ;;
-  *) host="%{_host}"
-  ;;
-esac
-
-# autoconf uses powerpc not ppc
-host=`echo $host | sed "s/^ppc/powerpc/"`
-
-# Make sure that the host value that is passed to the compile 
-# is the same as the host that we're using in the spec file
-#
-compile_host=`grep 'host_triplet =' gtk/Makefile | sed "s/.* = //"`
-
-if test "x$compile_host" != "x$host" ; then
-  echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1
-fi
-
-%makeinstall RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false
-
-%find_lang gtk20
-%find_lang gtk20-properties
-
-cat gtk20.lang gtk20-properties.lang > all.lang
-
-./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
-#
-# Make cleaned-up versions of tutorials, examples, and faq for installation
-#
-./mkinstalldirs tmpdocs
-cp -aR docs/tutorial/html tmpdocs/tutorial
-cp -aR docs/faq/html tmpdocs/faq
-
-for dir in examples/* ; do
-    if [ -d $dir ] ; then
-       ./mkinstalldirs tmpdocs/$dir
-       for file in $dir/* ; do
-	 install -m 0644 $file tmpdocs/$dir
-       done
-    fi
-done
-
-# We need to have separate 32-bit and 64-bit binaries
-# for places where we have two copies of the GTK+ package installed.
-# (we might have x86_64 and i686 packages on the same system, for example.)
-case "$host" in
-  alpha*|ia64*|ppc64*|s390x*|x86_64*)
-   mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-64
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-csource $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-csource-64
-   mv $RPM_BUILD_ROOT%{_bindir}/gtk-demo $RPM_BUILD_ROOT%{_bindir}/gtk-demo-64
-   ;;
-  *)
-   mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-32
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-32
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-csource $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-csource-32
-   mv $RPM_BUILD_ROOT%{_bindir}/gtk-demo $RPM_BUILD_ROOT%{_bindir}/gtk-demo-32
-   ;;
-esac
-
-#
-# Install wrappers for the binaries
-#
-cp ../update-gtk-immodules $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
-cp ../update-gdk-pixbuf-loaders $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
-cp ../gdk-pixbuf-csource $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-csource
-
-# Remove unpackaged files
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gtk.immodules
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders
-
-#
-# We need the substitution of $host so we use an external
-# file list
-#
-echo %dir %{_sysconfdir}/gtk-2.0/$host >> all.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gtk.immodules >> all.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders >> all.lang
-
-%clean
-%clean_buildroot
-
-%post
-/sbin/ldconfig
-/usr/bin/update-gdk-pixbuf-loaders %{_host}
-/usr/bin/update-gtk-immodules %{_host}
-
-%postun
-/sbin/ldconfig
-
-%files -f all.lang
-%defattr(-, root, root)
-
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/gtk-demo*
-%{_bindir}/gdk-pixbuf-query-loaders*
-%{_bindir}/gtk-query-immodules-2.0*
-%{_bindir}/update-gdk-pixbuf-loaders
-%{_bindir}/update-gtk-immodules
-%{_libdir}/libgtk-x11-2.0.so.*
-%{_libdir}/libgdk-x11-2.0.so.*
-%{_libdir}/libgdk_pixbuf-2.0.so.*
-%{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
-%dir %{_libdir}/gtk-2.0
-%{_libdir}/gtk-2.0/%{bin_version}
-%{_datadir}/gtk-2.0
-%{_datadir}/themes/Default
-%{_datadir}/themes/Emacs
-%dir %{_sysconfdir}/gtk-2.0
-
-%files devel
-%defattr(-, root, root)
-
-%{_libdir}/lib*.so
-%dir %{_libdir}/gtk-2.0
-%{_libdir}/gtk-2.0/include
-%{_datadir}/gtk-doc/
-%{_mandir}/man1/*
-%{_includedir}/*
-%{_datadir}/aclocal/*
-%{_bindir}/gdk-pixbuf-csource*
-%{_libdir}/pkgconfig/*
-%doc tmpdocs/tutorial
-%doc tmpdocs/faq
-%doc tmpdocs/examples
-
-%changelog
-* Sun Oct  3 2004 Gerald Dachs <gda at tinysofa dot de> 2.4.4-3gd
-- taken from tinysofa enterprise server
-
-* Fri Jul 16 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.4-2
-- Fix permissions of gdk-pixbuf-csource script. 
-- Escape macros in %%changelog
-
-* Fri Jul  9 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.4-1
-- Update to 2.4.4
-
-* Thu Jul  8 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.1-5
-- Look for the gtk.immodules file in the right location.  (#127073)
-
-* Thu Jul  8 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.1-4
-- Add a wrapper for gdk-pixbuf-csource.
-
-* Wed Jun 23 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.1-3
-- Don't install testgtk and testtext
-- Rename binaries to -32/-64 (#124478)
-- Move arch-dependent config files to /etc/gtk-2.0/$host (#124482)
-- Add wrappers for updating the arch-dependent config files
-
-* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu May 20 2004 Matthias Clasen <mclasen at redhat.com> - 2.4.1-1
-- Upgrade to 2.4.1
-
-* Wed Mar 17 2004 Alex Larsson <alexl at redhat.com> 2.4.0-1
-- update to 2.4.0
-- update bin_version to 2.4.0
-
-* Wed Mar 10 2004 Mark McLoughlin <markmc at redhat.com> 2.3.6-1
-- Update to 2.3.6
-- Remove 2.3.5 buildfix patch
-- Remove gdk-pixbuf-xlib dependancy fix
-
-* Wed Mar 03 2004 Mark McLoughlin <markmc at redhat.com> 2.3.5-1
-- Update to 2.3.5
-- Bump the required glib and pango versions
-- Make it build on x86_64
-
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed Feb 25 2004 Mark McLoughlin <markmc at redhat.com> 2.3.4-1
-- Update to 2.3.4
-- Remove the xft-prefs patch, its upstream now
-- Don't kill libtool's hardcode_libdir_flag_spec anymore
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Jan 23 2004 Alexander Larsson <alexl at redhat.com> 2.3.2-2
-- Remove old HAVE_XFT2 check
-- find_lang gtk20-properties too
-
-* Fri Jan 23 2004 Jonathan Blandford <jrb at redhat.com> 2.3.2-1
-- new version
-- removed patches that have been applied to 2.3.x branch
-
-* Mon Dec  1 2003 Thomas Woerner <twoerner at redhat.com> 2.2.4-5.2
-- removed rpath
-
-* Wed Oct 15 2003 Owen Taylor <otaylor at redhat.com> 2.2.4-5.1
-- Link gdk-pixbuf-xlib against gdk-pixbuf (#106678)
-
-* Fri Oct  3 2003 Owen Taylor <otaylor at redhat.com> 2.2.4-4.0
-- Fix 64-bit problem in gtkimcontextxim.c (#106124)
-
-* Tue Sep 16 2003 Owen Taylor <otaylor at redhat.com> 2.2.4-3.0
-- Fix an infinite loop that can occur in the panel (#104524)
-
-* Fri Sep  5 2003 Owen Taylor <otaylor at redhat.com> 2.2.4-2.1
-- Fix up tutorial in packaging (#90197), add FAQ 
-- Back out change to make KP_Decimal interpretation dependent on locale
-  (#101046)
-
-* Thu Sep  4 2003 Owen Taylor <otaylor at redhat.com> 2.2.4-1.1
-- Version 2.2.4 - fixes a few small problems in 2.2.3
-
-* Tue Aug 26 2003 Owen Taylor <otaylor at redhat.com> 2.2.3-1.1
-- Version 2.2.3
-
-* Thu Jul 10 2003 Owen Taylor <otaylor at redhat.com> 2.2.2-2.0
-- Change release number for rebuild
-
-* Wed Jul  9 2003 Owen Taylor <otaylor at redhat.com> 2.2.2-2.1
-- XFlush() rather than XSync() at the end of process_all_updates()
-  (big remote X anaconda speedup)
-- Add patch to fix frequent Red Hat 9 crash 
-  http://bugzilla.gnome.org/show_bug.cgi?id=105745
-
-* Mon Jun  9 2003 Owen Taylor <otaylor at redhat.com>
-- Version 2.2.2
-- Mark assembly files as noexec-stack
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon Feb 24 2003 Jonathan Blandford <jrb at redhat.com> 2.2.1-2
-- add a libpng dependency to pull in the rebuilt version.
-
-* Fri Feb 21 2003 Jonathan Blandford <jrb at redhat.com> 2.2.1-2
-- add a patch to fix broken scrolling in a lot of applications.
-
-* Sun Feb  2 2003 Owen Taylor <otaylor at redhat.com>
-- Version 2.2.1
-- Update xftprefs for gtk+-2.2.1
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan 14 2003 Jonathan Blandford <jrb at redhat.com>
-- patch to fix TreeView misdrawing.  Remove when 2.2.1 comes out
-
-* Fri Dec 20 2002 Owen Taylor <otaylor at redhat.com>
-- Version 2.2.0
-
-* Fri Dec 20 2002 Nalin Dahyabhai <nalin at redhat.com>
-- Fix postun to not try to run a script through ldconfig
-- Only remove the gtk.immodules and gdk-pixbuf.loaders files if uninstalling
-  while not upgrading
-
-* Wed Dec 11 2002 Owen Taylor <otaylor at redhat.com>
-- Version 2.1.5
-
-* Wed Dec 11 2002 Owen Taylor <otaylor at redhat.com>
-- Version 2.1.4
-
-* Wed Dec  4 2002 Owen Taylor <otaylor at redhat.com>
-- Fix problem with GtkCombo not setting text to first item
-
-* Tue Dec  3 2002 Owen Taylor <otaylor at redhat.com>
-- Version 2.1.3, re-add xftprefs patch
-
-* Fri Nov 22 2002 Havoc Pennington <hp at redhat.com>
-- rebuild with xft support
-
-* Wed Nov 20 2002 Havoc Pennington <hp at redhat.com>
-- rebuild to hack around xft.pc being in the wrong place
-- buildreq the pango with pangoxft
-
-* Thu Nov  7 2002 Havoc Pennington <hp at redhat.com>
-- 2.1.3
-- remove TODO from doc, no longer exists
-- remove 64bit patch, now upstream
-- comment out scroll_to patch, jrb has to deal with this
-- remove keycode patch now upstream
-- remove usintl patch now upstream
-- remove imenvar patch, now upstream
-- remove xftprefs patch now upstream
-- remove xftdraw patch now upstream
-- remove installdir patch (no longer applies) and do "makeinstall RUN_QUERY_IMMODULES_TEST=false"
-- remove extranotify patch, now upstream
-- add gdk-pixbuf-query-loaders to file list
-- remove gdk-pixbuf.loaders and gtk.immodules in postun as they are
-  not owned by the package (these should probably live in /var since they 
-  aren't config files and we overwrite them all the time)
-
-* Thu Oct  3 2002 Owen Taylor <otaylor at redhat.com>
-- Add a fix for a 64bit problem in gtktypeutils.h
-- Bump in rebuild for RPM configuration problem
-
-* Sun Aug 25 2002 Jonathan Blandford <jrb at redhat.com>
-- fix gtk_tree_view_scroll_to_cell
-
-* Fri Aug 23 2002 Owen Taylor <otaylor at redhat.com>
-- Fixed Raleigh theme missing from package list
-
-* Mon Aug 19 2002 Owen Taylor <otaylor at redhat.com>
-- Fix a memory leak in xftprefs.patch
-- Fix extra settings notifies on startup that were causing significant
-  performance problems as fonts were reloaded.
-
-* Tue Aug 13 2002 Owen Taylor <otaylor at redhat.com>
-- Fixes to GtkIMContextSimple compose table for us-intl keyboards
-  (#70995, Alexandre Oliva)
-- Fix problem with keycodes passed to GtkIMContextXIM
-	
-* Thu Aug  8 2002 Owen Taylor <otaylor at redhat.com>
-- Remove fixed-ltmain.sh, no longer needed
-- Fix bug with GTK_IM_MODULE environment variable
-- Remove profile.d entries setting GDK_USE_XFT, since we now default to it on
-- Backport patch from CVS HEAD to get Xft to work on non-RENDER XServers
-- Version 2.0.6
-
-* Tue Jul 16 2002 Owen Taylor <otaylor at redhat.com>
-- Fix cut and paste error in xftprefs patch pointed out by Anders Carlsson
-
-* Mon Jul  8 2002 Owen Taylor <otaylor at redhat.com>
-- Add patch to hook Xft up to XSETTINGS
-
-* Tue Jul  2 2002 Jonathan Blandford <jrb at redhat.com>
-- tree-view fixes for anaconda.  Already in CVS.
-
-* Fri Jun 21 2002 Owen Taylor <otaylor at redhat.com>
-- Default GDK_USE_XFT to on, not off
-
-* Sun Jun 16 2002 Havoc Pennington <hp at redhat.com>
-- 2.0.5
-- remove xft configure.in patch
-
-* Fri Jun 07 2002 Havoc Pennington <hp at redhat.com>
-- rebuild in different environment
-
-* Fri Jun  7 2002 Havoc Pennington <hp at redhat.com>
-- rebuild
-
-* Thu Jun  6 2002 Owen Taylor <otaylor at redhat.com>
-- Add patch so that configuration works with pango-1.1/fontconfig
-
-* Tue Jun  4 2002 Havoc Pennington <hp at redhat.com>
-- 2.0.3
-
-* Mon Jun 03 2002 Havoc Pennington <hp at redhat.com>
-- rebuild in different environment
-
-* Mon Jun  3 2002 Havoc Pennington <hp at redhat.com>
-- drop /etc/gtk-2.0/gtkrc from the file list, will now be provided by redhat-artwork
-
-* Wed May 29 2002 Havoc Pennington <hp at redhat.com>
-- rebuild in different environment
-
-* Wed May 29 2002 Havoc Pennington <hp at redhat.com>
-- add profile.d entries to set GDK_USE_XFT
-
-* Thu May 23 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Thu Apr 25 2002 Havoc Pennington <hp at redhat.com>
-- rebuild in different environment
-- hardcode automake 1.4 req
-
-* Fri Apr 19 2002 Havoc Pennington <hp at redhat.com>
-- do the prefix/lib -> libdir thing
-- include key themes in the package
-
-* Mon Apr 15 2002 root <otaylor at redhat.com>
-- Fix missing .po files (#63336)
-
-* Thu Apr 11 2002 Owen Taylor <otaylor at redhat.com>
-- Add reference docs to -devel package (#61184)
-- Use GTK2_RC_FILES, not GTK_RC_FILES, since KDE points GTK_RC_FILES 
-  to gtk-1.2 ~/.gtkrc
-
-* Wed Apr  3 2002 Alex Larsson <alexl at redhat.com>
-- Change dependency for glib2 since gtk and glib versions mismatch
-
-* Wed Apr  3 2002 Alex Larsson <alexl at redhat.com>
-- Update to version 2.0.2
-
-* Fri Mar  8 2002 Owen Taylor <otaylor at redhat.com>
-- Version 2.0.0
-
-* Mon Feb 25 2002 Alex Larsson <alexl at redhat.com>
-- Update to 1.3.15
-
-* Thu Feb 21 2002 Alex Larsson <alexl at redhat.com>
-- Bump for rebuild
-
-* Mon Feb 18 2002 Alex Larsson <alexl at redhat.com>
-- Update to 1.3.14
-
-* Fri Feb 15 2002 Havoc Pennington <hp at redhat.com>
-- add horrible buildrequires hack
-
-* Thu Feb 14 2002 Havoc Pennington <hp at redhat.com>
-- 1.3.13.91 snapshot
-
-* Mon Feb 11 2002 Matt Wilson <msw at redhat.com>
-- build from CVS snapshot
-- use setup -q
-
-* Wed Jan 30 2002 Owen Taylor <otaylor at redhat.com>
-- Version 1.3.13
-
-* Tue Jan 22 2002 Havoc Pennington <hp at redhat.com>
-- automake14
-
-* Wed Jan  2 2002 Havoc Pennington <hp at redhat.com>
-- 1.3.12.90 snapshot
-
-* Sun Nov 25 2001 Havoc Pennington <hp at redhat.com>
-- Version 1.3.11
-- check atk/pango versions explicitly prior to build,
-  so that --nodeps tricks don't result in bad binary RPMs
-
-* Fri Oct  5 2001 Havoc Pennington <hp at redhat.com>
-- pixbuf loaders were missing from file list
-- conflict with gdk-pixbuf-devel <= 0.11
-
-* Thu Oct  4 2001 Havoc Pennington <hp at redhat.com>
-- cvs snap
-
-* Thu Sep 27 2001 Havoc Pennington <hp at redhat.com>
-- sync with Owen's version
-
-* Thu Sep 20 2001 Havoc Pennington <hp at redhat.com>
-- smp_mflags
-- langify
-
-* Wed Sep 19 2001 Havoc Pennington <hp at redhat.com>
-- 1.3.8
-- add automake hackarounds
-
-* Thu Sep 13 2001 Havoc Pennington <hp at redhat.com>
-- conflict with old GTK with headers not moved
-- prereq new version of pango
-
-* Mon Sep 10 2001 Havoc Pennington <hp at redhat.com>
-- update to CVS snapshot
-
-* Wed Sep  5 2001 Havoc Pennington <hp at redhat.com>
-- build require specific versions of dependencies
-
-* Tue Sep  4 2001 Owen Taylor <otaylor at redhat.com>
-- Version 1.3.7
-
-* Thu Jul 26 2001 Havoc Pennington <hp at redhat.com>
-- Obsolete Inti and Inti-devel, #49967
-
-* Sat Jul 21 2001 Owen Taylor <otaylor at redhat.com>
-- PreReq specific pango and atk versions (#49434)
-- Don't package gtk.immodules (#49584)
-- Added BuildPrereq for libtiff-devel, libjpeg-devel, libpng-devel (#49495)
-- Configure with --disable-gtk-doc (#48987)
-- Package libgdk_pixbuf_xlib (#47753)
-
-* Sat Jul  7 2001 Tim Powers <timp at redhat.com>
-- languify to satisfy rpmlint
-
-* Thu Jun 21 2001 Florian La Roche <Florian.LaRoche at redhat.de>
-- use something better than libtool
-
-* Wed Jun 13 2001 Havoc Pennington <hp at redhat.com>
-- 1.3.6
-- libtool hackery
-- obsolete gtk+-gtkbeta-devel
-
-* Fri May  4 2001 Owen Taylor <otaylor at redhat.com>
-- Version 1.3.5
-- Rename to gtk2
-
-* Fri Nov 17 2000 Owen Taylor <otaylor at redhat.com>
-- Final 1.3.2
-
-* Tue Nov 14 2000 Owen Taylor <otaylor at redhat.com>
-- New snapshot
-
-* Mon Nov 13 2000 Owen Taylor <otaylor at redhat.com>
-- 1.3.2pre1 snapshot version
-
-* Sun Aug 13 2000 Owen Taylor <otaylor at redhat.com>
-- Rename to 1.3.1b to avoid version increment difficulties
-
-* Thu Aug 10 2000 Havoc Pennington <hp at redhat.com>
-- Fix .pc files to not contain -I%%{_includedir}
-
-* Thu Aug 10 2000 Havoc Pennington <hp at redhat.com>
-- Update to a CVS snapshot
-
-* Fri Jul 14 2000 Owen Taylor <otaylor at redhat.com>
-- Removed stray b from %%postun
-- Real 1.3.1 tarball fixing stupid omission in gtk-config
-
-* Fri Jul 07 2000 Owen Taylor <otaylor at redhat.com>
-- Version 1.3.1
-- move back to /usr
-- Remove gtk-config.1 manpage from build since
-  it conflicts with gtk+-devel. When we go to 
-  gtk+ gtk+1.2 setup, we should add it back
-
-* Fri Jun 30 2000 Owen Taylor <otaylor at redhat.com>
-- Rename gtkrc-default source so that it GTK+ package can't remove it
-
-* Thu Jun 8 2000  Owen Taylor <otaylor at redhat.com>
-- Rebuild with a prefix of /opt/gtk-beta
-
-* Wed May 31 2000 Owen Taylor <otaylor at redhat.com>
-- New version
-
-* Tue Apr 25 2000 Owen Taylor <otaylor at redhat.com>
-- Snapshot version to install in /opt/pango
-
-* Mon Feb 21 2000 Owen Taylor <otaylor at redhat.com>
-- Fix weird excess  problem that somehow turned up in %%{_sysconfdir}/gtkrc.LANG
-
-* Mon Feb 14 2000 Owen Taylor <otaylor at redhat.com>
-- More patches from 1.2.7
-
-* Fri Feb 04 2000 Owen Taylor <otaylor at redhat.com>
-- Set the charset explicitely for the default font to avoid
-  problems with XFree86-4.0 where the default charset is
-  iso10646-1, not iso8859-1.
-- Fix problems with size requisitions for scrolled windows
-  that was causing looping. (RH bug #7997)
-
-* Thu Feb 03 2000 Owen Taylor <otaylor at redhat.com>
-- Explicitely set the foreground of the tooltips to black
-  to avoid bad interactions with themes that set a
-  light foreground color.
-
-* Thu Feb 03 2000 Owen Taylor <otaylor at redhat.com>
-- Added large patch of bugfixes in stable branch of CVS
-
-* Tue Oct 12 1999 Owen Taylor <otaylor at redhat.com>
-- Added Akira Higuti's patch for line-wrapping in GTK+
-
-* Thu Oct 7  1999 Owen Taylor <otaylor at redhat.com>
-- version 1.2.6
-
-* Thu Sep 23 1999 Owen Taylor <otaylor at redhat.com>
-- version 1.2.5
-- install tutorial GIFs
-
-* Wed Sep 22  1999 Owen Taylor <otaylor at redhat.com>
-- Upgrade to real 1.2.5pre2
-- Changed name so upgrade to 1.2.5 will work :-(
-- Add extra gtkrc files
-- Add examples and English language tutorial to -devel package
-
-* Fri Sep 17 1999 Owen Taylor <otaylor at redhat.com>
-- Upgraded to 1.2.5pre2. (Actually, pre-pre-2)
-
-* Tue Aug 17 1999 Michael Fulbright <drmike at redhat.com>
-- added threaded patch
-
-* Mon Jun 7 1999 Owen Taylor <otaylor at redhat.com>
-- Update for GTK+-1.2.3
-- Patches that will be in GTK+-1.2.4
-- Patch to keep GTK+ from coredumping on X IO errors
-- Patch to improve compatilibity with GTK-1.2.1 (allow
-  event mask to be set on realized widgets)
-
-* Mon Apr 19 1999 Michael Fulbright <drmike at redhat.com>
-- fixes memory leak
-
-* Mon Apr 12 1999 Owen Taylor <otaylor at redhat.com>
-- The important bug fixes that will be in GTK+-1.2.2
-
-* Thu Apr 01 1999 Michael Fulbright <drmike at redhat.com>
-- patches from owen to handle various gdk bugs
-
-* Sun Mar 28 1999 Michael Fulbright <drmike at redhat.com>
-- added XFree86-devel requirement for gtk+-devel
-
-* Thu Mar 25 1999 Michael Fulbright <drmike at redhat.com>
-- version 1.2.1
-
-* Wed Mar 17 1999 Michael Fulbright <drmike at redhat.com>
-- removed /usr/info/dir.gz file from package
-
-* Fri Feb 26 1999 Michael Fulbright <drmike at redhat.com>
-- Version 1.2.0
-
-* Thu Feb 25 1999 Michael Fulbright <drmike at redhat.com>
-- version 1.2.0pre2, patched to use --sysconfdir=%{_sysconfdir}
-
-* Mon Feb 15 1999 Michael Fulbright <drmike at redhat.com>
-- patched in Owen's patch to fix Metal theme
-
-* Fri Feb 05 1999 Michael Fulbright <drmike at redhat.com>
-- bumped up to 1.1.15
-
-* Wed Feb 03 1999 Michael Fulbright <drmike at redhat.com>
-- bumped up to 1.1.14
-
-* Mon Jan 18 1999 Michael Fulbright <drmike at redhat.com>
-- bumped up to 1.1.13
-
-* Wed Jan 06 1999 Michael Fulbright <drmike at redhat.com>
-- bumped up to 1.1.12
-
-* Wed Dec 16 1998 Michael Fulbright <drmike at redhat.com>
-- added Theme directory to file list
-- up to 1.1.7 for GNOME freeze
-
-* Sun Oct 25 1998 Shawn T. Amundson <amundson at gtk.org>
-- Fixed Source: to point to v1.1 
-
-* Tue Aug 04 1998 Michael Fulbright <msf at redhat.com>
-- change %%postun to %%preun
-
-* Mon Jun 27 1998 Shawn T. Amundson
-- Changed version to 1.1.0
-
-* Thu Jun 11 1998 Dick Porter <dick at cymru.net>
-- Removed glib, since it is its own module now
-
-* Mon Apr 13 1998 Marc Ewing <marc at redhat.com>
-- Split out glib package
-
-* Tue Apr  8 1998 Shawn T. Amundson <amundson at gtk.org>
-- Changed version to 1.0.0
-
-* Tue Apr  7 1998 Owen Taylor <otaylor at gtk.org>
-- Changed version to 0.99.10
-
-* Thu Mar 19 1998 Shawn T. Amundson <amundson at gimp.org>
-- Changed version to 0.99.9
-- Changed gtk home page to www.gtk.org
-
-* Thu Mar 19 1998 Shawn T. Amundson <amundson at gimp.org>
-- Changed version to 0.99.8
-
-* Sun Mar 15 1998 Marc Ewing <marc at redhat.com>
-- Added aclocal and bin stuff to file list.
-- Added -k to the SMP make line.
-- Added lib/glib to file list.
-
-* Fri Mar 14 1998 Shawn T. Amundson <amundson at gimp.org>
-- Changed version to 0.99.7
-
-* Fri Mar 14 1998 Shawn T. Amundson <amundson at gimp.org>
-- Updated ftp url and changed version to 0.99.6
-
-* Thu Mar 12 1998 Marc Ewing <marc at redhat.com>
-- Reworked to integrate into gtk+ source tree
-- Truncated ChangeLog.  Previous Authors:
-  Trond Eivind Glomsrod <teg at pvv.ntnu.no>
-  Michael K. Johnson <johnsonm at redhat.com>
-  Otto Hammersmith <otto at redhat.com>
-  


From svn at tinysofa.org  Thu Oct  7 20:30:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 16:30:54 -0400 (EDT)
Subject: [tinysofa-svn] r4951 - contrib/1.1/pango/current/specs
Message-ID: <20041007203054.A76C03441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 16:30:54 -0400 (Thu, 07 Oct 2004)
New Revision: 4951

Modified:
   contrib/1.1/pango/current/specs/pango.spec
Log:
fixed permission of pango.modules

Modified: contrib/1.1/pango/current/specs/pango.spec
===================================================================
--- contrib/1.1/pango/current/specs/pango.spec	2004-10-07 18:10:54 UTC (rev 4950)
+++ contrib/1.1/pango/current/specs/pango.spec	2004-10-07 20:30:54 UTC (rev 4951)
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text.
 Name: pango
 Version: 1.4.0
-Release: 3gd
+Release: 4gd
 License: LGPL
 Group: contrib
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
@@ -41,7 +41,7 @@
 Summary: System for layout and rendering of internationalized text.
 Group: contrib
 Requires: pango = %{PACKAGE_VERSION}
-Requires: XFree86-devel >= 4.2.99
+Requires: xorg-x11--devel >= 4.2.99
 Requires: glib-devel >= %{glib_version}
 Requires: freetype-devel >= %{freetype_version}
 Requires: fontconfig-devel >= %{fontconfig_version}
@@ -130,8 +130,8 @@
 # We need the substitution of $host so we use an external
 # file list
 #
-echo %dir %{_sysconfdir}/pango/$host > modules.files
-echo %ghost %{_sysconfdir}/pango/$host/pango.modules >> modules.files
+echo %dir %attr\(755,root,root\) %{_sysconfdir}/pango/$host > modules.files
+echo %ghost %attr\(644,rootm,root\) %{_sysconfdir}/pango/$host/pango.modules >> modules.files
 
 %clean
 %clean_buildroot
@@ -185,6 +185,9 @@
 
 
 %changelog
+* Thu Oct  7 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.0-4gd
+- changed permission for pango.modules and dir
+
 * Sun Oct  3 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.0-3gd
 - taken from tinysofa enterprise server
 


From svn at tinysofa.org  Thu Oct  7 20:34:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Oct 2004 16:34:50 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4952 - in contrib/1.1: . xchat xchat/current xchat/current/sources
	xchat/current/specs
Message-ID: <20041007203450.636CF3441A6@minbar.tinysofa.org>

Author: gda
Date: 2004-10-07 16:34:49 -0400 (Thu, 07 Oct 2004)
New Revision: 4952

Added:
   contrib/1.1/xchat/
   contrib/1.1/xchat/current/
   contrib/1.1/xchat/current/sources/
   contrib/1.1/xchat/current/sources/xchat-2.4.0.tar.bz2
   contrib/1.1/xchat/current/specs/
   contrib/1.1/xchat/current/specs/xchat.spec
   contrib/1.1/xchat/pristine/
   contrib/1.1/xchat/releases/
Log:
new in contrib

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


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

Added: contrib/1.1/xchat/current/specs/xchat.spec
===================================================================
--- contrib/1.1/xchat/current/specs/xchat.spec	2004-10-07 20:30:54 UTC (rev 4951)
+++ contrib/1.1/xchat/current/specs/xchat.spec	2004-10-07 20:34:49 UTC (rev 4952)
@@ -0,0 +1,104 @@
+%define icewm_menu 1
+
+Summary: Graphical IRC (chat) client
+Name: xchat
+Version: 2.4.0
+Release: 1gd
+Group: contrib
+License: GPL
+URL: http://xchat.org
+Source: http://xchat.org/files/source/2.0/xchat-%{version}.tar.bz2
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: pkgconfig
+Requires: gtk glib
+Requires: openssl
+BuildRequires: gcc-c++
+BuildRequires: gettext
+BuildRequires: python-devel tcl-devel
+BuildRequires: glib-devel
+BuildRequires: gtk-devel
+
+%description
+A GUI IRC client with DCC file transfers, C plugin interface, Perl
+and Python scripting capability, mIRC color, shaded transparency,
+tabbed channels and more.
+
+%package perl
+Summary: XChat Perl plugin
+Group: contrib
+Requires: xchat >= 2.0.9
+Requires: perl
+%description perl
+Provides Perl scripting capability to XChat.
+
+%package python
+Summary: XChat Python plugin
+Group: contrib
+Requires: xchat >= 2.0.9
+Requires: python2 >= 2.2.0
+%description python
+Provides Python scripting capability to XChat.
+
+%package tcl
+Summary: XChat TCL plugin
+Group: contrib
+Requires: xchat >= 2.0.0
+Requires: tcl
+%description tcl
+Provides TCL scripting capability to XChat.
+
+%prep
+%setup -q
+
+%build
+export LD_LIBRARY_PATH=/usr/X11R6/lib
+%configure --disable-dependency-tracking
+make
+
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
+%makeinstall
+strip -R .note -R .comment $RPM_BUILD_ROOT%{_libdir}/perl.so
+strip -R .note -R .comment $RPM_BUILD_ROOT%{_libdir}/python.so
+strip -R .note -R .comment $RPM_BUILD_ROOT%{_libdir}/tcl.so
+mv $RPM_BUILD_ROOT%{_libdir}/perl.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
+mv $RPM_BUILD_ROOT%{_libdir}/python.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
+mv $RPM_BUILD_ROOT%{_libdir}/tcl.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang %name
+
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "X-Chat"           xchat_32x32.xpm xchat
+__EOF__
+%endif
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc README ChangeLog faq.html COPYING plugins/plugin20.html plugins/perl/xchat2-perldocs.html
+%{_bindir}/xchat
+%{_datadir}/applications/xchat.desktop
+%{_datadir}/pixmaps/xchat.png
+%if %{icewm_menu} 
+%{_datadir}/icewm/programs/%{name}
+%endif
+
+
+%files perl
+%{_libdir}/xchat/plugins/perl.so
+
+%files python
+%{_libdir}/xchat/plugins/python.so
+
+%files tcl
+%{_libdir}/xchat/plugins/tcl.so
+
+%clean
+%clean_buildroot
+
+%changelog
+* Wed Oct  6 2004 Gerald Dachs <gda at tinysofa dot de> 2.4.0-1gd
+- new in contrib


From svn at tinysofa.org  Fri Oct  8 13:32:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  8 Oct 2004 09:32:14 -0400 (EDT)
Subject: [tinysofa-svn] r4953 - tinysofa/releases/1.1/vim/current/specs
Message-ID: <20041008133214.9AE443441D8@minbar.tinysofa.org>

Author: jh
Date: 2004-10-08 09:32:13 -0400 (Fri, 08 Oct 2004)
New Revision: 4953

Modified:
   tinysofa/releases/1.1/vim/current/specs/vim.spec
Log:
- fix typo

Modified: tinysofa/releases/1.1/vim/current/specs/vim.spec
===================================================================
--- tinysofa/releases/1.1/vim/current/specs/vim.spec	2004-10-07 20:34:49 UTC (rev 4952)
+++ tinysofa/releases/1.1/vim/current/specs/vim.spec	2004-10-08 13:32:13 UTC (rev 4953)
@@ -147,7 +147,7 @@
 sed -e "s|%{buildroot}||" filelist.all | \
 	egrep -v '/tools(/|$)' > filelist.nottools
 egrep -v '/(colors|compiler|ftplugin|indent|macros|plugin|syntax)(/|$)' \
-	filelist.nottols > filelist.nosyntax
+	filelist.nottools > filelist.nosyntax
 egrep -v '/doc(/|$)' filelist.nosyntax > filelist.left
 
 


From svn at tinysofa.org  Fri Oct  8 13:33:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  8 Oct 2004 09:33:08 -0400 (EDT)
Subject: [tinysofa-svn] r4954 - tinysofa/releases/1.1/openldap/current/specs
Message-ID: <20041008133308.1B0AD3441D8@minbar.tinysofa.org>

Author: jh
Date: 2004-10-08 09:33:07 -0400 (Fri, 08 Oct 2004)
New Revision: 4954

Modified:
   tinysofa/releases/1.1/openldap/current/specs/openldap.spec
Log:
- configure with --enable-crypt
- improve requirements
- spec cleanups


Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec
===================================================================
--- tinysofa/releases/1.1/openldap/current/specs/openldap.spec	2004-10-08 13:32:13 UTC (rev 4953)
+++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec	2004-10-08 13:33:07 UTC (rev 4954)
@@ -6,7 +6,7 @@
 Summary: Lightweight Directory Access Protocol clients/servers
 Name: openldap
 Version: 2.1.30
-Release: 3ts
+Release: 4jh
 Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
 Source1: openldap.init
 Source2: openldap-slapd.conf
@@ -31,8 +31,9 @@
 URL: http://www.openldap.org/
 License: Freely distributable
 Group: extra
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: openssl-devel tcp_wrappers cyrus-sasl-devel libtool pkgconfig
+BuildRequires: perl
 Requires: readline 
 BuildRequires: readline-devel
 %if !%{_useldbm}
@@ -49,7 +50,8 @@
 %package devel
 Summary:  LDAP development files
 Group: development
-Requires: %{name}, %{name}-libs
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 Header files and libraries for developing applications that use LDAP.
@@ -59,9 +61,11 @@
 Group: extra
 Provides: slapd, slurpd
 %service_requires
-Requires: %{name}, %{name}-libs, cyrus-sasl > 2.0, openssl
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: cyrus-sasl > 2.0, openssl
 %if !%{_useldbm}
-BuildRequires: db4
+BuildRequires: db4-devel
 %endif
 
 %description servers
@@ -85,7 +89,7 @@
 %package utils
 Summary: LDAP client utilities
 Group: extra
-Requires: %{name}-libs
+Requires: %{name}-libs = %{version}-%{release}
 
 %description utils
 The utils present in the openLDAP suite.
@@ -119,7 +123,6 @@
 LDFLAGS="-L%{_libdir} -L${dbdir}/%{_lib} $OPENSSL_LDFLAGS" ; export LDFLAGS
 
 %configure \
-            --datadir=/usr/share \
             --disable-sql \
             --enable-cldap \
             --enable-dns \
@@ -131,9 +134,10 @@
             --enable-shared \
             --enable-shell \
             --enable-spasswd \
+            --enable-crypt \
             --enable-static \
             --enable-wrappers \
-            --libexecdir=/usr/sbin \
+            --libexecdir=%{_sbindir} \
             --localstatedir=/var/run \
             --with-cyrus-sasl \
             --with-slapd \
@@ -279,6 +283,11 @@
 
 
 %changelog
+* Fri Oct  8 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.1.30-4jh
+- configure with --enable-crypt
+- improve requirements
+- spec cleanups
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.1.30-3ts
 - current (2.1.30-3jh) integrated as 2.1.30-3ts for release 1.1
 


From svn at tinysofa.org  Fri Oct  8 19:11:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  8 Oct 2004 15:11:32 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4955 - in tinysofa/releases/1.1/cyrus-sasl/current: sources specs
Message-ID: <20041008191132.529F53441D8@minbar.tinysofa.org>

Author: jh
Date: 2004-10-08 15:11:31 -0400 (Fri, 08 Oct 2004)
New Revision: 4955

Added:
   tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-CAN-2004-0884.patch
Modified:
   tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec
Log:
- add fix for CAN-2004-0884

Added: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-CAN-2004-0884.patch
===================================================================
--- tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-CAN-2004-0884.patch	2004-10-08 13:33:07 UTC (rev 4954)
+++ tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-CAN-2004-0884.patch	2004-10-08 19:11:31 UTC (rev 4955)
@@ -0,0 +1,14 @@
+--- lib/common.c.orig	2004-10-07 14:18:25.000000000 +0200
++++ lib/common.c	2004-10-07 14:19:23.000000000 +0200
+@@ -1756,7 +1756,10 @@
+   if (! path)
+     return SASL_BADPARAM;
+ 
+-  *path = getenv(SASL_PATH_ENV_VAR);
++  /* Honor external variable only in a safe environment */
++  if (getuid() == geteuid() && getgid() == getegid())
++    *path = getenv(SASL_PATH_ENV_VAR);
++
+   if (! *path)
+     *path = PLUGINDIR;
+ 

Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec
===================================================================
--- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec	2004-10-08 13:33:07 UTC (rev 4954)
+++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec	2004-10-08 19:11:31 UTC (rev 4955)
@@ -3,14 +3,15 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 2.1.18
-Release: 2ts
+Release: 3jh
 License: Distributable
 Group: main
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
 Source1: cyrus-saslauthd.init
 Source2: cyrus-saslauthd-sysconfig
+Patch: cyrus-sasl-CAN-2004-0884.patch
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool, groff
 BuildRequires: db4-devel, openssl-devel, pam-devel, autoconf, automake, gcc-c++
 BuildRequires: mysql-devel, mysql-libs, postgresql-devel
@@ -83,6 +84,7 @@
 
 %prep
 %setup -q -n cyrus-sasl-%{version}
+%patch -p0 -b .CAN-2004-0884
 
 # FIXME - this is just weird
 rm config/ltconfig config/libtool.m4
@@ -223,6 +225,9 @@
 
 
 %changelog
+* Fri Oct  8 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.1.18-3jh
+- add fix for CAN-2004-0884
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.1.18-2ts
 - current (2.1.18-2jh) integrated as 2.1.18-2ts for release 1.1
 


From svn at tinysofa.org  Sat Oct  9 07:52:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Oct 2004 03:52:32 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4956 - in tinysofa/releases/1.1/cyrus-sasl/current: sources specs
Message-ID: <20041009075232.28CC13441DC@minbar.tinysofa.org>

Author: jh
Date: 2004-10-09 03:52:30 -0400 (Sat, 09 Oct 2004)
New Revision: 4956

Added:
   tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.19.tar.gz
Removed:
   tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.18.tar.gz
Modified:
   tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec
Log:
- update to 2.1.19


Deleted: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.18.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.19.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.19.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec
===================================================================
--- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec	2004-10-08 19:11:31 UTC (rev 4955)
+++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec	2004-10-09 07:52:30 UTC (rev 4956)
@@ -2,8 +2,8 @@
 
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
-Version: 2.1.18
-Release: 3jh
+Version: 2.1.19
+Release: 1jh
 License: Distributable
 Group: main
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Sat Oct  9 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.1.19-1jh
+- update to 2.1.19
+
 * Fri Oct  8 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.1.18-3jh
 - add fix for CAN-2004-0884
 


From svn at tinysofa.org  Sat Oct  9 08:00:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Oct 2004 04:00:41 -0400 (EDT)
Subject: [tinysofa-svn] r4957 - contrib/1.1/pango/current/specs
Message-ID: <20041009080041.7E9B03441DC@minbar.tinysofa.org>

Author: jh
Date: 2004-10-09 04:00:40 -0400 (Sat, 09 Oct 2004)
New Revision: 4957

Modified:
   contrib/1.1/pango/current/specs/pango.spec
Log:
- fix two typos


Modified: contrib/1.1/pango/current/specs/pango.spec
===================================================================
--- contrib/1.1/pango/current/specs/pango.spec	2004-10-09 07:52:30 UTC (rev 4956)
+++ contrib/1.1/pango/current/specs/pango.spec	2004-10-09 08:00:40 UTC (rev 4957)
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text.
 Name: pango
 Version: 1.4.0
-Release: 4gd
+Release: 5jh
 License: LGPL
 Group: contrib
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
@@ -41,7 +41,7 @@
 Summary: System for layout and rendering of internationalized text.
 Group: contrib
 Requires: pango = %{PACKAGE_VERSION}
-Requires: xorg-x11--devel >= 4.2.99
+Requires: xorg-x11-devel >= 6.7.0
 Requires: glib-devel >= %{glib_version}
 Requires: freetype-devel >= %{freetype_version}
 Requires: fontconfig-devel >= %{fontconfig_version}
@@ -131,7 +131,7 @@
 # file list
 #
 echo %dir %attr\(755,root,root\) %{_sysconfdir}/pango/$host > modules.files
-echo %ghost %attr\(644,rootm,root\) %{_sysconfdir}/pango/$host/pango.modules >> modules.files
+echo %ghost %attr\(644,root,root\) %{_sysconfdir}/pango/$host/pango.modules >> modules.files
 
 %clean
 %clean_buildroot


From svn at tinysofa.org  Sat Oct  9 22:40:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Oct 2004 18:40:37 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4958 - in contrib/1.1/clearsilver/current: sources specs
Message-ID: <20041009224037.1584A3441E1@minbar.tinysofa.org>

Author: gda
Date: 2004-10-09 18:40:36 -0400 (Sat, 09 Oct 2004)
New Revision: 4958

Added:
   contrib/1.1/clearsilver/current/sources/clearsilver-0.9.12.tar.gz
Removed:
   contrib/1.1/clearsilver/current/sources/clearsilver-0.9.10.tar.gz
Modified:
   contrib/1.1/clearsilver/current/specs/clearsilver.spec
Log:
new upstream

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

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


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

Modified: contrib/1.1/clearsilver/current/specs/clearsilver.spec
===================================================================
--- contrib/1.1/clearsilver/current/specs/clearsilver.spec	2004-10-09 08:00:40 UTC (rev 4957)
+++ contrib/1.1/clearsilver/current/specs/clearsilver.spec	2004-10-09 22:40:36 UTC (rev 4958)
@@ -1,6 +1,6 @@
 Summary: Neotonic ClearSilver
 Name: clearsilver
-Version: 0.9.10
+Version: 0.9.12
 Release: 1gd
 Copyright: Open Source - Neotonic ClearSilver License (Apache 1.1 based)
 Group: contrib
@@ -87,6 +87,9 @@
 %{perl_vendorarch}/auto/ClearSilver/ClearSilver.bs
 
 %Changelog
+* Sun Oct 10 2004 Gerald Dachs <gda at tinysofa dot org> 0.9.12-1gd
+- new upstream version
+
 * Fri Aug  6 2004 Gerald Dachs <gda at tinysofa dot org> 0.9.10-1gd
 - new upstream version
 - removed my gettext patch, it is now part of clearsilver


From svn at tinysofa.org  Sat Oct  9 22:54:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Oct 2004 18:54:24 -0400 (EDT)
Subject: [tinysofa-svn] r4959 - in contrib/1.1: . sqlite3 sqlite3/current
	sqlite3/current/sources sqlite3/current/specs
Message-ID: <20041009225424.637B13441E1@minbar.tinysofa.org>

Author: gda
Date: 2004-10-09 18:54:23 -0400 (Sat, 09 Oct 2004)
New Revision: 4959

Added:
   contrib/1.1/sqlite3/
   contrib/1.1/sqlite3/current/
   contrib/1.1/sqlite3/current/sources/
   contrib/1.1/sqlite3/current/sources/sqlite-3.0.7.tar.gz
   contrib/1.1/sqlite3/current/specs/
   contrib/1.1/sqlite3/current/specs/sqlite3.spec
   contrib/1.1/sqlite3/pristine/
   contrib/1.1/sqlite3/releases/
Log:
new major version

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


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

Added: contrib/1.1/sqlite3/current/specs/sqlite3.spec
===================================================================
--- contrib/1.1/sqlite3/current/specs/sqlite3.spec	2004-10-09 22:40:36 UTC (rev 4958)
+++ contrib/1.1/sqlite3/current/specs/sqlite3.spec	2004-10-09 22:54:23 UTC (rev 4959)
@@ -0,0 +1,62 @@
+Summary: SQLite is a C library that implements an embeddable SQL database engine
+Name: sqlite3
+Version: 3.0.7
+Release: 1gd
+License: GPL
+Group: contrib
+Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
+URL: http://www.sqlite.org/
+BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: tcl, tcl-devel, gcc-c++
+
+%description
+SQLITE is a C library that implements an embeddable SQL database engine.
+Programs that link with the SQLite library can have SQL database access
+without running a seperate RDBMS process. The distribution comes with a
+standalone command-line access program (sqlite) that can be used to
+administer an SQLite database and which serves as an example of how to
+use the SQLite library.
+
+%package -n sqlite3-devel
+Summary: Header files and libraries for developing apps which will use sqlite
+Group: tinysofa contrib
+Requires: sqlite3 = %{version}
+
+%description -n sqlite3-devel
+The sqlite-devel package contains the header files and libraries needed
+to develop programs that use the sqlite database library.
+
+%prep
+%setup -q -n sqlite
+
+%build
+CFLAGS="%optflags -DNDEBUG=1" CXXFLAGS="%optflags -DNDEBUG=1" %configure --enable-utf8 --enable-incore-db
+make
+make doc
+
+%install
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/usr/include
+mkdir -p $RPM_BUILD_ROOT/usr/lib
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%{_libdir}/*.so*
+%{_bindir}/*
+
+%files -n sqlite3-devel
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/sqlite3.pc
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_includedir}/*
+%doc README doc/*
+
+%changelog
+* Wed Oct  6 2004 Gerald Dachs <gda at tinysofa dot org> 3.0.7-1gd
+- new major version


From svn at tinysofa.org  Mon Oct 11 13:41:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Oct 2004 09:41:03 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4961 - in tinysofa/releases/1.1/vsftpd/current: sources specs
Message-ID: <20041011134103.D62C234425A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-11 09:41:03 -0400 (Mon, 11 Oct 2004)
New Revision: 4961

Removed:
   tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.xinetd
Modified:
   tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec
Log:
- remove xinetd support (it doesn't work)

Deleted: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.xinetd
===================================================================
--- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.xinetd	2004-10-11 11:10:52 UTC (rev 4960)
+++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.xinetd	2004-10-11 13:41:03 UTC (rev 4961)
@@ -1,13 +0,0 @@
-# default: off
-# description: The vsftpd FTP server serves FTP connections. It uses \
-#	normal, unencrypted usernames and passwords for authentication.
-service ftp
-{
-    socket_type = stream
-    wait        = no
-    user        = root
-    server      = /usr/sbin/vsftpd
-    nice        = 10
-    disable     = yes
-    flags       = IPv4
-}

Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec
===================================================================
--- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec	2004-10-11 11:10:52 UTC (rev 4960)
+++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec	2004-10-11 13:41:03 UTC (rev 4961)
@@ -1,17 +1,16 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.1
-Release: 2ts
+Release: 3jh
 License: GPL
 Group: main
 URL: http://vsftpd.beasts.org/
 Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-Source1: vsftpd.xinetd
-Source2: vsftpd.pam
-Source3: vsftpd.user_list
-Source4: vsftpd.init
-Source5: vsftpd.logrotate
-Source6: vsftpd.conf
+Source1: vsftpd.pam
+Source2: vsftpd.user_list
+Source3: vsftpd.init
+Source4: vsftpd.logrotate
+Source5: vsftpd.conf
 Patch0: vsftpd-1.2.1-conffile.patch
 Patch1: vsftpd-2.0.0-tcp_wrappers.patch
 Patch2: vsftpd-1.5.1-libs.patch
@@ -68,7 +67,7 @@
 install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT/%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{vsftpd,pam.d}
-install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,xinetd.d}
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
 install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
 install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/log
 install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/vsftp
@@ -76,12 +75,11 @@
 install -m 755 vsftpd  $RPM_BUILD_ROOT/%{_sbindir}/vsftpd
 install -m 644 vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/vsftpd
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/vsftpd
-install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd.user_list
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/vsftpd
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsftpd
-install -m 600 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd/vsftpd.conf
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/vsftpd
+install -m 600 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd.user_list
+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/vsftpd
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsftpd
+install -m 600 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd/vsftpd.conf
 touch -m 600 $RPM_BUILD_ROOT/%{_localstatedir}/log/vsftpd
 
 mkdir -p $RPM_BUILD_ROOT/srv/ftp/pub
@@ -114,7 +112,6 @@
 %config(noreplace) %{_sysconfdir}/vsftpd/*
 %config(noreplace) %{_sysconfdir}/pam.d/vsftpd
 %config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd
-%config(noreplace) %{_sysconfdir}/xinetd.d/vsftpd
 %dir %attr(755,root,root) %{_localstatedir}/lib/vsftp
 %dir %attr(700,root,root) %{_localstatedir}/lib/vsftp/chroot
 %{_mandir}/man5/vsftpd.conf.*
@@ -124,6 +121,9 @@
 
 
 %changelog
+* Sun Oct 10 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.1-3jh
+- remove xinetd support (it doesn't work)
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.0.1-2ts
 - current (2.0.1-2jh) integrated as 2.0.1-2ts for release 1.1
 


From svn at tinysofa.org  Tue Oct 12 06:27:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 02:27:13 -0400 (EDT)
Subject: [tinysofa-svn] r4962 - contrib/1.1/firefox/current/specs
Message-ID: <20041012062713.64894344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 02:27:12 -0400 (Tue, 12 Oct 2004)
New Revision: 4962

Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
- apply freetype patch


Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2004-10-11 13:41:03 UTC (rev 4961)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 06:27:12 UTC (rev 4962)
@@ -54,7 +54,7 @@
 %setup -q -n mozilla
 %patch2 -p0 -b .uri
 %patch3 -p1 -b .plugin
-#patch4 -p0 -b .freetype
+%patch4 -p0 -b .freetype
 %patch5 -p1 -b .psfonts
 %patch6 -p1 -b .gcc3-alpha
 %patch7 -p0 -b .64bit-math


From svn at tinysofa.org  Tue Oct 12 07:00:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 03:00:37 -0400 (EDT)
Subject: [tinysofa-svn] r4963 - contrib/1.1/firefox/current/specs
Message-ID: <20041012070037.739C4344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 03:00:36 -0400 (Tue, 12 Oct 2004)
New Revision: 4963

Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
- use another make command

Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 06:27:12 UTC (rev 4962)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 07:00:36 UTC (rev 4963)
@@ -181,8 +181,7 @@
 %build
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
-#%{__make} -f client.mk depend
-%{__make} %{?_smp_mflags} -f client.mk build
+MAKE="gmake %{?_smp_mflags}" make -f client.mk build
 
 %install
 %{__rm} -rf %{buildroot}


From svn at tinysofa.org  Tue Oct 12 07:16:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 03:16:44 -0400 (EDT)
Subject: [tinysofa-svn] r4964 - contrib/1.1/firefox/current/specs
Message-ID: <20041012071644.AECAA344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 03:16:43 -0400 (Tue, 12 Oct 2004)
New Revision: 4964

Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
- disable freetype patch for now

Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 07:00:36 UTC (rev 4963)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 07:16:43 UTC (rev 4964)
@@ -54,7 +54,8 @@
 %setup -q -n mozilla
 %patch2 -p0 -b .uri
 %patch3 -p1 -b .plugin
-%patch4 -p0 -b .freetype
+# enable this for U2
+#%patch4 -p0 -b .freetype
 %patch5 -p1 -b .psfonts
 %patch6 -p1 -b .gcc3-alpha
 %patch7 -p0 -b .64bit-math


From svn at tinysofa.org  Tue Oct 12 08:35:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 04:35:03 -0400 (EDT)
Subject: [tinysofa-svn] r4965 - contrib/1.1/firefox/current/specs
Message-ID: <20041012083503.01837344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 04:35:02 -0400 (Tue, 12 Oct 2004)
New Revision: 4965

Modified:
   contrib/1.1/firefox/current/specs/firefox.spec
Log:
- fix requirements if built against gtk2


Modified: contrib/1.1/firefox/current/specs/firefox.spec
===================================================================
--- contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 07:16:43 UTC (rev 4964)
+++ contrib/1.1/firefox/current/specs/firefox.spec	2004-10-12 08:35:02 UTC (rev 4965)
@@ -37,11 +37,11 @@
 BuildRequires: xorg-x11-devel, zlib-devel, zip, unzip
 BuildRequires: libpng-devel, libjpeg-devel
 BuildRequires: gcc-c++, kerberos5-devel
-BuildRequires: gtk12+-devel, glib12-devel, libidl-devel
+BuildRequires: libidl-devel
 BuildRequires: openssl-devel
-Requires: xorg-x11-libs, libidl, glib12, gtk12+, openssl, freetype
-%{!?_without_gtk2:BuildRequires: gtk-devel, libIDL-devel}
-%{?_without_gtk2:BuildRequires: gtk12+-devel}
+Requires: xorg-x11-libs, openssl, freetype
+%{!?_without_gtk2:BuildRequires: gtk-devel, glib-devel}
+%{?_without_gtk2:BuildRequires: gtk12+-devel, glib12-devel}
 
 Obsoletes: phoenix, MozillaFirebird, mozilla-firebird, mozilla-firefox
 Provides: webclient


From svn at tinysofa.org  Tue Oct 12 15:26:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 11:26:09 -0400 (EDT)
Subject: [tinysofa-svn] r4966 - contrib/1.1/xpdf/current/specs
Message-ID: <20041012152609.9D71B344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 11:26:08 -0400 (Tue, 12 Oct 2004)
New Revision: 4966

Modified:
   contrib/1.1/xpdf/current/specs/xpdf.spec
Log:
- add icewm menu

Modified: contrib/1.1/xpdf/current/specs/xpdf.spec
===================================================================
--- contrib/1.1/xpdf/current/specs/xpdf.spec	2004-10-12 08:35:02 UTC (rev 4965)
+++ contrib/1.1/xpdf/current/specs/xpdf.spec	2004-10-12 15:26:08 UTC (rev 4966)
@@ -2,11 +2,12 @@
 %define desktop_file_utils_version 0.2.90
 %define t1lib_version 5.0.2
 %define monolithic 0
+%define icewm_menu 1
 
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.00
-Release: 1jh
+Release: 2jh
 License: GPL
 Epoch: 0
 Url: http://www.foolabs.com/xpdf/
@@ -146,6 +147,14 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Xpdf PDF Viewer" xpdf xpdf
+__EOF__
+%endif
+
+
 %if %{desktop_file}
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
   install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/applications/net-xpdf.desktop
@@ -183,6 +192,9 @@
 %else
 %exclude %attr(0644,root,root) /etc/X11/applnk/Graphics/xpdf.desktop
 %endif
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
 %if !%{monolithic}
 %files chinese-simplified
@@ -213,6 +225,9 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.00-2jh
+- add icewm menu
+
 * Thu Jun 24 2004 Than Ngo <than at redhat.com> 1:3.00-5
 - update t1lib upstream
 - add cjk font patch, thanks to Yukihiro Nakai, bug #123540


From svn at tinysofa.org  Tue Oct 12 15:30:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 11:30:05 -0400 (EDT)
Subject: [tinysofa-svn] r4967 - contrib/1.1/xmms/current/specs
Message-ID: <20041012153005.2082F344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 11:30:04 -0400 (Tue, 12 Oct 2004)
New Revision: 4967

Modified:
   contrib/1.1/xmms/current/specs/xmms.spec
Log:
- add icewm menu file

Modified: contrib/1.1/xmms/current/specs/xmms.spec
===================================================================
--- contrib/1.1/xmms/current/specs/xmms.spec	2004-10-12 15:26:08 UTC (rev 4966)
+++ contrib/1.1/xmms/current/specs/xmms.spec	2004-10-12 15:30:04 UTC (rev 4967)
@@ -1,10 +1,11 @@
 %define arts_plugin 0
 %define artsplugin_ver 0.6.0
+%define icewm_menu 1
 
 Summary: A media player for X which resembles Winamp.
 Name: xmms
 Version: 1.2.10
-Release: 1jh
+Release: 2jh
 Epoch: 0
 License: GPL
 Group: contrib
@@ -146,6 +147,13 @@
 install xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini
 install -m 644 $RPM_SOURCE_DIR/xmms.xpm %{buildroot}%{_datadir}/pixmaps
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Xmms Multimedia Player" xmms xmms
+__EOF__
+%endif
+
 # unpackaged files
 rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
       %{buildroot}/%{_libdir}/libxmms.la \
@@ -180,6 +188,9 @@
 %dir %{_datadir}/xmms
 %{_datadir}/xmms/*.xpm
 %{_mandir}/man1/[wx]*
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -194,6 +205,9 @@
 %{_datadir}/xmms/Skins
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.10-2jh
+- add icewm menu file
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.2.10-1jh
 - current (1.2.10-1jh) integrated as 1.2.10-1jh
 


From svn at tinysofa.org  Tue Oct 12 15:33:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 11:33:29 -0400 (EDT)
Subject: [tinysofa-svn] r4968 - contrib/1.1/gqview/current/specs
Message-ID: <20041012153329.BA99F344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 11:33:29 -0400 (Tue, 12 Oct 2004)
New Revision: 4968

Modified:
   contrib/1.1/gqview/current/specs/gqview.spec
Log:
- add icewm menu file

Modified: contrib/1.1/gqview/current/specs/gqview.spec
===================================================================
--- contrib/1.1/gqview/current/specs/gqview.spec	2004-10-12 15:30:04 UTC (rev 4967)
+++ contrib/1.1/gqview/current/specs/gqview.spec	2004-10-12 15:33:29 UTC (rev 4968)
@@ -1,3 +1,5 @@
+%define icewm_menu 1
+
 Summary: Graphics file browser utility.
 Summary(fr): Explorateur de fichiers graphiques
 Name: gqview
@@ -2,4 +4,4 @@
 Version: 1.2.2
-Release: 1jh
-Copyright: GPL
+Release: 2jh
+License: GPL
 Group: contrib
@@ -40,7 +42,14 @@
 %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
 install -m 644 gqview.png %{buildroot}%{_datadir}/pixmaps/gqview.png
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Gqview Image Viewer" gqview gqview
+__EOF__
+%endif
 
+
 %clean
 %clean_buildroot
 
@@ -53,4 +62,11 @@
 #%{_datadir}/gnome/apps/Graphics/gqview.desktop
 %{_datadir}/pixmaps/gqview.png
 %{_mandir}/man?/*
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
+%changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.2-2jh
+- add icewm menu file
+


From svn at tinysofa.org  Tue Oct 12 15:40:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 11:40:03 -0400 (EDT)
Subject: [tinysofa-svn] r4969 - contrib/1.1/xawtv/current/specs
Message-ID: <20041012154003.45377344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 11:40:02 -0400 (Tue, 12 Oct 2004)
New Revision: 4969

Modified:
   contrib/1.1/xawtv/current/specs/xawtv.spec
Log:
- add icewm menu file

Modified: contrib/1.1/xawtv/current/specs/xawtv.spec
===================================================================
--- contrib/1.1/xawtv/current/specs/xawtv.spec	2004-10-12 15:33:29 UTC (rev 4968)
+++ contrib/1.1/xawtv/current/specs/xawtv.spec	2004-10-12 15:40:02 UTC (rev 4969)
@@ -1,5 +1,6 @@
 %define font_dir tv-fonts-1.0
 %define zvbi_version 0.2.4
+%define icewm_menu 1
 
 %define debug_package %{nil}
 
@@ -8,7 +9,7 @@
 Name: xawtv
 Summary: A TV application for video4linux compliant devices.
 Version: 3.94
-Release: 1jh
+Release: 2jh
 Group: contrib
 License: GPL
 URL: http://bytesex.org/xawtv/
@@ -104,6 +105,13 @@
 mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/
 #ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Xawtv TV Application" xawtv xawtv
+__EOF__
+%endif
+
 # remove some manpages
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/motv*
 
@@ -150,12 +158,18 @@
 %lang(es) %{_mandir}/es/*/*
 %lang(fr) %{_mandir}/fr/*/*
 %doc COPYING README TODO Changes contrib/frequencies*
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
 %files tv-fonts
 %defattr(-,root,root)
 %{_datadir}/fonts/tv-fonts
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.94-2jh
+- add icewm menu file
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 3.94-1jh
 - current (3.94-1jh) integrated as 3.94-1jh
 


From svn at tinysofa.org  Tue Oct 12 15:42:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 11:42:40 -0400 (EDT)
Subject: [tinysofa-svn] r4970 - contrib/1.1/gimp/current/specs
Message-ID: <20041012154240.DDC8A344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 11:42:40 -0400 (Tue, 12 Oct 2004)
New Revision: 4970

Modified:
   contrib/1.1/gimp/current/specs/gimp.spec
Log:
- add icewm menu file

Modified: contrib/1.1/gimp/current/specs/gimp.spec
===================================================================
--- contrib/1.1/gimp/current/specs/gimp.spec	2004-10-12 15:40:02 UTC (rev 4969)
+++ contrib/1.1/gimp/current/specs/gimp.spec	2004-10-12 15:42:40 UTC (rev 4970)
@@ -2,10 +2,12 @@
 %define age 0
 %define microver 5
 
+%define icewm_menu 1
+
 Summary: The GNU Image Manipulation Program.
 Name: gimp
 Version: %{subver}.%{microver}
-Release: 1jh
+Release: 2jh
 Epoch: 0
 License: GPL, LGPL
 Group: contrib
@@ -201,6 +203,13 @@
 mkdir -p %{buildroot}/usr/share/pixmaps
 install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "Gimp Image Manipulation Program" gimp gimp
+__EOF__
+%endif
+
 # files we don't ship
 rm -f	%{buildroot}%{_bindir}/escputil* \
 	%{buildroot}%{_mandir}/man1/escputil* \
@@ -255,6 +264,11 @@
 %{_datadir}/gimp/%{subver}/gimp_logo.ppm
 %{_datadir}/gimp/%{subver}/gimp_splash.ppm
 
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
+
+
 %defattr (0755, root, root)
 %{_datadir}/gimp/%{subver}/user_install
 
@@ -305,6 +319,9 @@
 %endif
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.5-2jh
+- add icewm menu file
+
 * Sun Jun  8 2003 Tim Powers <timp at redhat.com> 1:1.2.3-20.1
 - build for RHEL
 


From svn at tinysofa.org  Tue Oct 12 19:39:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 15:39:52 -0400 (EDT)
Subject: [tinysofa-svn] r4971 - tinysofa/releases/1.1/screen/current/specs
Message-ID: <20041012193952.3154E344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 15:39:51 -0400 (Tue, 12 Oct 2004)
New Revision: 4971

Modified:
   tinysofa/releases/1.1/screen/current/specs/screen.spec
Log:
- own directories correctly under /usr/share

Modified: tinysofa/releases/1.1/screen/current/specs/screen.spec
===================================================================
--- tinysofa/releases/1.1/screen/current/specs/screen.spec	2004-10-12 15:42:40 UTC (rev 4970)
+++ tinysofa/releases/1.1/screen/current/specs/screen.spec	2004-10-12 19:39:51 UTC (rev 4971)
@@ -1,22 +1,17 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
 Version: 4.0.2
-Release: 4ts
+Release: 5jh
 License: GPL2
 Group: extra
 URL: http://www.gnu.org/software/screen
 Prereq: htmlinfo
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel texinfo pam-devel
 BuildRequires: autoconf libtool
 Requires: ncurses
 
-#
-# The one and only true source
-#
 Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
-
-# Except for the PAM configuration, that is.
 Source1: screen.pamd
 
 # Small tweak for ia64
@@ -61,28 +56,21 @@
 
 
 %prep
-
-
 %setup -q
 %patch1 -p1 -b .ia64
 %patch2 -p1 -b .screenrc
 %patch3 -p1 -b .etcscreenrc
 %patch4 -p1 -b .utf8-install
 %patch5 -p1 -b .no-stripping-or-elf
-
 # Uncomment if you want screen to first try to use $HOME/.screens
 # and subsequently try to use /tmp/S-<user>
 #
 #%patch6 -p1 -b .screendir
-
-#
-#
 %patch7 -p0 -b .args
 
 
 %build
 libtoolize --copy --force
-
 autoconf
 
 %configure \
@@ -120,9 +108,8 @@
 # generate HTML docu
 cd doc && makeinfo --html --no-split --force %{name}.texinfo || true
 
-%install
-rm -rf $RPM_BUILD_ROOT
 
+%install
 mkdir -p $RPM_BUILD_ROOT/etc
 %makeinstall DDESTDIR=$RPM_BUILD_ROOT
 
@@ -147,22 +134,25 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/html/%{name}
 install %{name}.html $RPM_BUILD_ROOT/%{_datadir}/html/%{name}/
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /usr/sbin/htmlinfo_update.sh
 
 %postun
 /usr/sbin/htmlinfo_update.sh
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,755)
 %doc NEWS README doc/FAQ doc/README.DOTSCREEN
 
 %attr(755,root,root) %{_bindir}/screen
 %{_mandir}/man1/screen.*
-%{_datadir}/screen/utf8encodings/*
+%{_datadir}/screen
 %config /etc/screenrc
 %config /etc/pam.d/screen
 
@@ -170,7 +160,11 @@
 
 %exclude %{_infodir}/screen.info*
 
+
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.2-5jh
+- own directories correctly under /usr/share
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 4.0.2-4ts
 - current (4.0.2-4jh) integrated as 4.0.2-4ts for release 1.1
 


From svn at tinysofa.org  Tue Oct 12 19:45:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 15:45:18 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4972 - tinysofa/releases/1.1/foomatic-filters/current/specs
Message-ID: <20041012194518.A6201344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 15:45:18 -0400 (Tue, 12 Oct 2004)
New Revision: 4972

Modified:
   tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
Log:
- own %%{_sysconfdir}/foomatic

Modified: tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
===================================================================
--- tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-10-12 19:39:51 UTC (rev 4971)
+++ tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-10-12 19:45:18 UTC (rev 4972)
@@ -1,7 +1,7 @@
 Summary: Foomatic is a database-driven system for integrating free software printer drivers with common spoolers under Unix.
 Name: foomatic-filters
 Version: 3.0.2
-Release: 2jh
+Release: 3jh
 BuildArch: noarch
 License: GPL
 Group: extra
@@ -43,6 +43,7 @@
 
 %files
 %defattr(-,root,root, 755)
+%dir %{_sysconfdir}/foomatic
 %config(noreplace) %{_sysconfdir}/foomatic/filter.conf
 %{_bindir}/*
 %{_libdir}/cups/filter/*
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.2-3jh
+- own %%{_sysconfdir}/foomatic
+
 * Mon Sep 20 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.2-2jh
 - fix %%{_libdir}/ppr permissions
 - add sample config to documentation


From svn at tinysofa.org  Tue Oct 12 19:53:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 15:53:24 -0400 (EDT)
Subject: [tinysofa-svn] r4973 - tinysofa/releases/1.1/cups/current/specs
Message-ID: <20041012195324.B438A344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 15:53:24 -0400 (Tue, 12 Oct 2004)
New Revision: 4973

Modified:
   tinysofa/releases/1.1/cups/current/specs/cups.spec
Log:
- correct permissions for /usr/share/locale/*

Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec
===================================================================
--- tinysofa/releases/1.1/cups/current/specs/cups.spec	2004-10-12 19:45:18 UTC (rev 4972)
+++ tinysofa/releases/1.1/cups/current/specs/cups.spec	2004-10-12 19:53:24 UTC (rev 4973)
@@ -1,7 +1,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.21
-Release: 1jh
+Release: 2jh
 License: GPL
 Group: main
 Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2
@@ -181,7 +181,7 @@
 %exclude %{_mandir}/fr
 %{_sbindir}/*
 %{_datadir}/cups
-%{_datadir}/locale/*/*
+%{_datadir}/locale
 %dir %attr(1700,lp,sys) /var/spool/cups/tmp
 %dir %attr(0700,lp,sys) /var/spool/cups
 %dir %attr(0755,lp,sys) /var/log/cups
@@ -201,6 +201,9 @@
 %{_includedir}/cups
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.1.21-2jh
+- correct permissions for /usr/share/locale/*
+
 * Thu Sep 16 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.1.21-1jh
 - 1.1.21 which fixes CAN-2004-0558
 


From svn at tinysofa.org  Tue Oct 12 20:05:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 16:05:17 -0400 (EDT)
Subject: [tinysofa-svn] r4974 - contrib/1.1/xcdroast/current/specs
Message-ID: <20041012200517.C82C1344269@minbar.tinysofa.org>

Author: gda
Date: 2004-10-12 16:05:17 -0400 (Tue, 12 Oct 2004)
New Revision: 4974

Modified:
   contrib/1.1/xcdroast/current/specs/xcdroast.spec
Log:
fixed permissions

Modified: contrib/1.1/xcdroast/current/specs/xcdroast.spec
===================================================================
--- contrib/1.1/xcdroast/current/specs/xcdroast.spec	2004-10-12 19:53:24 UTC (rev 4973)
+++ contrib/1.1/xcdroast/current/specs/xcdroast.spec	2004-10-12 20:05:17 UTC (rev 4974)
@@ -1,7 +1,9 @@
 %define majorversion 0.98
+%define icewm_menu 1
+
 Name: xcdroast
 Version: %{majorversion}alpha15
-Release: 2gd 
+Release: 3gd 
 Summary: A userfriendly GUI for copying and creating Audio- and Data-CDs
 Copyright: GPL 
 Vendor: Thomas Niederreiter
@@ -31,7 +33,14 @@
 cp -f extra/xcdroast.desktop $RPM_BUILD_ROOT/%{_sysconfdir}/X11/applnk/Applications/
 strip -R .comment $RPM_BUILD_ROOT%{_bindir}/xcdroast
 
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "X-CD-Roast"                       xcdr xcdroast
+__EOF__
+%endif
 
+
 %clean
 %clean_buildroot
 
@@ -40,11 +49,19 @@
 %doc doc/*
 %{_bindir}/xcdroast
 %{_mandir}/man1/xcdroast.1*
+%dir %attr(755,root,root) %{_libdir}/xcdroast-%{majorversion}
 %{_libdir}/xcdroast-%{majorversion}/*
 %{_datadir}/locale/*
 %{_sysconfdir}/X11/applnk/Applications/xcdroast.desktop
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%endif
 
 %changelog
+* Tue Oct 12 2004 Gerald Dachs <gda at tinysofa dot org> 0.98alpha15-3gd
+- fixed permission on lib dir
+- added icewm menu entry 
+
 * Wed Sep 29 2004 Gerald Dachs <gda at tinysofa dot org> 0.98alpha15-2gd
 - fixed requirements
 


From svn at tinysofa.org  Tue Oct 12 20:38:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 16:38:27 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4975 - in contrib/1.1/lesstif/current: sources specs
Message-ID: <20041012203827.E5FE9344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-12 16:38:27 -0400 (Tue, 12 Oct 2004)
New Revision: 4975

Added:
   contrib/1.1/lesstif/current/sources/lesstif-0.93.95b-xpm.patch
Modified:
   contrib/1.1/lesstif/current/specs/lesstif.spec
Log:
- patch xpm vulnerability (CAN-2004-0687, CAN-2004-0688)

Added: contrib/1.1/lesstif/current/sources/lesstif-0.93.95b-xpm.patch
===================================================================
--- contrib/1.1/lesstif/current/sources/lesstif-0.93.95b-xpm.patch	2004-10-12 20:05:17 UTC (rev 4974)
+++ contrib/1.1/lesstif/current/sources/lesstif-0.93.95b-xpm.patch	2004-10-12 20:38:27 UTC (rev 4975)
@@ -0,0 +1,1002 @@
+diff -urN lesstif-0.93.95b/include/Motif-1.2/XmI/XmXpmI.h lesstif-0.93.95b.xpm/include/Motif-1.2/XmI/XmXpmI.h
+--- lesstif-0.93.95b/include/Motif-1.2/XmI/XmXpmI.h	2000-09-21 15:49:43.000000000 +0300
++++ lesstif-0.93.95b.xpm/include/Motif-1.2/XmI/XmXpmI.h	2004-10-12 23:15:15.257558000 +0300
+@@ -42,6 +42,21 @@
+ #ifndef _XPMI_h
+ #define _XPMI_h
+ 
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
++#ifndef        SIZE_MAX
++# ifdef ULONG_MAX
++#  define SIZE_MAX ULONG_MAX
++# else
++#  define SIZE_MAX UINT_MAX
++# endif
++#endif
++
+ #include <XmI/XmXpm.h>
+ 
+ /*
+@@ -50,6 +65,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
+ #ifdef sequent
+ extern FILE *popen();
+@@ -187,9 +203,9 @@
+ }      *xpmHashAtom;
+ 
+ typedef struct {
+-    int size;
+-    int limit;
+-    int used;
++    unsigned int size;
++    unsigned int limit;
++    unsigned int used;
+     xpmHashAtom *atomTable;
+ }      xpmHashTable;
+ 
+@@ -198,8 +214,8 @@
+ FUNC(_LtxpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
+ FUNC(_LtxpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
+ 
+-#define HashAtomData(i) ((void *)i)
+-#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
++#define HashAtomData(i) ((void *)(uintptr_t)i)
++#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
+ #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
+ 
+ /* I/O utility */
+diff -urN lesstif-0.93.95b/include/Motif-2.0/XmI/XpmI.h lesstif-0.93.95b.xpm/include/Motif-2.0/XmI/XpmI.h
+--- lesstif-0.93.95b/include/Motif-2.0/XmI/XpmI.h	2000-09-21 15:56:42.000000000 +0300
++++ lesstif-0.93.95b.xpm/include/Motif-2.0/XmI/XpmI.h	2004-10-12 23:15:15.262557000 +0300
+@@ -44,6 +44,21 @@
+ #ifndef _XPMI_h
+ #define _XPMI_h
+ 
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
++#ifndef        SIZE_MAX
++# ifdef ULONG_MAX
++#  define SIZE_MAX ULONG_MAX
++# else
++#  define SIZE_MAX UINT_MAX
++# endif
++#endif
++
+ #include <Xm/XpmP.h>
+ 
+ /*
+@@ -52,6 +67,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
+ #ifdef sequent
+ extern FILE *popen();
+@@ -189,9 +205,9 @@
+ }      *xpmHashAtom;
+ 
+ typedef struct {
+-    int size;
+-    int limit;
+-    int used;
++    unsigned int size;
++    unsigned int limit;
++    unsigned int used;
+     xpmHashAtom *atomTable;
+ }      xpmHashTable;
+ 
+@@ -200,8 +216,8 @@
+ FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
+ FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
+ 
+-#define HashAtomData(i) ((void *)i)
+-#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
++#define HashAtomData(i) ((void *)(uintptr_t)i)
++#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
+ #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
+ 
+ /* I/O utility */
+diff -urN lesstif-0.93.95b/include/Motif-2.1/XmI/XmXpmI.h lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XmXpmI.h
+--- lesstif-0.93.95b/include/Motif-2.1/XmI/XmXpmI.h	2000-09-21 15:49:43.000000000 +0300
++++ lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XmXpmI.h	2004-10-12 23:15:15.266557000 +0300
+@@ -42,6 +42,21 @@
+ #ifndef _XPMI_h
+ #define _XPMI_h
+ 
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
++#ifndef        SIZE_MAX
++# ifdef ULONG_MAX
++#  define SIZE_MAX ULONG_MAX
++# else
++#  define SIZE_MAX UINT_MAX
++# endif
++#endif
++
+ #include <XmI/XmXpm.h>
+ 
+ /*
+@@ -50,6 +65,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
+ #ifdef sequent
+ extern FILE *popen();
+@@ -187,9 +203,9 @@
+ }      *xpmHashAtom;
+ 
+ typedef struct {
+-    int size;
+-    int limit;
+-    int used;
++    unsigned int size;
++    unsigned int limit;
++    unsigned int used;
+     xpmHashAtom *atomTable;
+ }      xpmHashTable;
+ 
+@@ -198,8 +214,8 @@
+ FUNC(_LtxpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
+ FUNC(_LtxpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
+ 
+-#define HashAtomData(i) ((void *)i)
+-#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
++#define HashAtomData(i) ((void *)(uintptr_t)i)
++#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
+ #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
+ 
+ /* I/O utility */
+diff -urN lesstif-0.93.95b/include/Motif-2.1/XmI/XpmI.h lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XpmI.h
+--- lesstif-0.93.95b/include/Motif-2.1/XmI/XpmI.h	2000-09-21 15:56:42.000000000 +0300
++++ lesstif-0.93.95b.xpm/include/Motif-2.1/XmI/XpmI.h	2004-10-12 23:15:15.270556000 +0300
+@@ -44,6 +44,21 @@
+ #ifndef _XPMI_h
+ #define _XPMI_h
+ 
++#ifdef	HAVE_LIMITS_H
++#include <limits.h>
++#endif
++#ifdef	HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
++#ifndef	SIZE_MAX
++# ifdef ULONG_MAX
++#  define SIZE_MAX ULONG_MAX
++# else
++#  define SIZE_MAX UINT_MAX
++# endif
++#endif
++
+ #include <Xm/XpmP.h>
+ 
+ /*
+@@ -52,6 +67,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
+ #ifdef sequent
+ extern FILE *popen();
+@@ -189,9 +205,9 @@
+ }      *xpmHashAtom;
+ 
+ typedef struct {
+-    int size;
+-    int limit;
+-    int used;
++    unsigned int size;
++    unsigned int limit;
++    unsigned int used;
+     xpmHashAtom *atomTable;
+ }      xpmHashTable;
+ 
+@@ -200,8 +216,8 @@
+ FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
+ FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
+ 
+-#define HashAtomData(i) ((void *)i)
+-#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
++#define HashAtomData(i) ((void *)(uintptr_t)i)
++#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
+ #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
+ 
+ /* I/O utility */
+diff -urN lesstif-0.93.95b/lib/Xm/LTXpm.c lesstif-0.93.95b.xpm/lib/Xm/LTXpm.c
+--- lesstif-0.93.95b/lib/Xm/LTXpm.c	2002-02-27 21:45:22.000000000 +0200
++++ lesstif-0.93.95b.xpm/lib/Xm/LTXpm.c	2004-10-12 23:15:15.207566000 +0300
+@@ -62,10 +62,45 @@
+ /* #if !defined(WITH_DBMALLOC) && !defined(WITH_DMALLOC) */
+ #include <XmI/DebugUtil.h>
+ 
++#ifdef HAVE_STRLCAT
++# define STRLCAT(dst, src, dstsize) { \
++       if (strlcat(dst, src, dstsize) >= (dstsize)) \
++           return (_LtXpmFileInvalid); }
++# define STRLCPY(dst, src, dstsize) { \
++       if (strlcpy(dst, src, dstsize) >= (dstsize)) \
++           return (_LtXpmFileInvalid); }
++#else
++# define STRLCAT(dst, src, dstsize) { \
++       if ((strlen(dst) + strlen(src)) < (dstsize)) \
++           strcat(dst, src); \
++       else return (_LtXpmFileInvalid); }
++# define STRLCPY(dst, src, dstsize) { \
++       if (strlen(src) < (dstsize)) \
++           strcpy(dst, src); \
++       else return (_LtXpmFileInvalid); }
++#endif
+ 
+ /* #ifdef VOID_SPRINTF is a non-ANSI catch -
+    we don't support those systems any longer ... */
+ 
++#ifdef HAVE_STRLCAT
++# define STRLCAT(dst, src, dstsize) { \
++ 	if (strlcat(dst, src, dstsize) >= (dstsize)) \
++	    return (_LtXpmFileInvalid); }
++# define STRLCPY(dst, src, dstsize) { \
++  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
++	    return (_LtXpmFileInvalid); }
++#else
++# define STRLCAT(dst, src, dstsize) { \
++	if ((strlen(dst) + strlen(src)) < (dstsize)) \
++ 	    strcat(dst, src); \
++	else return (_LtXpmFileInvalid); }
++# define STRLCPY(dst, src, dstsize) { \
++	if (strlen(src) < (dstsize)) \
++ 	    strcpy(dst, src); \
++	else return (_LtXpmFileInvalid); }
++#endif
++
+ /*****************************************************************************\
+ * Attrib.c:                                                                   *
+ *                                                                             *
+@@ -88,7 +123,7 @@
+ 	_LtXpmAttributes *attributes);
+ 
+ /* 3.2 backward compatibility code */
+-LFUNC(CreateOldColorTable, int, (_LtXpmColor *ct, int ncolors,
++LFUNC(CreateOldColorTable, int, (_LtXpmColor *ct, unsigned int ncolors,
+ 				 _LtXpmColor ***oldct));
+ 
+ LFUNC(FreeOldColorTable, void, (_LtXpmColor **colorTable, int ncolors));
+@@ -99,12 +134,15 @@
+ static int
+ CreateOldColorTable(ct, ncolors, oldct)
+     _LtXpmColor *ct;
+-    int ncolors;
++    unsigned int ncolors;
+     _LtXpmColor ***oldct;
+ {
+     _LtXpmColor **colorTable, **color;
+     int a;
+ 
++    if (ncolors >= SIZE_MAX / sizeof(_LtXpmColor *))
++	return (_LtXpmNoMemory);
++
+     colorTable = (_LtXpmColor **) _LtXpmMalloc(ncolors * sizeof(_LtXpmColor *));
+     if (!colorTable) {
+ 	*oldct = NULL;
+@@ -1338,6 +1376,8 @@
+     unsigned int x, y, h;
+ 
+     h = height - 1;
++    if (cpp != 0 && width >= (SIZE_MAX - 3) / cpp)
++	return (_LtXpmNoMemory);
+     p = buf = (char *) _LtXpmMalloc(width * cpp + 3);
+     if (!buf)
+ 	return (_LtXpmNoMemory);
+@@ -2325,7 +2365,12 @@
+ 
+     ErrorStatus = _LtXpmSuccess;
+ 
++    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
++	    return _LtXpmNoMemory;
++
+     /* malloc pixels index tables */
++    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
++	return (_LtXpmNoMemory);
+     image_pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * image->ncolors);
+     if (!image_pixels)
+ 	return (_LtXpmNoMemory);
+@@ -2497,6 +2542,8 @@
+ 	return (_LtXpmNoMemory);
+ 
+ #if !defined(FOR_MSW) && !defined(AMIGA)
++    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
++	return _LtXpmNoMemory;
+     /* now that bytes_per_line must have been set properly alloc data */
+     (*image_return)->data =
+ 	(char *) _LtXpmMalloc((*image_return)->bytes_per_line * height);
+@@ -3813,6 +3860,7 @@
+ 					 * colors */
+ 	{
+ 	    unsigned short colidx[256];
++
+ #ifdef FOR_MSW
+ 	    HDC shapedc;
+ 	    HBITMAP obm, sobm;
+@@ -3827,6 +3875,8 @@
+ #endif
+ 
+ 
++	    if (ncolors > 256)
++		return (_LtXpmFileInvalid);
+ 	    memset((char *)colidx, 0, 256 * sizeof(short));
+ 	    for (a = 0; a < ncolors; a++)
+ 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
+@@ -3930,6 +3980,8 @@
+ 	    char *s;
+ 	    char buf[BUFSIZ];
+ 
++	    if (cpp >= sizeof(buf))
++		return (_LtXpmFileInvalid);
+ 	    buf[cpp] = '\0';
+ 	    if (USE_HASHTABLE) {
+ 		xpmHashAtom *slot;
+@@ -4336,7 +4388,7 @@
+ {
+     if (!mdata->type)
+ 	*cmt = NULL;
+-    else if (mdata->CommentLength) {
++    else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) {
+ 	*cmt = (char *) _LtXpmMalloc(mdata->CommentLength + 1);
+ 	strncpy(*cmt, mdata->Comment, mdata->CommentLength);
+ 	(*cmt)[mdata->CommentLength] = '\0';
+@@ -4546,7 +4598,7 @@
+     xpmHashTable *table;
+ {
+     xpmHashAtom *atomTable = table->atomTable;
+-    int size = table->size;
++    unsigned int size = table->size;
+     xpmHashAtom *t, *p;
+     int i;
+     int oldSize = size;
+@@ -4555,6 +4607,8 @@
+     HASH_TABLE_GROWS
+ 	table->size = size;
+     table->limit = size / 3;
++    if (size >= SIZE_MAX / sizeof(*atomTable))
++	return (_LtXpmNoMemory);
+     atomTable = (xpmHashAtom *) _LtXpmMalloc(size * sizeof(*atomTable));
+     if (!atomTable)
+ 	return (_LtXpmNoMemory);
+@@ -4615,6 +4669,8 @@
+     table->size = INITIAL_HASH_SIZE;
+     table->limit = table->size / 3;
+     table->used = 0;
++    if (table->size += SIZE_MAX / sizeof(*atomTable))
++	return (_LtXpmNoMemory);
+     atomTable = (xpmHashAtom *) _LtXpmMalloc(table->size * sizeof(*atomTable));
+     if (!atomTable)
+ 	return (_LtXpmNoMemory);
+@@ -5044,10 +5100,10 @@
+     _LtXpmColor **colorTablePtr;
+     xpmHashTable *hashtable;
+ {
+-    unsigned int key, l, a, b;
++    unsigned int key = 0, l, a, b, len;
+     unsigned int curkey;		/* current color key */
+     unsigned int lastwaskey;		/* key read */
+-    char buf[BUFSIZ];
++    char buf[BUFSIZ+1];
+     char curbuf[BUFSIZ];		/* current buffer */
+     char **sptr, *s;
+     _LtXpmColor *color;
+@@ -5055,6 +5111,8 @@
+     char **defaults;
+     int ErrorStatus;
+ 
++    if (ncolors >= SIZE_MAX / sizeof(_LtXpmColor))
++	return (_LtXpmNoMemory);
+     colorTable = (_LtXpmColor *) _LtXpmCalloc(ncolors, sizeof(_LtXpmColor));
+     if (!colorTable)
+ 	return (_LtXpmNoMemory);
+@@ -5066,6 +5124,10 @@
+ 	    /*
+ 	     * read pixel value
+ 	     */
++	    if (cpp >= SIZE_MAX - 1) {
++		    _LtxpmFreeColorTable(colorTable, ncolors);
++		    return (_LtXpmNoMemory);
++	    }
+ 	    color->string = (char *) _LtXpmMalloc(cpp + 1);
+ 	    if (!color->string) {
+ 		_LtxpmFreeColorTable(colorTable, ncolors);
+@@ -5103,13 +5165,14 @@
+ 		}
+ 		if (!lastwaskey && key < NKEYS) {	/* open new key */
+ 		    if (curkey) {	/* flush string */
+-			s = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
++			len = strlen(curbuf) + 1;
++			s = (char *) _LtXpmMalloc(len);
+ 			if (!s) {
+ 			    _LtxpmFreeColorTable(colorTable, ncolors);
+ 			    return (_LtXpmNoMemory);
+ 			}
+ 			defaults[curkey] = s;
+-			strcpy(s, curbuf);
++			memcpy(s, curbuf, len);
+ 		    }
+ 		    curkey = key + 1;	/* set new key  */
+ 		    *curbuf = '\0';	/* reset curbuf */
+@@ -5120,9 +5183,9 @@
+ 			return (_LtXpmFileInvalid);
+ 		    }
+ 		    if (!lastwaskey)
+-			strcat(curbuf, " ");	/* append space */
++			STRLCAT(curbuf, " ", sizeof(curbuf));	/* append space */
+ 		    buf[l] = '\0';
+-		    strcat(curbuf, buf);/* append buf */
++		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
+ 		    lastwaskey = 0;
+ 		}
+ 	    }
+@@ -5130,12 +5193,13 @@
+ 		_LtxpmFreeColorTable(colorTable, ncolors);
+ 		return (_LtXpmFileInvalid);
+ 	    }
+-	    s = defaults[curkey] = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
++	    len = strlen(curbuf) + 1;
++	    s = defaults[curkey] = (char *) _LtXpmMalloc(len);
+ 	    if (!s) {
+ 		_LtxpmFreeColorTable(colorTable, ncolors);
+ 		return (_LtXpmNoMemory);
+ 	    }
+-	    strcpy(s, curbuf);
++	    memcpy(s, curbuf, len);
+ 	}
+     } else {				/* XPM 1 */
+ 	/* get to the beginning of the first string */
+@@ -5148,6 +5212,10 @@
+ 	    /*
+ 	     * read pixel value
+ 	     */
++	    if (cpp >= SIZE_MAX - 1) {
++		    _LtxpmFreeColorTable(colorTable, ncolors);
++		    return (_LtXpmNoMemory);
++	    }
+ 	    color->string = (char *) _LtXpmMalloc(cpp + 1);
+ 	    if (!color->string) {
+ 		_LtxpmFreeColorTable(colorTable, ncolors);
+@@ -5176,16 +5244,17 @@
+ 	    *curbuf = '\0';		/* init curbuf */
+ 	    while ((l = _LtxpmNextWord(data, buf, BUFSIZ))) {
+ 		if (*curbuf != '\0')
+-		    strcat(curbuf, " ");/* append space */
++		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
+ 		buf[l] = '\0';
+-		strcat(curbuf, buf);	/* append buf */
++		STRLCAT(curbuf, buf, sizeof(curbuf));   /* append buf */
+ 	    }
+-	    s = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
++	    len = strlen(curbuf) + 1;
++	    s = (char *) _LtXpmMalloc(len);
+ 	    if (!s) {
+ 		_LtxpmFreeColorTable(colorTable, ncolors);
+ 		return (_LtXpmNoMemory);
+ 	    }
+-	    strcpy(s, curbuf);
++	    memcpy(s, curbuf, len);
+ 	    color->c_color = s;
+ 	    *curbuf = '\0';		/* reset curbuf */
+ 	    if (a < ncolors - 1)
+@@ -5210,6 +5279,9 @@
+     unsigned int *iptr, *iptr2;
+     unsigned int a, x, y;
+ 
++    if ((height > 0 && width >= SIZE_MAX / height) ||
++		    width * height >= SIZE_MAX / sizeof(unsigned int))
++	return _LtXpmNoMemory;
+ #ifndef FOR_MSW
+     iptr2 = (unsigned int *) _LtXpmMalloc(sizeof(unsigned int) * width * height);
+ #else
+@@ -5233,6 +5305,9 @@
+ 	{
+ 	    unsigned short colidx[256];
+ 
++	    if (ncolors > 256)
++		    return (_LtXpmFileInvalid);
++
+ 	    memset((char *)colidx, 0, 256 * sizeof(short));
+ 	    for (a = 0; a < ncolors; a++)
+ 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
+@@ -5310,6 +5385,9 @@
+ 	    char *s;
+ 	    char buf[BUFSIZ];
+ 
++	    if (cpp >= sizeof(buf))
++		return (_LtXpmFileInvalid);
++
+ 	    buf[cpp] = '\0';
+ 	    if (USE_HASHTABLE) {
+ 		xpmHashAtom *slot;
+@@ -5793,7 +5871,7 @@
+ LFUNC(ScanTransparentColor, int, (_LtXpmColor *color, unsigned int cpp,
+ 				  _LtXpmAttributes *attributes));
+ 
+-LFUNC(ScanOtherColors, int, (Display *display, _LtXpmColor *colors, int ncolors,
++LFUNC(ScanOtherColors, int, (Display *display, _LtXpmColor *colors, unsigned int ncolors,
+ 			     Pixel *pixels, unsigned int mask,
+ 			     unsigned int cpp, _LtXpmAttributes *attributes));
+ 
+@@ -5918,11 +5996,16 @@
+     else
+ 	cpp = 0;
+ 
++    if ((height > 0 && width >= SIZE_MAX / height) ||
++		  width * height >= SIZE_MAX / sizeof(unsigned int))
++	    RETURN(_LtXpmNoMemory);
+     pmap.pixelindex =
+ 	(unsigned int *) _LtXpmCalloc(width * height, sizeof(unsigned int));
+     if (!pmap.pixelindex)
+ 	RETURN(_LtXpmNoMemory);
+ 
++    if (pmap.size >= SIZE_MAX / sizeof(Pixel))
++	RETURN(_LtXpmNoMemory);
+     pmap.pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * pmap.size);
+     if (!pmap.pixels)
+ 	RETURN(_LtXpmNoMemory);
+@@ -5988,6 +6071,8 @@
+      * color
+      */
+ 
++    if (pmap.ncolors >= SIZE_MAX / sizeof(_LtXpmColor))
++	RETURN(_LtXpmNoMemory);
+     colorTable = (_LtXpmColor *) _LtXpmCalloc(pmap.ncolors, sizeof(_LtXpmColor));
+     if (!colorTable)
+ 	RETURN(_LtXpmNoMemory);
+@@ -6046,6 +6131,8 @@
+ 
+     /* first get a character string */
+     a = 0;
++    if (cpp >= SIZE_MAX - 1)
++	return (_LtXpmNoMemory);
+     if (!(s = color->string = (char *) _LtXpmMalloc(cpp + 1)))
+ 	return (_LtXpmNoMemory);
+     *s++ = printable[c = a % MAXPRINTABLE];
+@@ -6093,7 +6180,7 @@
+ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
+     Display *display;
+     _LtXpmColor *colors;
+-    int ncolors;
++    unsigned int ncolors;
+     Pixel *pixels;
+     unsigned int mask;
+     unsigned int cpp;
+@@ -6137,6 +6224,8 @@
+     }
+ 
+     /* first get character strings and rgb values */
++    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
++	return (_LtXpmNoMemory);
+     xcolors = (XColor *) _LtXpmMalloc(sizeof(XColor) * ncolors);
+     if (!xcolors)
+ 	return (_LtXpmNoMemory);
+@@ -7052,6 +7141,8 @@
+      */
+     header_nlines = 1 + image->ncolors;
+     header_size = sizeof(char *) * header_nlines;
++    if (header_size >= SIZE_MAX / sizeof(char *))
++	return (_LtXpmNoMemory);
+     header = (char **) _LtXpmCalloc(header_size, sizeof(char *));
+     if (!header)
+ 	return (_LtXpmNoMemory);
+diff -urN lesstif-0.93.95b/lib/Xm/ScrolledW.c lesstif-0.93.95b.xpm/lib/Xm/ScrolledW.c
+--- lesstif-0.93.95b/lib/Xm/ScrolledW.c	2004-06-17 19:20:25.000000000 +0300
++++ lesstif-0.93.95b.xpm/lib/Xm/ScrolledW.c	2004-10-12 23:15:15.199567000 +0300
+@@ -1964,17 +1964,14 @@
+ 	 */
+ 	if (child == (Widget)SW_WorkWindow(w))
+ 	{
+-		/* T. Straumann: added support for borderWidth
+-		 * (border width of scrollbars and clip are 0)
+-		 */
+-		Dimension bw = 2 * (childgeom->request_mode & CWBorderWidth	? childgeom->border_width
+-																	: XtBorderWidth(child) );
+-		Dimension ww = childgeom->request_mode & CWWidth ? childgeom->width
+-											             : XtWidth(child);
+-		Dimension hh = childgeom->request_mode & CWHeight ? childgeom->height
+-											              : XtHeight(child);
+-		vals->WorkW = ww + bw;
+-		vals->WorkH = hh + bw;
++	    if (childgeom->request_mode & CWWidth)
++	    {
++		vals->WorkW = childgeom->width;
++	    }
++	    if (childgeom->request_mode & CWHeight)
++	    {
++		vals->WorkH = childgeom->height;
++	    }
+ 	}
+ 	/* only happens for AUTOMATIC */
+ 	if (child == (Widget)SW_ClipWindow(w))
+diff -urN lesstif-0.93.95b/lib/Xm-2.0/Xpm.c lesstif-0.93.95b.xpm/lib/Xm-2.0/Xpm.c
+--- lesstif-0.93.95b/lib/Xm-2.0/Xpm.c	2002-02-27 21:45:22.000000000 +0200
++++ lesstif-0.93.95b.xpm/lib/Xm-2.0/Xpm.c	2004-10-12 23:15:15.216564000 +0300
+@@ -62,6 +62,24 @@
+ /* #if !defined(WITH_DBMALLOC) && !defined(WITH_DMALLOC) */
+ #include <XmI/DebugUtil.h>
+ 
++#ifdef HAVE_STRLCAT
++# define STRLCAT(dst, src, dstsize) { \
++ 	if (strlcat(dst, src, dstsize) >= (dstsize)) \
++	    return (XpmFileInvalid); }
++# define STRLCPY(dst, src, dstsize) { \
++  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
++	    return (XpmFileInvalid); }
++#else
++# define STRLCAT(dst, src, dstsize) { \
++	if ((strlen(dst) + strlen(src)) < (dstsize)) \
++ 	    strcat(dst, src); \
++	else return (XpmFileInvalid); }
++# define STRLCPY(dst, src, dstsize) { \
++	if (strlen(src) < (dstsize)) \
++ 	    strcpy(dst, src); \
++	else return (XpmFileInvalid); }
++#endif
++
+ /*****************************************************************************\
+ * Attrib.c:                                                                   *
+ *                                                                             *
+@@ -84,7 +102,7 @@
+ 	XpmAttributes *attributes);
+ 
+ /* 3.2 backward compatibility code */
+-LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
++LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
+ 				 XpmColor ***oldct));
+ 
+ LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
+@@ -95,12 +113,15 @@
+ static int
+ CreateOldColorTable(ct, ncolors, oldct)
+     XpmColor *ct;
+-    int ncolors;
++    unsigned int ncolors;
+     XpmColor ***oldct;
+ {
+     XpmColor **colorTable, **color;
+     int a;
+ 
++    if (ncolors >= SIZE_MAX / sizeof(XpmColor *))
++	    return XpmNoMemory;
++
+     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
+     if (!colorTable) {
+ 	*oldct = NULL;
+@@ -1333,6 +1354,8 @@
+     unsigned int x, y, h;
+ 
+     h = height - 1;
++    if (cpp != 0 && width >= (SIZE_MAX - 3) / cpp)
++	    return XpmNoMemory;
+     p = buf = (char *) XpmMalloc(width * cpp + 3);
+     if (!buf)
+ 	return (XpmNoMemory);
+@@ -2320,6 +2343,9 @@
+ 
+     ErrorStatus = XpmSuccess;
+ 
++    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
++	    return XpmNoMemory;
++
+     /* malloc pixels index tables */
+     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
+     if (!image_pixels)
+@@ -2492,6 +2518,8 @@
+ 	return (XpmNoMemory);
+ 
+ #if !defined(FOR_MSW) && !defined(AMIGA)
++    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
++	    return XpmNoMemory;
+     /* now that bytes_per_line must have been set properly alloc data */
+     (*image_return)->data =
+ 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
+@@ -3562,6 +3590,8 @@
+ 	xpmGetCmt(data, &colors_cmt);
+ 
+     /* malloc pixels index tables */
++    if (ncolors >= SIZE_MAX / sizeof(Pixel))
++	    return XpmNoMemory;
+     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
+     if (!image_pixels)
+ 	RETURN(XpmNoMemory);
+@@ -3808,6 +3838,7 @@
+ 					 * colors */
+ 	{
+ 	    unsigned short colidx[256];
++
+ #ifdef FOR_MSW
+ 	    HDC shapedc;
+ 	    HBITMAP obm, sobm;
+@@ -3822,6 +3853,8 @@
+ #endif
+ 
+ 
++	    if (ncolors > 256)
++		    return XpmFileInvalid;
+ 	    memset((char *)colidx, 0, 256 * sizeof(short));
+ 	    for (a = 0; a < ncolors; a++)
+ 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
+@@ -3925,6 +3958,8 @@
+ 	    char *s;
+ 	    char buf[BUFSIZ];
+ 
++	    if (cpp >= sizeof(buf))
++		    return XpmFileInvalid;
+ 	    buf[cpp] = '\0';
+ 	    if (USE_HASHTABLE) {
+ 		xpmHashAtom *slot;
+@@ -4331,7 +4366,7 @@
+ {
+     if (!mdata->type)
+ 	*cmt = NULL;
+-    else if (mdata->CommentLength) {
++    else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) {
+ 	*cmt = (char *) XpmMalloc(mdata->CommentLength + 1);
+ 	strncpy(*cmt, mdata->Comment, mdata->CommentLength);
+ 	(*cmt)[mdata->CommentLength] = '\0';
+@@ -4541,7 +4576,7 @@
+     xpmHashTable *table;
+ {
+     xpmHashAtom *atomTable = table->atomTable;
+-    int size = table->size;
++    unsigned int size = table->size;
+     xpmHashAtom *t, *p;
+     int i;
+     int oldSize = size;
+@@ -4550,6 +4585,8 @@
+     HASH_TABLE_GROWS
+ 	table->size = size;
+     table->limit = size / 3;
++    if (size >= SIZE_MAX / sizeof(*atomTable))
++	    return XpmNoMemory;
+     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
+     if (!atomTable)
+ 	return (XpmNoMemory);
+@@ -4610,6 +4647,8 @@
+     table->size = INITIAL_HASH_SIZE;
+     table->limit = table->size / 3;
+     table->used = 0;
++    if (table->size += SIZE_MAX / sizeof(*atomTable))
++	    return XpmNoMemory;
+     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
+     if (!atomTable)
+ 	return (XpmNoMemory);
+@@ -5039,10 +5078,10 @@
+     XpmColor **colorTablePtr;
+     xpmHashTable *hashtable;
+ {
+-    unsigned int key, l, a, b;
++    unsigned int key = 0, l, a, b, len;
+     unsigned int curkey;		/* current color key */
+     unsigned int lastwaskey;		/* key read */
+-    char buf[BUFSIZ];
++    char buf[BUFSIZ+1];
+     char curbuf[BUFSIZ];		/* current buffer */
+     char **sptr, *s;
+     XpmColor *color;
+@@ -5050,6 +5089,8 @@
+     char **defaults;
+     int ErrorStatus;
+ 
++    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
++	    return XpmNoMemory;
+     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
+     if (!colorTable)
+ 	return (XpmNoMemory);
+@@ -5061,6 +5102,10 @@
+ 	    /*
+ 	     * read pixel value
+ 	     */
++	    if (cpp >= SIZE_MAX - 1) {
++		    xpmFreeColorTable(colorTable, ncolors);
++		    return XpmNoMemory;
++	    }
+ 	    color->string = (char *) XpmMalloc(cpp + 1);
+ 	    if (!color->string) {
+ 		xpmFreeColorTable(colorTable, ncolors);
+@@ -5098,13 +5143,14 @@
+ 		}
+ 		if (!lastwaskey && key < NKEYS) {	/* open new key */
+ 		    if (curkey) {	/* flush string */
+-			s = (char *) XpmMalloc(strlen(curbuf) + 1);
++			len = strlen(curbuf) + 1;
++			s = (char *)XpmMalloc(len);
+ 			if (!s) {
+ 			    xpmFreeColorTable(colorTable, ncolors);
+ 			    return (XpmNoMemory);
+ 			}
+ 			defaults[curkey] = s;
+-			strcpy(s, curbuf);
++			memcpy(s, curbuf, len);
+ 		    }
+ 		    curkey = key + 1;	/* set new key  */
+ 		    *curbuf = '\0';	/* reset curbuf */
+@@ -5115,9 +5161,9 @@
+ 			return (XpmFileInvalid);
+ 		    }
+ 		    if (!lastwaskey)
+-			strcat(curbuf, " ");	/* append space */
++			STRLCAT(curbuf, " ", sizeof(curbuf));	/* append space */
+ 		    buf[l] = '\0';
+-		    strcat(curbuf, buf);/* append buf */
++		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
+ 		    lastwaskey = 0;
+ 		}
+ 	    }
+@@ -5125,12 +5171,13 @@
+ 		xpmFreeColorTable(colorTable, ncolors);
+ 		return (XpmFileInvalid);
+ 	    }
+-	    s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
++	    len = strlen(curbuf) + 1;
++	    s = defaults[curkey] = (char *)XpmMalloc(len);
+ 	    if (!s) {
+ 		xpmFreeColorTable(colorTable, ncolors);
+ 		return (XpmNoMemory);
+ 	    }
+-	    strcpy(s, curbuf);
++	    memcpy(s, curbuf, len);
+ 	}
+     } else {				/* XPM 1 */
+ 	/* get to the beginning of the first string */
+@@ -5143,6 +5190,10 @@
+ 	    /*
+ 	     * read pixel value
+ 	     */
++	    if (cpp >= SIZE_MAX - 1) {
++		    xpmFreeColorTable(colorTable, ncolors);
++		    return XpmNoMemory;
++	    }
+ 	    color->string = (char *) XpmMalloc(cpp + 1);
+ 	    if (!color->string) {
+ 		xpmFreeColorTable(colorTable, ncolors);
+@@ -5171,16 +5222,17 @@
+ 	    *curbuf = '\0';		/* init curbuf */
+ 	    while ((l = xpmNextWord(data, buf, BUFSIZ))) {
+ 		if (*curbuf != '\0')
+-		    strcat(curbuf, " ");/* append space */
++		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
+ 		buf[l] = '\0';
+-		strcat(curbuf, buf);	/* append buf */
++		STRLCAT(curbuf, buf, sizeof(curbuf));	/* append buf */
+ 	    }
+-	    s = (char *) XpmMalloc(strlen(curbuf) + 1);
++	    len = strlen(curbuf) + 1;
++	    s = (char *) XpmMalloc(len);
+ 	    if (!s) {
+ 		xpmFreeColorTable(colorTable, ncolors);
+ 		return (XpmNoMemory);
+ 	    }
+-	    strcpy(s, curbuf);
++	    memcpy(s, curbuf, len);
+ 	    color->c_color = s;
+ 	    *curbuf = '\0';		/* reset curbuf */
+ 	    if (a < ncolors - 1)
+@@ -5205,6 +5257,9 @@
+     unsigned int *iptr, *iptr2;
+     unsigned int a, x, y;
+ 
++    if ((height > 0 && width >= SIZE_MAX / height) ||
++		    width * height >= SIZE_MAX / sizeof(unsigned int))
++	    return XpmNoMemory;
+ #ifndef FOR_MSW
+     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
+ #else
+@@ -5228,6 +5283,9 @@
+ 	{
+ 	    unsigned short colidx[256];
+ 
++	    if (ncolors > 256)
++		    return XpmFileInvalid;
++
+ 	    memset((char *)colidx, 0, 256 * sizeof(short));
+ 	    for (a = 0; a < ncolors; a++)
+ 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
+@@ -5305,6 +5363,9 @@
+ 	    char *s;
+ 	    char buf[BUFSIZ];
+ 
++	    if (cpp >= sizeof(buf))
++		    return XpmFileInvalid;
++
+ 	    buf[cpp] = '\0';
+ 	    if (USE_HASHTABLE) {
+ 		xpmHashAtom *slot;
+@@ -5788,7 +5849,7 @@
+ LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
+ 				  XpmAttributes *attributes));
+ 
+-LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
++LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, unsigned int ncolors,
+ 			     Pixel *pixels, unsigned int mask,
+ 			     unsigned int cpp, XpmAttributes *attributes));
+ 
+@@ -5913,11 +5974,16 @@
+     else
+ 	cpp = 0;
+ 
++    if ((height > 0 && width >= SIZE_MAX / height) ||
++		    width * height >= SIZE_MAX / sizeof(unsigned int))
++	    RETURN(XpmNoMemory);
+     pmap.pixelindex =
+ 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
+     if (!pmap.pixelindex)
+ 	RETURN(XpmNoMemory);
+ 
++    if (pmap.size >= SIZE_MAX / sizeof(Pixel))
++	    RETURN(XpmNoMemory);
+     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
+     if (!pmap.pixels)
+ 	RETURN(XpmNoMemory);
+@@ -5983,6 +6049,8 @@
+      * color
+      */
+ 
++    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
++	    RETURN(XpmNoMemory);
+     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
+     if (!colorTable)
+ 	RETURN(XpmNoMemory);
+@@ -6041,6 +6109,8 @@
+ 
+     /* first get a character string */
+     a = 0;
++    if (cpp >= SIZE_MAX - 1)
++	    return XpmNoMemory;
+     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
+ 	return (XpmNoMemory);
+     *s++ = printable[c = a % MAXPRINTABLE];
+@@ -6088,7 +6158,7 @@
+ ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
+     Display *display;
+     XpmColor *colors;
+-    int ncolors;
++    unsigned int ncolors;
+     Pixel *pixels;
+     unsigned int mask;
+     unsigned int cpp;
+@@ -6132,6 +6202,8 @@
+     }
+ 
+     /* first get character strings and rgb values */
++    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
++	    return XpmNoMemory;
+     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
+     if (!xcolors)
+ 	return (XpmNoMemory);
+@@ -7047,6 +7119,8 @@
+      */
+     header_nlines = 1 + image->ncolors;
+     header_size = sizeof(char *) * header_nlines;
++    if (header_size >= SIZE_MAX / sizeof(char *))
++	    return XpmNoMemory;
+     header = (char **) XpmCalloc(header_size, sizeof(char *));
+     if (!header)
+ 	return (XpmNoMemory);

Modified: contrib/1.1/lesstif/current/specs/lesstif.spec
===================================================================
--- contrib/1.1/lesstif/current/specs/lesstif.spec	2004-10-12 20:05:17 UTC (rev 4974)
+++ contrib/1.1/lesstif/current/specs/lesstif.spec	2004-10-12 20:38:27 UTC (rev 4975)
@@ -3,10 +3,11 @@
 Summary: An OSF/Motif(R) clone.
 Name: lesstif
 Version: 0.93.95b
-Release: 1jh
+Release: 2jh
 License: LGPL
 Group: contrib
 Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2
+Patch: lesstif-0.93.95b-xpm.patch
 Url: http://www.lesstif.org/
 
 Obsoletes: lesstif-clients
@@ -52,6 +53,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .xpm
 
 
 %build
@@ -155,6 +157,9 @@
 
 
 %changelog
+* Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.93.95b-2jh
+- patch xpm vulnerability (CAN-2004-0687, CAN-2004-0688)
+
 * Wed Sep 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.93.95b-1jh
 - tinysofa contrib
 - only Motif 2.1 support


From svn at tinysofa.org  Tue Oct 12 20:38:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 16:38:42 -0400 (EDT)
Subject: [tinysofa-svn] r4976 - contrib/1.1/gimp/current/specs
Message-ID: <20041012203842.4C01B344269@minbar.tinysofa.org>

Author: gda
Date: 2004-10-12 16:38:41 -0400 (Tue, 12 Oct 2004)
New Revision: 4976

Modified:
   contrib/1.1/gimp/current/specs/gimp.spec
Log:
fixed permissions

Modified: contrib/1.1/gimp/current/specs/gimp.spec
===================================================================
--- contrib/1.1/gimp/current/specs/gimp.spec	2004-10-12 20:38:27 UTC (rev 4975)
+++ contrib/1.1/gimp/current/specs/gimp.spec	2004-10-12 20:38:41 UTC (rev 4976)
@@ -7,7 +7,7 @@
 Summary: The GNU Image Manipulation Program.
 Name: gimp
 Version: %{subver}.%{microver}
-Release: 2jh
+Release: 3gd
 Epoch: 0
 License: GPL, LGPL
 Group: contrib
@@ -237,6 +237,7 @@
 #%attr(-,root,root) %config(missingok) /%{_datadir}/mc/templates/gimp.desktop
 %{_datadir}/pixmaps/gimp.png
 
+%dir %{_datadir}/gimp
 %dir %{_datadir}/gimp/%{subver}
 %dir %{_datadir}/gimp/%{subver}/tips
 %dir %{_libdir}/gimp/%{subver}
@@ -254,6 +255,8 @@
 %{_datadir}/gimp/%{subver}/patterns/
 %{_datadir}/gimp/%{subver}/scripts/
 
+%dir %{_sysconfdir}/gimp
+%dir %{_sysconfdir}/gimp/%{subver}
 %{_sysconfdir}/gimp/%{subver}/gimprc
 %{_sysconfdir}/gimp/%{subver}/gimprc_user
 %{_sysconfdir}/gimp/%{subver}/gtkrc
@@ -319,6 +322,9 @@
 %endif
 
 %changelog
+* Tue Oct 12 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.5-3gd
+- fixed permissions 
+
 * Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.5-2jh
 - add icewm menu file
 


From svn at tinysofa.org  Tue Oct 12 22:27:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Oct 2004 18:27:49 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4977 - in contrib/1.1: . device-mapper device-mapper/current
	device-mapper/current/sources device-mapper/current/specs lvm2
	lvm2/current lvm2/current/sources lvm2/current/specs
Message-ID: <20041012222749.7761D34426A@minbar.tinysofa.org>

Author: gda
Date: 2004-10-12 18:27:48 -0400 (Tue, 12 Oct 2004)
New Revision: 4977

Added:
   contrib/1.1/device-mapper/
   contrib/1.1/device-mapper/current/
   contrib/1.1/device-mapper/current/sources/
   contrib/1.1/device-mapper/current/sources/device-mapper.1.00.19.tgz
   contrib/1.1/device-mapper/current/specs/
   contrib/1.1/device-mapper/current/specs/device-mapper.spec
   contrib/1.1/device-mapper/pristine/
   contrib/1.1/device-mapper/releases/
   contrib/1.1/lvm2/
   contrib/1.1/lvm2/current/
   contrib/1.1/lvm2/current/sources/
   contrib/1.1/lvm2/current/sources/LVM2.2.00.25.tgz
   contrib/1.1/lvm2/current/specs/
   contrib/1.1/lvm2/current/specs/lvm2.spec
   contrib/1.1/lvm2/pristine/
   contrib/1.1/lvm2/releases/
Log:
new in contrib

Added: contrib/1.1/device-mapper/current/sources/device-mapper.1.00.19.tgz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/device-mapper/current/sources/device-mapper.1.00.19.tgz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/device-mapper/current/specs/device-mapper.spec
===================================================================
--- contrib/1.1/device-mapper/current/specs/device-mapper.spec	2004-10-12 20:38:41 UTC (rev 4976)
+++ contrib/1.1/device-mapper/current/specs/device-mapper.spec	2004-10-12 22:27:48 UTC (rev 4977)
@@ -0,0 +1,89 @@
+Summary: device mapper library
+Name: device-mapper
+Version: 1.00.19
+Release: 2gd
+License: GPL
+Group: contrib
+URL: http://sources.redhat.com/dm
+Source0: %{name}.%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%description
+This package contains the supporting userspace files (libdevmapper and
+dmsetup) for the device-mapper.
+
+%prep
+%setup -q -n %{name}.%{version}
+
+%build
+%configure --enable-static_link --with-user= --with-group=
+make
+
+%install
+%makeinstall
+
+%clean
+%clean_buildroot
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING COPYING.LIB INSTALL INTRO README VERSION WHATS_NEW
+%{_libdir}/libdevmapper.so*
+%{_libdir}/libdevmapper.a*
+%{_sbindir}/dmsetup
+%{_sbindir}/dmsetup.static
+%{_mandir}/*/*
+%{_includedir}/libdevmapper.h
+
+
+%changelog
+* Tue Oct 12 2004 Gerald Dachs <gda at tinysofa dot org> 1.00.19-2gd
+- new in tinysofa contrib
+
+* Fri Sep 17 2004 Alasdair Kergon <agk at redhat.com> - 1.00.19-2
+- Missing BuildRequires. [bz 121133]
+
+* Sat Jul 3 2004 Alasdair Kergon <agk at redhat.com> - 1.00.19-1
+- New upstream release fixes device numbers for 2.6 kernels.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed May 26 2004 Alasdair Kergon <agk at redhat.com> - 1.00.17-2
+- Fix is_selinux_enabled() test
+
+* Mon Apr 19 2004 Alasdair Kergon <agk at redhat.com> - 1.00.17-1
+- Fix non-root build with current version of 'install'.
+- Incorporate last two selinux patches into tarball.
+
+* Fri Apr 16 2004 Bill Nottingham <notting at redhat.com> - 1.00.14-3
+- fix linking against libselinux on x86-64
+
+* Thu Apr 15 2004 Jeremy Katz <katzj at redhat.com> - 1.00.14-2
+- don't error out if we get ENOTSUP setting the context
+
+* Tue Apr 06 2004 Alasdair Kergon <agk at redhat.com> 1.00.14-1
+- Fix static selinux build.
+
+* Tue Apr 06 2004 Alasdair Kergon <agk at redhat.com> 1.00.13-1
+- Set selinux context when doing mknod.
+
+* Mon Apr 05 2004 Alasdair Kergon <agk at redhat.com> 1.00.11-1
+- Cleanup build process. Add features: dmsetup targets, event_nr support.
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Dec  5 2003 Jeremy Katz <katzj at redhat.com> 1.00.07-2
+- add static lib
+
+* Tue Dec  2 2003 Jeremy Katz <katzj at redhat.com> 1.00.07-1
+- Initial build.
+

Added: contrib/1.1/lvm2/current/sources/LVM2.2.00.25.tgz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/lvm2/current/sources/LVM2.2.00.25.tgz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/lvm2/current/specs/lvm2.spec
===================================================================
--- contrib/1.1/lvm2/current/specs/lvm2.spec	2004-10-12 20:38:41 UTC (rev 4976)
+++ contrib/1.1/lvm2/current/specs/lvm2.spec	2004-10-12 22:27:48 UTC (rev 4977)
@@ -0,0 +1,166 @@
+Summary: Userland logical volume management tools 
+Name: lvm2
+Version: 2.00.25
+Release: 1gd
+License: GPL
+Group: contrib
+URL: http://sources.redhat.com/lvm2
+Source0: LVM2.%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: device-mapper
+BuildRequires: libtermcap-devel
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel
+Conflicts: lvm < 1.0.3-19
+Obsoletes: lvm < 1.0.3-19
+
+%description
+LVM2 includes all of the support for handling read/write operations on
+physical volumes (hard disks, RAID-Systems, magneto optical, etc.,
+multiple devices (MD), see mdadd(8) or even loop devices, see
+losetup(8)), creating volume groups (kind of virtual disks) from one
+or more physical volumes and creating one or more logical volumes
+(kind of logical partitions) in volume groups.
+
+%prep
+%setup -q -n LVM2.%{version}
+
+%build
+%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-staticdir=/sbin --with-user= --with-group=
+make DESTDIR=$RPM_BUILD_ROOT
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Temporary links until initscripts get updated to use lvm.static
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/lvm
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/pvscan
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgchange
+ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgscan
+
+%pre
+[[ `/bin/uname -r` < 2.6 ]] && echo "You need to be running a 2.6 kernel to install lvm2." && exit 1
+exit 0
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
+/sbin/lvm.static
+/sbin/lvm
+/sbin/pvscan
+/sbin/vgchange
+/sbin/vgscan
+/usr/sbin/lvm
+/usr/sbin/*
+%{_mandir}/*/*
+%config(noreplace) /etc/lvm/lvm.conf
+
+%changelog
+* Tue Oct 12 2004 Gerald Dachs <gda at tinysofa dot org> 2.00.25-1gd
+- new in tinysofa contrib
+
+* Wed Sep 29 2004 Alasdair Kergon <agk at redhat.com> - 2.00.25-1
+- Fix vgmknodes return code & vgremove locking.
+
+* Fri Sep 17 2004 Alasdair Kergon <agk at redhat.com> - 2.00.24-2
+- Obsolete old lvm1 packages; refuse install if running kernel 2.4. [bz 128185]
+
+* Thu Sep 16 2004 Alasdair Kergon <agk at redhat.com> - 2.00.24-1
+- More upstream fixes.  (Always check WHATS_NEW file for details.)
+- Add requested BuildRequires. [bz 124916, 132408]
+
+* Wed Sep 15 2004 Alasdair Kergon <agk at redhat.com> - 2.00.23-1
+- Various minor upstream fixes.
+
+* Thu Sep  3 2004 Alasdair Kergon <agk at redhat.com> - 2.00.22-1
+- Permission fix included upstream; use different endian conversion macros.
+
+* Thu Sep  2 2004 Jeremy Katz <katzj at redhat.com> - 2.00.21-2
+- fix permissions on vg dirs
+
+* Thu Aug 19 2004 Alasdair Kergon <agk at redhat.com> - 2.00.21-1
+- New upstream release incorporating fixes plus minor enhancements.
+
+* Tue Aug 17 2004 Jeremy Katz <katzj at redhat.com> - 2.00.20-2
+- add patch for iSeries viodasd support
+- add patch to check file type using stat(2) if d_type == DT_UNKNOWN (#129674)
+
+* Sat Jul 3 2004 Alasdair Kergon <agk at redhat.com> - 2.00.20-1
+- New upstream release fixes 2.6 kernel device numbers.
+
+* Tue Jun 29 2004 Alasdair Kergon <agk at redhat.com> - 2.00.19-1
+- Latest upstream release.  Lots of changes (see WHATS_NEW).
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com> - 2.00.15-5
+- rebuilt
+
+* Wed May 26 2004 Alasdair Kergon <agk at redhat.com> - 2.00.15-4
+- clone %description from LVM rpm
+
+* Wed May 26 2004 Alasdair Kergon <agk at redhat.com> - 2.00.15-3
+- vgscan shouldn't return error status when no VGs present
+
+* Thu May 06 2004 Warren Togami <wtogami at redhat.com> - 2.00.15-2
+- i2o patch from Markus Lidel
+
+* Tue Apr 20 2004 Bill Nottingham <notting at redhat.com> - 2.00.15-1.1
+- handle disabled SELinux correctly, so that LVMs can be detected in a
+  non-SELinux context
+  
+* Mon Apr 19 2004 Alasdair Kergon <agk at redhat.com> - 2.00.15-1
+- Fix non-root build with current version of 'install'.
+
+* Fri Apr 16 2004 Alasdair Kergon <agk at redhat.com> - 2.00.14-1
+- Use 64-bit file offsets.
+
+* Fri Apr 16 2004 Alasdair Kergon <agk at redhat.com> - 2.00.13-1
+- Avoid scanning devices containing md superblocks.
+- Integrate ENOTSUP patch.
+
+* Thu Apr 15 2004 Jeremy Katz <katzj at redhat.com> - 2.00.12-4
+- don't die if we get ENOTSUP setting selinux contexts
+
+* Thu Apr 15 2004 Alasdair Kergon <agk at redhat.com> 2.00.12-3
+- Add temporary pvscan symlink for LVM1 until mkinitrd gets updated.
+
+* Wed Apr 14 2004 Alasdair Kergon <agk at redhat.com> 2.00.12-2
+- Mark config file noreplace.
+
+* Wed Apr 14 2004 Alasdair Kergon <agk at redhat.com> 2.00.12-1
+- Install default /etc/lvm/lvm.conf.
+- Move non-static binaries to /usr/sbin.
+- Add temporary links in /sbin to lvm.static until rc.sysinit gets updated.
+
+* Thu Apr 08 2004 Alasdair Kergon <agk at redhat.com> 2.00.11-1
+- Fallback to using LVM1 tools when using a 2.4 kernel without device-mapper.
+
+* Wed Apr 07 2004 Alasdair Kergon <agk at redhat.com> 2.00.10-2
+- Install the full toolset, not just 'lvm'.
+
+* Wed Apr 07 2004 Alasdair Kergon <agk at redhat.com> 2.00.10-1
+- Update to version 2.00.10, which incorporates the RH-specific patches
+  and includes various fixes and enhancements detailed in WHATS_NEW.
+
+* Wed Mar 17 2004 Jeremy Katz <katzj at redhat.com> 2.00.08-5
+- Fix sysfs patch to find sysfs
+- Take patch from dwalsh and tweak a little for setting SELinux contexts on
+  device node creation and also do it on the symlink creation.  
+  Part of this should probably be pushed down to device-mapper instead
+
+* Thu Feb 19 2004 Stephen C. Tweedie <sct at redhat.com> 2.00.08-4
+- Add sysfs filter patch
+- Allow non-root users to build RPM
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Dec  5 2003 Jeremy Katz <katzj at redhat.com> 2.00.08-2
+- add static lvm binary
+
+* Tue Dec  2 2003 Jeremy Katz <katzj at redhat.com> 
+- Initial build.
+
+


From svn at tinysofa.org  Wed Oct 13 07:27:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Oct 2004 03:27:26 -0400 (EDT)
Subject: [tinysofa-svn] r4978 - contrib/1.1/xpdf/current/specs
Message-ID: <20041013072726.03CEA34426A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-13 03:27:24 -0400 (Wed, 13 Oct 2004)
New Revision: 4978

Modified:
   contrib/1.1/xpdf/current/specs/xpdf.spec
Log:
- add BuildRequires: gcc-c++

Modified: contrib/1.1/xpdf/current/specs/xpdf.spec
===================================================================
--- contrib/1.1/xpdf/current/specs/xpdf.spec	2004-10-12 22:27:48 UTC (rev 4977)
+++ contrib/1.1/xpdf/current/specs/xpdf.spec	2004-10-13 07:27:24 UTC (rev 4978)
@@ -36,7 +36,7 @@
 #Requires: urw-fonts
 #Requires: htmlview
 
-BuildPrereq: lesstif-devel autoconf
+BuildPrereq: lesstif-devel autoconf gcc-c++
 BuildPrereq: xorg-x11-devel
 BuildPrereq: freetype-devel >= 2.1.7
 BuildPrereq: fileutils


From svn at tinysofa.org  Wed Oct 13 09:01:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Oct 2004 05:01:12 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4979 - in tinysofa/releases/1.1/nss_ldap/current: sources specs
Message-ID: <20041013090112.525C734426A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-13 05:01:11 -0400 (Wed, 13 Oct 2004)
New Revision: 4979

Added:
   tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-226.tar.gz
   tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch
   tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176.tar.gz
Removed:
   tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-disable-mutex.patch
   tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-libobjs.patch
   tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14.tar.gz
   tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-220.tar.gz
   tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-167-dnsconfig.patch
   tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-169.tar.gz
Modified:
   tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
Log:
- update to nss_ldap version 226 and pam ldap version 176
- db4 is no more needed


Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-disable-mutex.patch
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-disable-mutex.patch	2004-10-13 07:27:24 UTC (rev 4978)
+++ tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-disable-mutex.patch	2004-10-13 09:01:11 UTC (rev 4979)
@@ -1,20 +0,0 @@
-Give us some way to disable mutex-based locking (which requires libpthread)
-and fall back to fcntl locking.  This copy of libdb can't require libpthread
-because it will be included in a module which will be opened using dlopen(),
-and opening a module which needs libpthread from an application which can
-create instability (and that's the good scenario).
---- db-4.0.14/dist/aclocal/mutex.ac	2003-06-04 19:15:53.000000000 -0400
-+++ db-4.0.14/dist/aclocal/mutex.ac	2003-06-04 19:15:36.000000000 -0400
-@@ -339,7 +339,7 @@
- fi
- ])
- 
--if test "$db_cv_mutex" = no; then
-+if test "$db_cv_mutex" = no -o "$db_cv_mutex" = disabled ; then
- 	AC_MSG_WARN(
- 	    [THREAD MUTEXES NOT AVAILABLE FOR THIS COMPILER/ARCHITECTURE.])
- 	ADDITIONAL_OBJS="mut_fcntl${o} $ADDITIONAL_OBJS"
---- db-4.0.14/dist/config.cache	2003-06-04 19:18:50.000000000 -0400
-+++ db-4.0.14/dist/config.cache	2003-06-04 19:19:00.000000000 -0400
-@@ -0,0 +1 @@
-+db_cv_mutex=disabled

Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-libobjs.patch
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-libobjs.patch	2004-10-13 07:27:24 UTC (rev 4978)
+++ tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14-libobjs.patch	2004-10-13 09:01:11 UTC (rev 4979)
@@ -1,15 +0,0 @@
-Newer autoconf doesn't like us messing with LIBOBJS, and we're building
-statically anyway, so just skip this step.
---- db-4.0.14/dist/configure.ac	2003-06-04 22:04:34.000000000 -0400
-+++ db-4.0.14/dist/configure.ac	2003-06-04 22:04:29.000000000 -0400
-@@ -451,8 +451,8 @@
- # Nasty hack.  AC_REPLACE_FUNCS added entries of the form xxx.o to the
- # LIBOBJS variable.  They have to be xxx.lo if we are building shared
- # libraries.  Use sed, configure already requires it.
--tmp="`echo \"$LIBOBJS\" | sed \"s/\.o/${o}/g\"`"
--LIBOBJS="$tmp"
-+dnl tmp="`echo \"$LIBOBJS\" | sed \"s/\.o/${o}/g\"`"
-+dnl LIBOBJS="$tmp"
- 
- # Check for system functions we optionally use.
- AC_CHECK_FUNCS(_fstati64 getuid pstat_getdynamic sched_yield select strtoul)

Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/db-4.0.14.tar.gz
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-220.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-226.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-226.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-167-dnsconfig.patch
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-167-dnsconfig.patch	2004-10-13 07:27:24 UTC (rev 4978)
+++ tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-167-dnsconfig.patch	2004-10-13 09:01:11 UTC (rev 4979)
@@ -1,378 +0,0 @@
---- pam_ldap-167/Makefile.am	2003-12-16 08:45:12.000000000 -0500
-+++ pam_ldap-167/Makefile.am	2004-03-10 15:01:43.000000000 -0500
-@@ -2,7 +2,7 @@
- EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \
- 	     ldap.conf pam.conf pam_ldap.spec pam.d
- 
--pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h
-+pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h resolve.c resolve.h dnsconfig.c dnsconfig.h snprintf.c snprintf.h
- pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@
- 
- DEFS = @DEFS@
---- pam_ldap-167/configure.in	2003-12-16 08:45:12.000000000 -0500
-+++ pam_ldap-167/configure.in	2004-03-10 15:01:43.000000000 -0500
-@@ -127,6 +127,9 @@
- fi
- AC_CHECK_FUNCS(ldap_initialize)
- AC_CHECK_FUNCS(gethostbyname_r)
-+AC_CHECK_FUNCS(snprintf strtok_r)
-+AC_CHECK_LIB(resolv, main)
-+AC_CHECK_FUNCS(res_search dn_expand)
- 
- if test "$ac_cv_func_gethostbyname_r" = "yes"; then
- AC_CACHE_CHECK(whether gethostbyname_r takes 6 arguments, pam_ldap_cv_gethostbyname_r_args, [
---- pam_ldap-167/pam_ldap.c	2003-12-16 08:45:12.000000000 -0500
-+++ pam_ldap-167/pam_ldap.c	2004-03-10 15:01:43.000000000 -0500
-@@ -124,6 +124,7 @@
- #endif /* YPLDAPD */
- 
- #include "pam_ldap.h"
-+#include "dnsconfig.h"
- #include "md5.h"
- 
- #if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H)
-@@ -763,11 +764,6 @@
- 
-   if (fp == NULL)
-     {
--      /* 
--       * According to PAM Documentation, such an error in a config file
--       * SHOULD be logged at LOG_ALERT level
--       */
--      syslog (LOG_ALERT, "pam_ldap: missing file \"%s\"", configFile);
-       return PAM_SERVICE_ERR;
-     }
- 
-@@ -1064,21 +1060,6 @@
- 	}
-     }
- 
--#ifdef HAVE_LDAP_INITIALIZE
--  if (result->host == NULL && result->uri == NULL)
--#else
--  if (result->host == NULL)
--#endif
--    {
--      /* 
--       * According to PAM Documentation, such an error in a config file
--       * SHOULD be logged at LOG_ALERT level
--       */
--      syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
--	      configFile);
--      return PAM_SERVICE_ERR;
--    }
--
-   if (result->userattr == NULL)
-     {
-       CHECKPOINTER (result->userattr = strdup ("uid"));
-@@ -1133,6 +1114,7 @@
-    * not the buffer
-    */
-   memset (b, 0, BUFSIZ);
-+  *presult = result;
-   return PAM_SUCCESS;
- }
- 
-@@ -2329,16 +2311,31 @@
-       _release_config (&session->conf);
- #endif /* YPLDAPD */
-       rc = _read_config (configFile, &session->conf);
--      if (rc != PAM_SUCCESS)
-+      if ((rc != PAM_SUCCESS) || (session->conf->host == NULL))
- 	{
--	  _release_config (&session->conf);
--	  free (session);
--	  return rc;
-+          rc = _pam_ldap_readconfigfromdns(session->conf);
-+          if (rc != PAM_SUCCESS)
-+	    {
-+	      _release_config (&session->conf);
-+	      free (session);
-+	      return rc;
-+	    }
- 	}
- #ifdef YPLDAPD
-     }
- #endif /* YPLDAPD */
- 
-+    if (session->conf->host == NULL)
-+      {
-+        /* 
-+         * According to PAM Documentation, such an error in a config file
-+         * SHOULD be logged at LOG_ALERT level
-+         */
-+        syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"ldap.conf\","
-+		" and no information in DNS");
-+        return PAM_SYSTEM_ERR;
-+      }
-+
-   rc =
-     pam_set_data (pamh, PADL_LDAP_SESSION_DATA, (void *) session,
- 		  _pam_ldap_cleanup_session);
---- pam_ldap-167/pam_ldap.h	2003-12-16 08:45:12.000000000 -0500
-+++ pam_ldap-167/pam_ldap.h	2004-03-10 15:05:31.000000000 -0500
-@@ -19,6 +19,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#ifndef _LDAP_PAM_LDAP_H
-+#define _LDAP_PAM_LDAP_H
-+
- #ifdef HAVE_SECURITY_PAM_APPL_H
- #include <security/pam_appl.h>
- #elif defined(HAVE_PAM_PAM_APPL_H)
-@@ -137,6 +140,8 @@
-     char *logdir;
-     /* ldap debug level */
-     int debug;
-+    /* next server in the list */
-+    struct pam_ldap_config *next;
-   }
- pam_ldap_config_t;
- 
-@@ -317,3 +322,4 @@
- #define PAM_SM_ACCOUNT
- PAM_EXTERN int pam_sm_acct_mgmt (pam_handle_t *, int, int, const char **);
- 
-+#endif
---- /dev/null	2004-02-23 16:02:56.000000000 -0500
-+++ pam_ldap-167/dnsconfig.c	2004-03-10 15:01:43.000000000 -0500
-@@ -0,0 +1,200 @@
-+
-+/* Copyright (C) 1997-2001 Luke Howard.
-+   This file started off as part of the nss_ldap library.
-+   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
-+   (The author maintains a non-exclusive licence to distribute this file
-+   under their own conditions.)
-+
-+   The nss_ldap library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The nss_ldap library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+ */
-+
-+/*
-+ * Support DNS SRV records. I look up the SRV record for
-+ * _ldap._tcp.gnu.org.
-+ * and build the DN DC=gnu,DC=org.
-+ * Thanks to Assar & co for resolve.[ch].
-+ */
-+
-+static char rcsId[] = "$Id: dnsconfig.c,v 2.24 2001/02/27 14:44:31 lukeh Exp $";
-+
-+#include "config.h"
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <sys/param.h>
-+#include <netdb.h>
-+#include <syslog.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+#include <string.h>
-+
-+#ifdef HAVE_LBER_H
-+#include <lber.h>
-+#endif
-+#ifdef HAVE_LDAP_H
-+#include <ldap.h>
-+#endif
-+
-+#ifndef HAVE_SNPRINTF
-+#include "snprintf.h"
-+#endif
-+
-+#include "pam_ldap.h"
-+#include "resolve.h"
-+#include "dnsconfig.h"
-+
-+#define DC_ATTR "DC"
-+#define DC_ATTR_AVA DC_ATTR "="
-+#define DC_ATTR_AVA_LEN (sizeof(DC_ATTR_AVA) - 1)
-+
-+/* map gnu.org into DC=gnu,DC=org */
-+int
-+_pam_ldap_getdnsdn (char *src_domain, char **rval)
-+{
-+  char *p;
-+  int len = 0;
-+#ifdef HAVE_STRTOK_R
-+  char *st = NULL;
-+#endif
-+  char *domain;
-+  char domain_copy[BUFSIZ], buffer[BUFSIZ];
-+
-+  /* we need to take a copy of domain, because strtok() modifies
-+   * it in place. Bad.
-+   */
-+  if (strlen (src_domain) >= sizeof (domain_copy))
-+    {
-+      return PAM_SYSTEM_ERR;
-+    }
-+  memset (domain_copy, '\0', sizeof (domain_copy));
-+  memset (buffer, '\0', sizeof (buffer));
-+  strcpy (domain_copy, src_domain);
-+
-+  domain = domain_copy;
-+
-+#ifndef HAVE_STRTOK_R
-+  while ((p = strtok (domain, ".")))
-+#else
-+  while ((p = strtok_r (domain, ".", &st)))
-+#endif
-+    {
-+      len = strlen (p);
-+
-+      if (strlen (buffer) + DC_ATTR_AVA_LEN + len + 1 >= sizeof (buffer))
-+	{
-+	  return PAM_SYSTEM_ERR;
-+	}
-+
-+      if (domain == NULL)
-+	{
-+	  strcat (buffer, ",");
-+	}
-+      else
-+	{
-+	  domain = NULL;
-+	}
-+
-+      strcat (buffer, DC_ATTR_AVA);
-+      strcat (buffer, p);
-+    }
-+
-+  if (rval != NULL)
-+    {
-+      *rval = strdup (buffer);
-+    }
-+
-+  return PAM_SUCCESS;
-+}
-+
-+
-+int
-+_pam_ldap_readconfigfromdns (pam_ldap_config_t * result)
-+{
-+  int stat = PAM_SUCCESS;
-+  struct dns_reply *r;
-+  struct resource_record *rr;
-+  char domain[MAXHOSTNAMELEN + 1];
-+
-+  /* only reinitialize variables we'll change here */
-+  result->host = NULL;
-+  result->base = NULL;
-+  result->port = LDAP_PORT;
-+#ifdef LDAP_VERSION3
-+  result->version = LDAP_VERSION3;
-+#else
-+  result->version = LDAP_VERSION2;
-+#endif /* LDAP_VERSION3 */
-+
-+  if ((_res.options & RES_INIT) == 0 && res_init () == -1)
-+    {
-+      return PAM_SYSTEM_ERR;
-+    }
-+
-+  snprintf (domain, sizeof (domain), "_ldap._tcp.%s.", _res.defdname);
-+
-+  r = dns_lookup (domain, "srv");
-+  if (r == NULL)
-+    {
-+      return PAM_SYSTEM_ERR;
-+    }
-+
-+  /* XXX need to sort by priority */
-+  for (rr = r->head; rr != NULL; rr = rr->next)
-+    {
-+      if (rr->type == T_SRV)
-+	{
-+	  if (result->host != NULL)
-+	    {
-+	      /* need more space */
-+	      result->next = (pam_ldap_config_t *) malloc (sizeof (*result));
-+	      if (result->next == NULL)
-+		{
-+		  dns_free_data (r);
-+		  return PAM_BUF_ERR;
-+		}
-+	      result = result->next;
-+	    }
-+
-+	  /* Server Host */
-+	  result->host = strdup (rr->u.srv->target);
-+
-+	  /* Port */
-+	  result->port = rr->u.srv->port;
-+#ifdef LDAPS_PORT
-+	  /* Hack: if the port is the registered SSL port, enable SSL. */
-+	  if (result->port == LDAPS_PORT)
-+	    {
-+	      result->ssl_on = SSL_LDAPS;
-+	    }
-+#endif /* SSL */
-+
-+	  /* DN */
-+	  stat = _pam_ldap_getdnsdn (_res.defdname, &result->base);
-+	  if (stat != PAM_SUCCESS)
-+	    {
-+	      dns_free_data (r);
-+	      return stat;
-+	    }
-+	}
-+    }
-+
-+  dns_free_data (r);
-+  stat = PAM_SUCCESS;
-+
-+  return stat;
-+}
---- /dev/null	2004-02-23 16:02:56.000000000 -0500
-+++ pam_ldap-167/dnsconfig.h	2004-03-10 15:01:44.000000000 -0500
-@@ -0,0 +1,35 @@
-+/* Copyright (C) 1997-2001 Luke Howard.
-+   This file started off as part of the nss_ldap library.
-+   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
-+   (The author maintains a non-exclusive licence to distribute this file
-+   under their own conditions.)
-+
-+   The nss_ldap library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The nss_ldap library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifndef _LDAP_PAM_LDAP_DNSCONFIG_H
-+#define _LDAP_PAM_LDAP_DNSCONFIG_H
-+
-+/* utility routines.  */
-+
-+int _pam_ldap_getdnsdn (
-+			char *domain,
-+			char **rval);
-+
-+int _pam_ldap_readconfigfromdns (
-+				 pam_ldap_config_t *result);
-+
-+#endif /* _LDAP_PAM_LDAP_DNSCONFIG_H */

Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-169.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch	2004-10-13 07:27:24 UTC (rev 4978)
+++ tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176-dnsconfig.patch	2004-10-13 09:01:11 UTC (rev 4979)
@@ -0,0 +1,379 @@
+--- pam_ldap-176/Makefile.am.dnsconfig	2004-10-01 05:33:14.000000000 +0300
++++ pam_ldap-176/Makefile.am	2004-10-13 11:17:18.300738208 +0300
+@@ -2,7 +2,7 @@
+ EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \
+ 	     ldap.conf pam.conf pam_ldap.spec pam.d
+ 
+-pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h
++pam_ldap_so_SOURCES = pam_ldap.c pam_ldap.h md5.c md5.h resolve.c resolve.h dnsconfig.c dnsconfig.h snprintf.c snprintf.h
+ pam_ldap_so_LDFLAGS = @pam_ldap_so_LDFLAGS@
+ 
+ DEFS = @DEFS@
+--- pam_ldap-176/pam_ldap.h.dnsconfig	2004-10-01 05:33:14.000000000 +0300
++++ pam_ldap-176/pam_ldap.h	2004-10-13 11:20:59.859056224 +0300
+@@ -19,6 +19,9 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#ifndef _LDAP_PAM_LDAP_H
++#define _LDAP_PAM_LDAP_H
++
+ #ifdef HAVE_SECURITY_PAM_APPL_H
+ #include <security/pam_appl.h>
+ #elif defined(HAVE_PAM_PAM_APPL_H)
+@@ -140,6 +143,9 @@
+     int debug;
+     /* SASL mechanism */
+     char *sasl_mechanism;
++    /* next server in the list */
++    struct pam_ldap_config *next;
++
+   }
+ pam_ldap_config_t;
+ 
+@@ -342,3 +348,4 @@
+ #define PAM_SM_ACCOUNT
+ PAM_EXTERN int pam_sm_acct_mgmt (pam_handle_t *, int, int, const char **);
+ 
++#endif
+--- pam_ldap-176/pam_ldap.c.dnsconfig	2004-10-01 05:33:14.000000000 +0300
++++ pam_ldap-176/pam_ldap.c	2004-10-13 11:19:39.638251640 +0300
+@@ -129,6 +129,7 @@
+ #endif /* YPLDAPD */
+ 
+ #include "pam_ldap.h"
++#include "dnsconfig.h"
+ #include "md5.h"
+ 
+ #if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H)
+@@ -792,11 +793,6 @@
+ 
+   if (fp == NULL)
+     {
+-      /* 
+-       * According to PAM Documentation, such an error in a config file
+-       * SHOULD be logged at LOG_ALERT level
+-       */
+-      syslog (LOG_ALERT, "pam_ldap: missing file \"%s\"", configFile);
+       return PAM_SERVICE_ERR;
+     }
+ 
+@@ -1099,21 +1095,6 @@
+ 	}
+     }
+ 
+-#ifdef HAVE_LDAP_INITIALIZE
+-  if (result->host == NULL && result->uri == NULL)
+-#else
+-  if (result->host == NULL)
+-#endif
+-    {
+-      /* 
+-       * According to PAM Documentation, such an error in a config file
+-       * SHOULD be logged at LOG_ALERT level
+-       */
+-      syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"%s\"",
+-	      configFile);
+-      return PAM_SERVICE_ERR;
+-    }
+-
+ #if !(defined(HAVE_SASL_SASL_H) || defined(HAVE_SASL_H)) && !defined(HAVE_LDAP_SASL_INTERACTIVE_BIND_S)
+   if (result->sasl_mechanism != NULL)
+     {
+@@ -1177,6 +1158,7 @@
+    * not the buffer
+    */
+   memset (b, 0, BUFSIZ);
++  *presult = result;
+   return PAM_SUCCESS;
+ }
+ 
+@@ -2659,16 +2641,31 @@
+       _release_config (&session->conf);
+ #endif /* YPLDAPD */
+       rc = _read_config (configFile, &session->conf);
+-      if (rc != PAM_SUCCESS)
++      if ((rc != PAM_SUCCESS) || (session->conf->host == NULL))
+ 	{
+-	  _release_config (&session->conf);
+-	  free (session);
+-	  return rc;
++          rc = _pam_ldap_readconfigfromdns(session->conf);
++          if (rc != PAM_SUCCESS)
++	    {
++	      _release_config (&session->conf);
++	      free (session);
++	      return rc;
++	    }
+ 	}
+ #ifdef YPLDAPD
+     }
+ #endif /* YPLDAPD */
+ 
++    if (session->conf->host == NULL)
++      {
++        /* 
++         * According to PAM Documentation, such an error in a config file
++         * SHOULD be logged at LOG_ALERT level
++         */
++        syslog (LOG_ALERT, "pam_ldap: missing \"host\" in file \"ldap.conf\","
++		" and no information in DNS");
++        return PAM_SYSTEM_ERR;
++      }
++
+   rc =
+     pam_set_data (pamh, PADL_LDAP_SESSION_DATA, (void *) session,
+ 		  _pam_ldap_cleanup_session);
+--- /dev/null	2004-08-31 12:30:25.000000000 +0300
++++ pam_ldap-176/dnsconfig.h	2004-10-13 11:17:18.312736384 +0300
+@@ -0,0 +1,35 @@
++/* Copyright (C) 1997-2001 Luke Howard.
++   This file started off as part of the nss_ldap library.
++   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
++   (The author maintains a non-exclusive licence to distribute this file
++   under their own conditions.)
++
++   The nss_ldap library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Library General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   The nss_ldap library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
++   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++ */
++
++#ifndef _LDAP_PAM_LDAP_DNSCONFIG_H
++#define _LDAP_PAM_LDAP_DNSCONFIG_H
++
++/* utility routines.  */
++
++int _pam_ldap_getdnsdn (
++			char *domain,
++			char **rval);
++
++int _pam_ldap_readconfigfromdns (
++				 pam_ldap_config_t *result);
++
++#endif /* _LDAP_PAM_LDAP_DNSCONFIG_H */
+--- pam_ldap-176/configure.in.dnsconfig	2004-10-01 05:33:14.000000000 +0300
++++ pam_ldap-176/configure.in	2004-10-13 11:17:18.302737904 +0300
+@@ -133,6 +133,9 @@
+ AC_CHECK_FUNCS(ldap_initialize)
+ AC_CHECK_FUNCS(ldap_sasl_bind ldap_sasl_interactive_bind_s)
+ AC_CHECK_FUNCS(gethostbyname_r)
++AC_CHECK_FUNCS(snprintf strtok_r)
++AC_CHECK_LIB(resolv, main)
++AC_CHECK_FUNCS(res_search dn_expand)
+ 
+ if test "$ac_cv_func_gethostbyname_r" = "yes"; then
+ AC_CACHE_CHECK(whether gethostbyname_r takes 6 arguments, xad_cv_gethostbyname_r_args, [
+--- /dev/null	2004-08-31 12:30:25.000000000 +0300
++++ pam_ldap-176/dnsconfig.c	2004-10-13 11:17:18.311736536 +0300
+@@ -0,0 +1,200 @@
++
++/* Copyright (C) 1997-2001 Luke Howard.
++   This file started off as part of the nss_ldap library.
++   Contributed by Luke Howard, <lukeh at padl.com>, 1997.
++   (The author maintains a non-exclusive licence to distribute this file
++   under their own conditions.)
++
++   The nss_ldap library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Library General Public License as
++   published by the Free Software Foundation; either version 2 of the
++   License, or (at your option) any later version.
++
++   The nss_ldap library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with the nss_ldap library; see the file COPYING.LIB.  If not,
++   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++ */
++
++/*
++ * Support DNS SRV records. I look up the SRV record for
++ * _ldap._tcp.gnu.org.
++ * and build the DN DC=gnu,DC=org.
++ * Thanks to Assar & co for resolve.[ch].
++ */
++
++static char rcsId[] = "$Id: dnsconfig.c,v 2.24 2001/02/27 14:44:31 lukeh Exp $";
++
++#include "config.h"
++
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <sys/param.h>
++#include <netdb.h>
++#include <syslog.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
++#include <string.h>
++
++#ifdef HAVE_LBER_H
++#include <lber.h>
++#endif
++#ifdef HAVE_LDAP_H
++#include <ldap.h>
++#endif
++
++#ifndef HAVE_SNPRINTF
++#include "snprintf.h"
++#endif
++
++#include "pam_ldap.h"
++#include "resolve.h"
++#include "dnsconfig.h"
++
++#define DC_ATTR "DC"
++#define DC_ATTR_AVA DC_ATTR "="
++#define DC_ATTR_AVA_LEN (sizeof(DC_ATTR_AVA) - 1)
++
++/* map gnu.org into DC=gnu,DC=org */
++int
++_pam_ldap_getdnsdn (char *src_domain, char **rval)
++{
++  char *p;
++  int len = 0;
++#ifdef HAVE_STRTOK_R
++  char *st = NULL;
++#endif
++  char *domain;
++  char domain_copy[BUFSIZ], buffer[BUFSIZ];
++
++  /* we need to take a copy of domain, because strtok() modifies
++   * it in place. Bad.
++   */
++  if (strlen (src_domain) >= sizeof (domain_copy))
++    {
++      return PAM_SYSTEM_ERR;
++    }
++  memset (domain_copy, '\0', sizeof (domain_copy));
++  memset (buffer, '\0', sizeof (buffer));
++  strcpy (domain_copy, src_domain);
++
++  domain = domain_copy;
++
++#ifndef HAVE_STRTOK_R
++  while ((p = strtok (domain, ".")))
++#else
++  while ((p = strtok_r (domain, ".", &st)))
++#endif
++    {
++      len = strlen (p);
++
++      if (strlen (buffer) + DC_ATTR_AVA_LEN + len + 1 >= sizeof (buffer))
++	{
++	  return PAM_SYSTEM_ERR;
++	}
++
++      if (domain == NULL)
++	{
++	  strcat (buffer, ",");
++	}
++      else
++	{
++	  domain = NULL;
++	}
++
++      strcat (buffer, DC_ATTR_AVA);
++      strcat (buffer, p);
++    }
++
++  if (rval != NULL)
++    {
++      *rval = strdup (buffer);
++    }
++
++  return PAM_SUCCESS;
++}
++
++
++int
++_pam_ldap_readconfigfromdns (pam_ldap_config_t * result)
++{
++  int stat = PAM_SUCCESS;
++  struct dns_reply *r;
++  struct resource_record *rr;
++  char domain[MAXHOSTNAMELEN + 1];
++
++  /* only reinitialize variables we'll change here */
++  result->host = NULL;
++  result->base = NULL;
++  result->port = LDAP_PORT;
++#ifdef LDAP_VERSION3
++  result->version = LDAP_VERSION3;
++#else
++  result->version = LDAP_VERSION2;
++#endif /* LDAP_VERSION3 */
++
++  if ((_res.options & RES_INIT) == 0 && res_init () == -1)
++    {
++      return PAM_SYSTEM_ERR;
++    }
++
++  snprintf (domain, sizeof (domain), "_ldap._tcp.%s.", _res.defdname);
++
++  r = dns_lookup (domain, "srv");
++  if (r == NULL)
++    {
++      return PAM_SYSTEM_ERR;
++    }
++
++  /* XXX need to sort by priority */
++  for (rr = r->head; rr != NULL; rr = rr->next)
++    {
++      if (rr->type == T_SRV)
++	{
++	  if (result->host != NULL)
++	    {
++	      /* need more space */
++	      result->next = (pam_ldap_config_t *) malloc (sizeof (*result));
++	      if (result->next == NULL)
++		{
++		  dns_free_data (r);
++		  return PAM_BUF_ERR;
++		}
++	      result = result->next;
++	    }
++
++	  /* Server Host */
++	  result->host = strdup (rr->u.srv->target);
++
++	  /* Port */
++	  result->port = rr->u.srv->port;
++#ifdef LDAPS_PORT
++	  /* Hack: if the port is the registered SSL port, enable SSL. */
++	  if (result->port == LDAPS_PORT)
++	    {
++	      result->ssl_on = SSL_LDAPS;
++	    }
++#endif /* SSL */
++
++	  /* DN */
++	  stat = _pam_ldap_getdnsdn (_res.defdname, &result->base);
++	  if (stat != PAM_SUCCESS)
++	    {
++	      dns_free_data (r);
++	      return stat;
++	    }
++	}
++    }
++
++  dns_free_data (r);
++  stat = PAM_SUCCESS;
++
++  return stat;
++}

Added: tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/nss_ldap/current/sources/pam_ldap-176.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-10-13 07:27:24 UTC (rev 4978)
+++ tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-10-13 09:01:11 UTC (rev 4979)
@@ -1,22 +1,18 @@
-%define nss_ldap_version 220
-%define pam_ldap_version 169
+%define nss_ldap_version 226
+%define pam_ldap_version 176
 %define db_version 4.0.14
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: %{nss_ldap_version}
-Release: 5jh
+Release: 1jh
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{nss_ldap_version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
-Source2: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz
 Source3: nss_ldap.versions
 Source4: pam_ldap.versions
 Source5: README.TLS
 Source6: version.c
 Source7: dlopen.sh
-Patch0: nss_ldap-207-db.patch
-Patch1: pam_ldap-167-dnsconfig.patch
-Patch10: db-4.0.14-disable-mutex.patch
-Patch11: db-4.0.14-libobjs.patch
+Patch0: pam_ldap-176-dnsconfig.patch
 URL: http://www.padl.com/
 License: LGPL
 Group: main
@@ -59,10 +55,9 @@
 
 
 %prep
-%setup -q -c -a 1 -a 2
+%setup -q -c -a 1
 
 pushd nss_ldap-%{nss_ldap_version}
-%patch0 -p1 -b .db
 autoreconf
 popd
 
@@ -72,7 +67,7 @@
 cp nss_ldap-%{nss_ldap_version}/snprintf.h pam_ldap-%{pam_ldap_version}/
 
 pushd pam_ldap-%{pam_ldap_version}
-%patch1 -p1 -b .dnsconfig
+%patch0 -p1 -b .dnsconfig
 autoreconf
 popd
 
@@ -95,48 +90,12 @@
 cp %{_datadir}/libtool/config.{sub,guess} nss_ldap-%{nss_ldap_version}/
 cp %{_datadir}/libtool/config.{sub,guess} pam_ldap-%{pam_ldap_version}/
 
-%patch10 -p0 -b .disable-mutex
-%patch11 -p0 -b .libobjs
-pushd db-%{db_version}/dist
-./s_config
-popd
 
-
 %build
 # We're building modules here, so make sure -fPIC is always used.
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 topdir=`pwd`/db-instroot
 
-# Build db4, which is required for attribute/objectclass mapping to work.  We
-# need to link statically to avoid a dependency on libdb, and to a lesser
-# extent to avoid weirdness if the application which loads us also links with
-# (a possibly different version of) libdb.
-pushd db-%{db_version}/dist
-./configure -C \
-	--prefix=${topdir} \
-	--enable-compat185 \
-	--disable-cxx \
-	--disable-diagnostic \
-	--disable-dump185 \
-	--disable-java \
-	--disable-posixmutexes \
-	--disable-rpc \
-	--disable-tcl \
-	--disable-shared \
-	--with-pic \
-	--with-uniquename=_nss_ldap
-%make
-make install
-popd
-
-# Use the bundled libdb from here on out.
-CPPFLAGS=-I${topdir}/include
-export CPPFLAGS
-CFLAGS="-I${topdir}/include $CFLAGS"
-export CFLAGS
-LDFLAGS=-L${topdir}/lib
-export LDFLAGS
-
 # Build pam_ldap.
 pushd pam_ldap-%{pam_ldap_version}
 %configure --libdir=/%{_lib}
@@ -160,7 +119,7 @@
 # properly at shutdown-time.
 pushd nss_ldap-%{nss_ldap_version}
 LDAPLIBS="-lldap -llber -l${libsasl} -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lk5crypto -lz"
-STATICLIBS="$LDAPLIBS -ldb"
+STATICLIBS="$LDAPLIBS"
 SHAREDLIBS=" -ldl -lresolv -lc"
 
 # This is ugly, but if libcom_err is in / and not in /usr, then we want to link
@@ -257,6 +216,10 @@
 
 
 %changelog
+* Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org> 226-1jh
+- update to nss_ldap version 226 and pam ldap version 176
+- db4 is no more needed
+
 * Mon Jun  7 2004 Nalin Dahyabhai <nalin at redhat.com> 220-1
 - update to 220, pam_ldap 169
 


From svn at tinysofa.org  Wed Oct 13 09:02:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Oct 2004 05:02:03 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4980 - tinysofa/releases/1.1/nss_ldap/current/sources
Message-ID: <20041013090203.9707334426A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-13 05:02:03 -0400 (Wed, 13 Oct 2004)
New Revision: 4980

Removed:
   tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-207-db.patch
Log:
- remove obsolete nss_ldap-207-db.patch

Deleted: tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-207-db.patch
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-207-db.patch	2004-10-13 09:01:11 UTC (rev 4979)
+++ tinysofa/releases/1.1/nss_ldap/current/sources/nss_ldap-207-db.patch	2004-10-13 09:02:03 UTC (rev 4980)
@@ -1,44 +0,0 @@
-Just use the default version of Berkeley DB.
-
---- nss_ldap-207/util.c	2003-06-04 22:12:42.000000000 -0400
-+++ nss_ldap-207/util.c	2003-06-04 22:12:37.000000000 -0400
-@@ -92,19 +92,8 @@
-  * right API!
-  */
- #if defined(RFC2307BIS) || defined(AT_OC_MAP)
--#ifdef HAVE_DB3_DB_185_H
--#include <db3/db_185.h>
--#define DN2UID_CACHE
--#elif defined(HAVE_DB_185_H)
--#include <db_185.h>
--#define DN2UID_CACHE
--#elif defined(HAVE_DB1_DB_H)
--#include <db1/db.h>
--#define DN2UID_CACHE
--#elif defined(HAVE_DB_H)
- #include <db.h>
- #define DN2UID_CACHE
--#endif /* HAVE_DB3_DB_H */
- 
- #ifdef DN2UID_CACHE
- 
---- nss_ldap-207/ldap-nss.c	2003-06-04 22:13:11.000000000 -0400
-+++ nss_ldap-207/ldap-nss.c	2003-06-04 22:13:07.000000000 -0400
-@@ -70,17 +70,7 @@
- #include "ldap-lutil.h"
- 
- #ifdef AT_OC_MAP
--#ifdef HAVE_DB3_DB_185_H
--#include <db3/db_185.h>
--#elif defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB1_DB_H)
--#include <db1/db.h>
--#elif defined(HAVE_DB_H)
- #include <db.h>
--#else
--#error Schema mapping requires the Berkeley DB library.
--#endif /* DB */
- #endif /* AT_OC_MAP */
- 
- #ifndef HAVE_SNPRINTF


From svn at tinysofa.org  Wed Oct 13 09:07:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Oct 2004 05:07:26 -0400 (EDT)
Subject: [tinysofa-svn] r4981 - tinysofa/releases/1.1/mysql/current/specs
Message-ID: <20041013090726.A7A8D34426A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-13 05:07:26 -0400 (Wed, 13 Oct 2004)
New Revision: 4981

Modified:
   tinysofa/releases/1.1/mysql/current/specs/mysql.spec
Log:
- disable initgroups hack as updated nss_ldap should work with mysql

Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.1/mysql/current/specs/mysql.spec	2004-10-13 09:02:03 UTC (rev 4980)
+++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec	2004-10-13 09:07:26 UTC (rev 4981)
@@ -90,7 +90,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch -p1 -b .fixpath
-%patch1 -p1 -b .initgroups
+#%patch1 -p1 -b .initgroups
 
 %build
 export CC="${MYSQL_BUILD_CC:-gcc}"
@@ -344,6 +344,9 @@
 %{_bindir}/mysqlmanagerc
 
 %changelog
+* Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- disable initgroups hack as updated nss_ldap should work with mysql
+
 * Tue Oct  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.21-2jh
 - use more macros
 - work around nss_ldap problem (Bug ID: #10)


From svn at tinysofa.org  Wed Oct 13 18:49:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Oct 2004 14:49:14 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4982 - in tinysofa/releases/1.1/module-init-tools/current: sources
	specs
Message-ID: <20041013184914.50BFE34426A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-13 14:49:13 -0400 (Wed, 13 Oct 2004)
New Revision: 4982

Modified:
   tinysofa/releases/1.1/module-init-tools/current/sources/kmod.crond
   tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec
Log:
- update kmod.crond


Modified: tinysofa/releases/1.1/module-init-tools/current/sources/kmod.crond
===================================================================
--- tinysofa/releases/1.1/module-init-tools/current/sources/kmod.crond	2004-10-13 09:07:26 UTC (rev 4981)
+++ tinysofa/releases/1.1/module-init-tools/current/sources/kmod.crond	2004-10-13 18:49:13 UTC (rev 4982)
@@ -1 +1,2 @@
-#!/sbin/rmmod -as
+#!/bin/sh
+/sbin/rmmod -as

Modified: tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec
===================================================================
--- tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec	2004-10-13 09:07:26 UTC (rev 4981)
+++ tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec	2004-10-13 18:49:13 UTC (rev 4982)
@@ -1,7 +1,7 @@
 Summary: The kernel module init tools.
 Name: module-init-tools
 Version: 3.0
-Release: 6ts
+Release: 7jh
 License: GPL
 Group: main
 Source: http://kernel.us.themoes.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2


From svn at tinysofa.org  Wed Oct 13 19:04:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Oct 2004 15:04:11 -0400 (EDT)
Subject: [tinysofa-svn] r4983 - contrib/1.1/mach/current/specs
Message-ID: <20041013190411.C5CE334426A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-13 15:04:11 -0400 (Wed, 13 Oct 2004)
New Revision: 4983

Modified:
   contrib/1.1/mach/current/specs/mach.spec
Log:
- install 1.1 and 2.0 configs correctly

Modified: contrib/1.1/mach/current/specs/mach.spec
===================================================================
--- contrib/1.1/mach/current/specs/mach.spec	2004-10-13 18:49:13 UTC (rev 4982)
+++ contrib/1.1/mach/current/specs/mach.spec	2004-10-13 19:04:11 UTC (rev 4983)
@@ -9,7 +9,7 @@
 URL: http://thomas.apestaart.org/projects/mach/
 Source: http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.gz
 Source1: tinysofa-1.1
-Source1: tinysofa-2.0
+Source2: tinysofa-2.0
 Patch0: mach-0.4.6-tinysofa.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -60,6 +60,7 @@
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/archives
 
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mach/dist.d
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mach/dist.d
 
 sed -i "s/'-%{default_flavor}'/'%{default_flavor}'/" \
 	$RPM_BUILD_ROOT%{_sysconfdir}/mach/conf
@@ -114,6 +115,9 @@
 
 
 %changelog
+* Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-9jh
+- install 1.1 and 2.0 configs correctly
+
 * Mon Oct  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-8jh
 - update tinysofa patch to fix various permissions errors caused by 077
   umask


From svn at tinysofa.org  Thu Oct 14 04:26:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 00:26:41 -0400 (EDT)
Subject: [tinysofa-svn] r4984 - tinysofa/releases/1.1/mysql/current/specs
Message-ID: <20041014042641.30FCD344268@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 00:26:40 -0400 (Thu, 14 Oct 2004)
New Revision: 4984

Modified:
   tinysofa/releases/1.1/mysql/current/specs/mysql.spec
Log:
- increase release number

Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.1/mysql/current/specs/mysql.spec	2004-10-13 19:04:11 UTC (rev 4983)
+++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec	2004-10-14 04:26:40 UTC (rev 4984)
@@ -2,7 +2,7 @@
 Name: mysql
 Group: main
 Version: 4.0.21
-Release: 2jh
+Release: 3jh
 License: GPL / LGPL
 %define shared_libversion	12:0:0
 %define mysqld_user		mysql
@@ -344,7 +344,7 @@
 %{_bindir}/mysqlmanagerc
 
 %changelog
-* Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org>
+* Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.21-3jh
 - disable initgroups hack as updated nss_ldap should work with mysql
 
 * Tue Oct  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.21-2jh


From svn at tinysofa.org  Thu Oct 14 16:51:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 12:51:18 -0400 (EDT)
Subject: [tinysofa-svn] r4985 - tinysofa/releases/1.1/vsftpd/current/specs
Message-ID: <20041014165118.9B6A6344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 12:51:17 -0400 (Thu, 14 Oct 2004)
New Revision: 4985

Modified:
   tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec
Log:
- remove nonexistent vsftpd.xinetd from %doc

Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec
===================================================================
--- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec	2004-10-14 04:26:40 UTC (rev 4984)
+++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec	2004-10-14 16:51:17 UTC (rev 4985)
@@ -103,7 +103,7 @@
 %files
 %defattr(-,root,root)
 %doc FAQ BUGS AUDIT Changelog LICENSE README README.security 
-%doc REWARD SPEED TODO SECURITY/ TUNING SIZE vsftpd.xinetd
+%doc REWARD SPEED TODO SECURITY/ TUNING SIZE
 %doc EXAMPLE/
 %{_sbindir}/vsftpd
 %{_initrddir}/vsftpd


From svn at tinysofa.org  Thu Oct 14 17:49:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 13:49:35 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4986 - in tinysofa/releases/1.1/gettext/current: sources specs
Message-ID: <20041014174935.AC60C344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 13:49:35 -0400 (Thu, 14 Oct 2004)
New Revision: 4986

Added:
   tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-tempfile.patch
Modified:
   tinysofa/releases/1.1/gettext/current/specs/gettext.spec
Log:
- add gettext-0.14.1-tempfile.patch (Oystein Viggen)

Added: tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-tempfile.patch
===================================================================
--- tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-tempfile.patch	2004-10-14 16:51:17 UTC (rev 4985)
+++ tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-tempfile.patch	2004-10-14 17:49:35 UTC (rev 4986)
@@ -0,0 +1,75 @@
+diff -ur gettext-0.14.1.orig/gettext-tools/misc/autopoint.in gettext-0.14.1/gettext-tools/misc/autopoint.in
+--- gettext-0.14.1.orig/gettext-tools/misc/autopoint.in	2004-01-29 20:17:27.000000000 +0100
++++ gettext-0.14.1/gettext-tools/misc/autopoint.in	2004-09-20 10:26:14.000000000 +0200
+@@ -39,14 +39,7 @@
+     */* | *\\*) ;;
+     *) # Need to look in the PATH.
+       if test "${PATH_SEPARATOR+set}" != set; then
+-        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
+-        chmod +x /tmp/conf$$.sh
+-        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
+-          PATH_SEPARATOR=';'
+-        else
+-          PATH_SEPARATOR=:
+-        fi
+-        rm -f /tmp/conf$$.sh
++        PATH_SEPARATOR=:
+       fi
+       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+       for dir in $PATH; do
+@@ -318,7 +311,15 @@
+ cvs_dir=tmpcvs$$
+ work_dir=tmpwrk$$
+ mkdir "$cvs_dir"
++if [ $? -ne 0 ]; then
++  echo "ERROR making $cvs_dir"
++  exit 1
++fi
+ mkdir "$work_dir"
++if [ $? -ne 0 ]; then
++  echo "ERROR making $work_dir"
++  exit 1
++fi
+ CVSROOT="$srcdir/$cvs_dir"
+ export CVSROOT
+ unset CVS_CLIENT_LOG
+@@ -384,8 +385,7 @@
+ # original - too great risk of version mismatch.
+ if test -z "$force"; then
+   mismatch=
+-  mismatchfile="${TMPDIR-/tmp}"/autopoint$$.diff
+-  rm -f "$mismatchfile"
++  mismatchfile="`mktemp -t autopoint.diff.XXXXXX`"
+   for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
+     func_destfile "$file"
+     if test -n "$destfile"; then
+@@ -417,6 +417,10 @@
+     # Recompute base. It was clobbered by the recursive call.
+     base=`echo "$1" | sed -e 's,/[^/]*$,,'`
+     test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
++    if [ $? -ne 0 ]; then
++      echo "ERROR making directory $base"
++      exit 1
++    fi
+   fi
+ }
+ 
+diff -ur gettext-0.14.1.orig/gettext-tools/misc/gettextize.in gettext-0.14.1/gettext-tools/misc/gettextize.in
+--- gettext-0.14.1.orig/gettext-tools/misc/gettextize.in	2004-01-20 12:30:06.000000000 +0100
++++ gettext-0.14.1/gettext-tools/misc/gettextize.in	2004-09-20 10:22:39.000000000 +0200
+@@ -39,14 +39,7 @@
+     */* | *\\*) ;;
+     *) # Need to look in the PATH.
+       if test "${PATH_SEPARATOR+set}" != set; then
+-        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
+-        chmod +x /tmp/conf$$.sh
+-        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
+-          PATH_SEPARATOR=';'
+-        else
+-          PATH_SEPARATOR=:
+-        fi
+-        rm -f /tmp/conf$$.sh
++        PATH_SEPARATOR=:
+       fi
+       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+       for dir in $PATH; do

Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec
===================================================================
--- tinysofa/releases/1.1/gettext/current/specs/gettext.spec	2004-10-14 16:51:17 UTC (rev 4985)
+++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec	2004-10-14 17:49:35 UTC (rev 4986)
@@ -1,11 +1,12 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.1
-Release: 9ts
+Release: 10jh
 License: GPL/LGPL
 Group: development
 Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz
 Patch: gettext-0.14.1-amd64-libtool.patch
+Patch1: gettext-0.14.1-tempfile.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libstdc++-devel gcc-c++ findutils autoconf automake
 Requires: libstdc++
@@ -43,12 +44,15 @@
 %prep
 %setup -q
 %patch -p1 -b .amd64-libtool
+%patch1 -p1 -b .tempfile
 
+
 %build
 %configure --without-included-gettext \
         --enable-shared --with-pic-=yes
 %make
 
+
 %install
 %makeinstall
 
@@ -69,6 +73,7 @@
 %clean
 %clean_buildroot
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 /usr/bin/*
@@ -82,7 +87,6 @@
 %attr(755,root,root) %{_libdir}/libgettextsrc*.so
 %{_libdir}/%{name}
 
-
 %files devel
 %defattr(-,root,root,755)
 %doc gettext-runtime/man/*.3.html
@@ -106,6 +110,9 @@
 
 
 %changelog
+* Mon Oct 11 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.14.1-10jh
+- add gettext-0.14.1-tempfile.patch (Oystein Viggen)
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 0.14.1-9ts
 - current (0.14.1-9jh) integrated as 0.14.1-9ts for release 1.1-U1
 


From svn at tinysofa.org  Thu Oct 14 17:50:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 13:50:50 -0400 (EDT)
Subject: [tinysofa-svn] r4987 - tinysofa/releases/1.1/lilo/current/sources
Message-ID: <20041014175050.AA9E8344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 13:50:49 -0400 (Thu, 14 Oct 2004)
New Revision: 4987

Added:
   tinysofa/releases/1.1/lilo/current/sources/lilo-22.6.tar.gz
Removed:
   tinysofa/releases/1.1/lilo/current/sources/lilo-22.3.2.tar.gz
   tinysofa/releases/1.1/lilo/current/sources/lilo-22.3.3-page.patch
   tinysofa/releases/1.1/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch
Log:
- lilo 22.6 sources

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

Deleted: tinysofa/releases/1.1/lilo/current/sources/lilo-22.3.3-page.patch
===================================================================
--- tinysofa/releases/1.1/lilo/current/sources/lilo-22.3.3-page.patch	2004-10-14 17:49:35 UTC (rev 4986)
+++ tinysofa/releases/1.1/lilo/current/sources/lilo-22.3.3-page.patch	2004-10-14 17:50:49 UTC (rev 4987)
@@ -1,20 +0,0 @@
---- lilo-22.3.3/boot.c.page	2002-04-08 00:45:34.000000000 -0300
-+++ lilo-22.3.3/boot.c	2004-04-16 21:20:08.532020594 -0300
-@@ -19,6 +19,7 @@
- #include <errno.h>
- #include <a.out.h>
- #include <sys/stat.h>
-+#include <asm/page.h>
- 
- #include "config.h"
- #include "common.h"
---- lilo-22.3.3/partition.c.page	2002-04-19 01:45:30.000000000 -0300
-+++ lilo-22.3.3/partition.c	2004-04-16 21:22:43.065215302 -0300
-@@ -23,6 +23,7 @@
- #include <linux/unistd.h>
- #include <limits.h>
- #include <linux/fs.h>
-+#include <asm/page.h>
- #include <time.h>
- #include "config.h"
- #include "lilo.h"

Deleted: tinysofa/releases/1.1/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch
===================================================================
--- tinysofa/releases/1.1/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch	2004-10-14 17:49:35 UTC (rev 4986)
+++ tinysofa/releases/1.1/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch	2004-10-14 17:50:49 UTC (rev 4987)
@@ -1,22 +0,0 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff lilo-orig/geometry.c lilo-22.5.8/geometry.c
---- lilo-orig/geometry.c	2004-02-03 20:07:37.000000000 +0100
-+++ lilo-22.5.8/geometry.c	2004-02-03 20:09:49.000000000 +0100
-@@ -93,10 +93,16 @@ struct lv_bmap {
- };
- 
- #ifndef LV_BMAP
--#define LV_BMAP				_IOWR(0xfe, 0x30, 1)
-+#ifndef _IOWR_BAD
-+#define _IOWR_BAD(a,b,c)	_IOWR(a,b,c)
-+#endif
-+#define LV_BMAP				_IOWR_BAD(0xfe, 0x30, 1)
- #endif
- #ifndef LVM_GET_IOP_VERSION
--#define LVM_GET_IOP_VERSION		_IOR(0xfe, 0x98, 1)
-+#ifndef _IOR_BAD
-+#define _IOR_BAD(a,b,c)	_IOR(a,b,c)
-+#endif
-+#define LVM_GET_IOP_VERSION		_IOR_BAD(0xfe, 0x98, 1)
- #endif
- #endif
- 

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


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


From svn at tinysofa.org  Thu Oct 14 17:51:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 13:51:53 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4988 - in tinysofa/releases/1.1/dovecot/current: sources specs
Message-ID: <20041014175153.5D63D344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 13:51:52 -0400 (Thu, 14 Oct 2004)
New Revision: 4988

Added:
   tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.11.tar.gz
Removed:
   tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.7.tar.gz
Modified:
   tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec
Log:
- update to 0.99.11

Deleted: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.7.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.11.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.11.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec
===================================================================
--- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec	2004-10-14 17:50:49 UTC (rev 4987)
+++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec	2004-10-14 17:51:52 UTC (rev 4988)
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
-Version: 0.99.10.7
-Release: 1ts
+Version: 0.99.11
+Release: 1jh
 License: GPL
 Group: extra
 Source: %{name}-%{version}.tar.gz


From svn at tinysofa.org  Thu Oct 14 17:52:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 13:52:31 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4989 - tinysofa/releases/1.1/dosfstools/current/sources
Message-ID: <20041014175231.4821D344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 13:52:30 -0400 (Thu, 14 Oct 2004)
New Revision: 4989

Added:
   tinysofa/releases/1.1/dosfstools/current/sources/dosfstools-2.8-types.patch
Log:
- add sources/dosfstools-2.8-types.patch

Added: tinysofa/releases/1.1/dosfstools/current/sources/dosfstools-2.8-types.patch
===================================================================
--- tinysofa/releases/1.1/dosfstools/current/sources/dosfstools-2.8-types.patch	2004-10-14 17:51:52 UTC (rev 4988)
+++ tinysofa/releases/1.1/dosfstools/current/sources/dosfstools-2.8-types.patch	2004-10-14 17:52:30 UTC (rev 4989)
@@ -0,0 +1,11 @@
+--- dosfstools-2.8/mkdosfs/mkdosfs.c.types	2004-10-07 14:49:46.000000000 +0300
++++ dosfstools-2.8/mkdosfs/mkdosfs.c	2004-10-07 14:50:20.000000000 +0300
+@@ -61,7 +61,7 @@
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+-#include <sys/types.h>
++#include <linux/types.h>
+ #include <unistd.h>
+ #include <time.h>
+ 


From svn at tinysofa.org  Thu Oct 14 17:54:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 13:54:28 -0400 (EDT)
Subject: [tinysofa-svn] r4990 - tinysofa/releases/1.1/release/current/specs
Message-ID: <20041014175428.DD05E344269@minbar.tinysofa.org>

Author: jh
Date: 2004-10-14 13:54:28 -0400 (Thu, 14 Oct 2004)
New Revision: 4990

Modified:
   tinysofa/releases/1.1/release/current/specs/release.spec
Log:
- update for 1.1 update 2

Modified: tinysofa/releases/1.1/release/current/specs/release.spec
===================================================================
--- tinysofa/releases/1.1/release/current/specs/release.spec	2004-10-14 17:52:30 UTC (rev 4989)
+++ tinysofa/releases/1.1/release/current/specs/release.spec	2004-10-14 17:54:28 UTC (rev 4990)
@@ -1,11 +1,11 @@
-%define release_name Rio update 1
+%define release_name Rio update 2
 %define vendor tinysofa
 %define product classic server
 
 Summary: tinysofa release file
 Name: release
 Version: 1.1
-Release: 1ts
+Release: 2jh
 Epoch: 2
 License: GPL
 Group: main
@@ -29,7 +29,7 @@
 
 __EOF__
 
-pushd $RPM_BUILD_ROOT/etc
+pushd $RPM_BUILD_ROOT/%{_sysconfdir}
 ln -s release tinysofa-release
 ln issue issue.net
 popd


From svn at tinysofa.org  Thu Oct 14 18:17:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 14 Oct 2004 14:17:15 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4991 - in contrib/1.1: . ddd ddd/current ddd/current/sources
	ddd/current/specs
Message-ID: <20041014181715.CBFE9344269@minbar.tinysofa.org>

Author: gda
Date: 2004-10-14 14:17:14 -0400 (Thu, 14 Oct 2004)
New Revision: 4991

Added:
   contrib/1.1/ddd/
   contrib/1.1/ddd/current/
   contrib/1.1/ddd/current/sources/
   contrib/1.1/ddd/current/sources/ddd-3.3.7-lang.patch
   contrib/1.1/ddd/current/sources/ddd-3.3.9.tar.gz
   contrib/1.1/ddd/current/sources/ddd.png
   contrib/1.1/ddd/current/specs/
   contrib/1.1/ddd/current/specs/ddd.spec
   contrib/1.1/ddd/pristine/
   contrib/1.1/ddd/releases/
Log:
new in contrib

Added: contrib/1.1/ddd/current/sources/ddd-3.3.7-lang.patch
===================================================================
--- contrib/1.1/ddd/current/sources/ddd-3.3.7-lang.patch	2004-10-14 17:54:28 UTC (rev 4990)
+++ contrib/1.1/ddd/current/sources/ddd-3.3.7-lang.patch	2004-10-14 18:17:14 UTC (rev 4991)
@@ -0,0 +1,11 @@
+--- ddd-3.3.7/ddd/ddd.C.orig	2003-10-08 09:57:07.000000000 +0200
++++ ddd-3.3.7/ddd/ddd.C	2003-10-08 09:57:13.000000000 +0200
+@@ -1994,7 +1994,7 @@
+ #ifdef LC_ALL
+     // Let DDD locales be controlled by the locale-specific
+     // environment variables -- especially $LANG.
+-    setlocale(LC_ALL, "");
++    setlocale(LC_ALL, "C");
+ #endif
+ 
+     // Save environment for restart.

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


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

Added: contrib/1.1/ddd/current/sources/ddd.png
===================================================================
(Binary files differ)


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

Added: contrib/1.1/ddd/current/specs/ddd.spec
===================================================================
--- contrib/1.1/ddd/current/specs/ddd.spec	2004-10-14 17:54:28 UTC (rev 4990)
+++ contrib/1.1/ddd/current/specs/ddd.spec	2004-10-14 18:17:14 UTC (rev 4991)
@@ -0,0 +1,269 @@
+%define icewm_menu 1
+#%define rpm_clean 1
+
+%define debug_package %{nil}
+
+Summary: A GUI for several command-line debuggers.
+Name: ddd
+Version: 3.3.9
+Release: 1gd
+License: GPL or BSD
+Group: contrib
+URL: http://www.gnu.org/software/ddd/
+BuildRoot: %{_tmppath}/%{name}-root
+
+Source0: http://heanet.dl.sourceforge.net/sourceforge/ddd/ddd-%{version}.tar.gz
+Source3: ddd.png
+
+Patch: ddd-3.3.7-lang.patch
+
+BuildPreReq: lesstif-devel
+BuildPreReq: libtermcap-devel
+BuildPreReq: xorg-x11-devel
+BuildPreReq: ncurses-devel
+BuildPreReq: gcc-c++
+
+Requires: lesstif
+
+%description
+The Data Display Debugger (DDD) is a popular GUI for command-line
+debuggers like GDB, DBX, JDB, WDB, XDB, the Perl debugger, and the
+Python debugger. DDD allows you to view source texts and provides an
+interactive graphical data display, in which data structures are
+displayed as graphs. You can use your mouse to dereference pointers
+or view structure contents, which are updated every time the program
+stops. DDD can debug programs written in Ada, C, C++, Chill, Fortran,
+Java, Modula, Pascal, Perl, and Python. DDD provides machine-level
+debugging; hypertext source navigation and lookup; breakpoint,
+watchpoint, backtrace, and history editors; array plots; undo and
+redo; preferences and settings editors; program execution in the
+terminal emulation window, debugging on a remote host, an on-line
+manual, extensive help on the Motif user interface, and a command-line
+interface with full editing, history and completion capabilities.
+
+%prep
+%setup -q
+%patch -p1 -b .lang
+
+%build
+%configure --with-motif-includes=/usr/X11R6/LessTif/Motif2.1/include/ \
+           --with-motif-libraries=/usr/X11R6/LessTif/Motif2.1/lib/
+make %{?_smp_mflags}
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{_bindir} 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icewm/icons
+
+%makeinstall
+rm -rf $RPM_BUILD_ROOT/%{_infodir}
+
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icewm/icons
+
+%if %{icewm_menu}
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "DDD"           ddd.png ddd
+__EOF__
+%endif
+
+
+%post
+ 
+%preun
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc doc/ddd.pdf
+%defattr(-,root,root)
+%{_bindir}/*
+%{_mandir}/*/*
+%{_datadir}/%{name}-%{version}
+%{_datadir}/icewm/icons/ddd.png
+%if %{icewm_menu} 
+%{_datadir}/icewm/programs/%{name}
+%endif
+
+
+%changelog
+* Thu Oct 14 2004 Gerald Dachs <gda at tinysofa dot org> 3.3.9-1gd
+- new in tinysofa contrib
+
+* Wed Jun 30 2004 Than Ngo <than at redhat.com> 3.3.9-1
+- update to 3.3.9
+- make ddd menu try GNOME HIG compliant (#125854)
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Apr 09 2004 Than Ngo <than at redhat.com> 3.3.8-4
+- fix gcc 3.4 build problem
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Jan 29 2004 Than Ngo <than at redhat.com> 3.3.8-2
+- rebuild in new build enviroment
+
+* Mon Nov 10 2003 Than Ngo <than at redhat.com> 3.3.8-1
+- 3.3.8
+
+* Wed Oct 08 2003 Than Ngo <than at redhat.com> 3.3.7-3
+- fixed utf-8 issue, bug #84816
+
+* Thu Aug 21 2003 Than Ngo <than at redhat.com> 3.3.7-2
+- install icon in correct place (bug #102794)
+ 
+* Fri Jun 27 2003 Than Ngo <than at redhat.com> 3.3.7-1
+- 3.3.7
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Jun  3 2003 Than Ngo <than at redhat.com> 3.3.6-1
+- 3.3.6
+
+* Mon May  5 2003 Than Ngo <than at redhat.com> 3.3.5-1.1
+- use smp_mflags
+
+* Mon May  5 2003 Than Ngo <than at redhat.com> 3.3.5-1
+- 3.3.5 (bug #89523)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Thu Jan  2 2003 Than Ngo <than at redhat.com> 3.3.1-22
+- disable debug_package
+
+* Wed Nov  6 2002 Tim Powers <timp at redhat.com> 3.3.1-20
+- rebuilt to drop old libelf dep
+- add NEWS and COPYING files to filelist
+
+* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com> 3.3.1-19
+- rebuilt with gcc-3.2 (we hope)
+
+* Wed Jul 24 2002 Than Ngo <than at redhat.com> 3.3.1-18
+- desktop file issue (bug #69381)
+
+* Sat Jul 20 2002 Than Ngo <than at redhat.com> 3.3.1-17
+- use desktop-file-install
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sat Jun 08 2002 Than Ngo <than at redhat.com> 3.3.1-15
+- PHP DBG support (bug #62180)
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Fri Mar 22 2002 Tim Powers <timp at redhat.com>
+- rebuilt against openmotif-2.2.2
+
+* Mon Mar 18 2002 Than Ngo <than at redhat.com> 3.3.1-12
+- fix broken desktop file (bug #53193)
+
+* Fri Feb 22 2002 Than Ngo <than at redhat.com> 3.3.1-11
+- clean up patch file (bug #59935)
+- rebuild in new enviroment
+
+* Thu Jan 17 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.3.1-10
+- Don't include %%{_infodir}/dir
+
+* Thu Jan 17 2002 Than Ngo <than at redhat.com> 3.3.1-9
+- fix bug #52954
+- fix to build against gcc 3
+
+* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
+- rebuild with new gcc and binutils
+
+* Thu Jul 19 2001 Than Ngo <than at redhat.com>
+- add some build requires
+- Copyright->License
+
+* Fri Jun 29 2001 Karsten Hopp <karsten at redhat.de>
+- add desktop icons (gnome-cpu.png isn't always installed)
+
+* Sun Jun 10 2001 Than Ngo <than at redhat.com>
+- buildrequires lesstif-devel
+
+* Tue May 22 2001 Tim Powers <timp at redhat.com>
+- built for the distro
+
+* Thu May 03 2001 Than Ngo <than at redhat.com>
+- update to 3.3.1, it brings a couple of minor bug fixes
+
+* Sat Feb 03 2001 Than Ngo <than at redhat.com>
+- updated to 3.3
+
+* Tue Jan 23 2001 Than Ngo <than at redhat.com>
+- updated to 3.2.98, a release candidate for DDD 3.3
+
+* Mon Dec 04 2000 Than Ngo <than at redhat.com>
+- updated to 2.3.92 (Bug #16254)
+
+* Mon Jul 24 2000 Prospector <prospector at redhat.com>
+- rebuilt
+
+* Sat Jul 22 2000 Tim Powers <timp at redhat.com>
+- fixed missing BuildPreReq
+
+* Mon Jul 17 2000 Tim Powers <timp at redhat.com>
+- added defattr
+
+* Wed Jul 12 2000 Than Ngo <than at redhat.de>
+- rebuilt
+
+* Mon Jun 12 2000 Than Ngo <than at redhat.de>
+- rebuild with openmotif-2.1.30 for 7.0
+- clean up specfile
+- FHS fixes
+
+* Mon May 8 2000 Tim Powers <timp at redhat.com>
+- updated to 3.2.1
+- use applnk 
+
+* Fri Feb 11 2000 Tim Powers <timp at redhat.com>
+- applied patch for ddd for use with lesstif 0.89 which caused the "view news"
+	etc. help items not to uncompress the news and manual properly, resulting in
+	an error message. Patch was from Andreas Zeller
+	<andreas.zeller at fmi.uni-passau.de>
+	
+* Tue Feb 01 2000 Tim Powers <timp at redhat.com>
+- bzipped sources to conserve space
+- built for 6.2
+
+* Tue Feb 01 2000 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+- includes pdf doc instead of postscript
+- upgraded to 3.2
+- changed source locations and URLs to point at the new GNU sites
+- now does a make strip
+- added GNOME desktop entry
+
+
+* Fri Jan 07 2000 Trond Eivind Glomsr?d <teg at pvv.ntnu.no>
+- removed ptrace patch
+- now installs pydb
+- upgraded to 3.1.99
+- removed lots of old log entries
+
+* Thu Aug 19 1999 Tim Powers <timp at redhat.com>
+- reapplied patch for ptrace problems with sparc
+
+* Thu Aug 19 1999 Dale Lovelace <dale at redhat.com>
+- added ddd.wmconfig
+
+* Thu Jul 1 1999 Tim Powers <timp at redhat.com>
+- added the --with-motif-includes= and --with-motif-libraries= lines
+  so that it would build
+- rebuilt package for Powertools
+
+* Sat Jun 12 1999 Jeff Johnson <jbj at redhat.com>
+- update to 3.1.5.
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package
+


From svn at tinysofa.org  Fri Oct 15 04:17:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 15 Oct 2004 00:17:25 -0400 (EDT)
Subject: [tinysofa-svn] r4993 - contrib/1.1/mach/current/specs
Message-ID: <20041015041725.CAFB734428A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-15 00:17:24 -0400 (Fri, 15 Oct 2004)
New Revision: 4993

Modified:
   contrib/1.1/mach/current/specs/mach.spec
Log:
- update tinysofa patch not to remove +x from source files

Modified: contrib/1.1/mach/current/specs/mach.spec
===================================================================
--- contrib/1.1/mach/current/specs/mach.spec	2004-10-14 20:05:01 UTC (rev 4992)
+++ contrib/1.1/mach/current/specs/mach.spec	2004-10-15 04:17:24 UTC (rev 4993)
@@ -2,7 +2,7 @@
 
 Name: mach
 Version: 0.4.6
-Release: 8jh
+Release: 10jh
 Summary: make a chroot buildsystem
 Group: contrib
 License: GPL
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Fri Oct 15 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-10jh
+- update tinysofa patch not to remove +x from source files
+
 * Wed Oct 13 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-9jh
 - install 1.1 and 2.0 configs correctly
 


From svn at tinysofa.org  Fri Oct 15 04:24:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 15 Oct 2004 00:24:08 -0400 (EDT)
Subject: [tinysofa-svn] r4994 - contrib/1.1/mach/current/sources
Message-ID: <20041015042408.B467C34428A@minbar.tinysofa.org>

Author: jh
Date: 2004-10-15 00:24:08 -0400 (Fri, 15 Oct 2004)
New Revision: 4994

Modified:
   contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch
Log:
- update the patch

Modified: contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch
===================================================================
--- contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch	2004-10-15 04:17:24 UTC (rev 4993)
+++ contrib/1.1/mach/current/sources/mach-0.4.6-tinysofa.patch	2004-10-15 04:24:08 UTC (rev 4994)
@@ -76,7 +76,7 @@
 -            command = 'cp /usr/src/rpm/SPECS/%s /tmp/%s' % (specfile, specfile)
 +            command = 'cp /usr/src/rpm/specs/%s /tmp/%s' % (specfile, specfile)
 +            self.do_chroot (command)
-+            command = 'chmod 644 /tmp/%s /usr/src/rpm/{specs,sources}/*' % specfile
++            command = 'chmod ugo+rX /tmp/%s /usr/src/rpm/{specs,sources}/*' % specfile
              self.do_chroot (command)
 +
              # copy specfile to resultdir


From svn at tinysofa.org  Fri Oct 15 12:25:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 15 Oct 2004 08:25:20 -0400 (EDT)
Subject: [tinysofa-svn] r4995 - contrib/1.1/xmms/current/specs
Message-ID: <20041015122520.B021334428C@minbar.tinysofa.org>

Author: jh
Date: 2004-10-15 08:25:19 -0400 (Fri, 15 Oct 2004)
New Revision: 4995

Modified:
   contrib/1.1/xmms/current/specs/xmms.spec
Log:
- add -L/usr/X11R6/%{_lib} to LDFLAGS


Modified: contrib/1.1/xmms/current/specs/xmms.spec
===================================================================
--- contrib/1.1/xmms/current/specs/xmms.spec	2004-10-15 04:24:08 UTC (rev 4994)
+++ contrib/1.1/xmms/current/specs/xmms.spec	2004-10-15 12:25:19 UTC (rev 4995)
@@ -96,6 +96,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
+export LDLAGS="$LDFLAGS -L/usr/X11R6/%{_lib}"
 %configure \
   --enable-kanji \
   --enable-texthack \


From svn at tinysofa.org  Fri Oct 15 17:25:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 15 Oct 2004 13:25:46 -0400 (EDT)
Subject: [tinysofa-svn] 
	r4996 - in contrib/1.1/clamassassin/current: sources specs
Message-ID: <20041015172546.0284934428C@minbar.tinysofa.org>

Author: gda
Date: 2004-10-15 13:25:46 -0400 (Fri, 15 Oct 2004)
New Revision: 4996

Removed:
   contrib/1.1/clamassassin/current/sources/clamassassin-1.2.1.tar.gz
Modified:
   contrib/1.1/clamassassin/current/specs/clamassassin.spec
Log:
new upstream

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

Modified: contrib/1.1/clamassassin/current/specs/clamassassin.spec
===================================================================
--- contrib/1.1/clamassassin/current/specs/clamassassin.spec	2004-10-15 12:25:19 UTC (rev 4995)
+++ contrib/1.1/clamassassin/current/specs/clamassassin.spec	2004-10-15 17:25:46 UTC (rev 4996)
@@ -1,6 +1,6 @@
 Summary:    clamassassin e-mail virus filter
 Name:       clamassassin
-Version:    1.2.1
+Version:    1.2.2
 Release: 1gd
 Copyright:  Based on the Berkeley License
 Group:      contrib
@@ -35,6 +35,9 @@
 %{_bindir}/clamassassin
 
 %changelog
+* Thu Sep 14 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.2-1gd
+- new upstream version
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.2.1-1gd
 - current (1.2.1-1gd) integrated as 1.2.1-1gd
 


From svn at tinysofa.org  Mon Oct 18 05:32:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 18 Oct 2004 01:32:10 -0400 (EDT)
Subject: [tinysofa-svn] r4998 - contrib/1.1/librsync/current/specs
Message-ID: <20041018053210.1A986344291@minbar.tinysofa.org>

Author: jh
Date: 2004-10-18 01:32:09 -0400 (Mon, 18 Oct 2004)
New Revision: 4998

Modified:
   contrib/1.1/librsync/current/specs/librsync.spec
Log:
- update to 0.9.7

Modified: contrib/1.1/librsync/current/specs/librsync.spec
===================================================================
--- contrib/1.1/librsync/current/specs/librsync.spec	2004-10-16 15:13:40 UTC (rev 4997)
+++ contrib/1.1/librsync/current/specs/librsync.spec	2004-10-18 05:32:09 UTC (rev 4998)
@@ -1,13 +1,12 @@
 Summary:	Rsync libraries
 Name:		librsync
-Version:	0.9.6
-Release: 3jh
+Version:	0.9.7
+Release: 1jh
 License:	LGPL
 Group: contrib
 Source:		%{name}-%{version}.tar.gz
-Patch:		librsync-0.9.6-header-order.patch
 URL:		http://www.sourceforge.net/projects/librsync
-BuildRoot:	%{_tmppath}/%{name}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	zlib-devel, bzip2-devel, popt
 
 
@@ -48,7 +47,6 @@
 
 %prep 
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -91,6 +89,9 @@
 
 
 %changelog
+* Mon Oct 18 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.9.7-1jh
+- update to 0.9.7
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.9.6-3jh
 - current (0.9.6-3jh) integrated as 0.9.6-3jh
 


From svn at tinysofa.org  Mon Oct 18 06:40:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 18 Oct 2004 02:40:32 -0400 (EDT)
Subject: [tinysofa-svn] r4999 - contrib/1.1/librsync/current/sources
Message-ID: <20041018064032.CE87034429E@minbar.tinysofa.org>

Author: jh
Date: 2004-10-18 02:40:31 -0400 (Mon, 18 Oct 2004)
New Revision: 4999

Added:
   contrib/1.1/librsync/current/sources/librsync-0.9.7.tar.gz
Removed:
   contrib/1.1/librsync/current/sources/librsync-0.9.6-header-order.patch
   contrib/1.1/librsync/current/sources/librsync-0.9.6.tar.gz
Log:
- add missing source file

Deleted: contrib/1.1/librsync/current/sources/librsync-0.9.6-header-order.patch
===================================================================
--- contrib/1.1/librsync/current/sources/librsync-0.9.6-header-order.patch	2004-10-18 05:32:09 UTC (rev 4998)
+++ contrib/1.1/librsync/current/sources/librsync-0.9.6-header-order.patch	2004-10-18 06:40:31 UTC (rev 4999)
@@ -1,12 +0,0 @@
---- librsync-0.9.6/buf.c.orig	2004-02-05 21:38:57.000000000 +0200
-+++ librsync-0.9.6/buf.c	2004-02-05 21:42:01.000000000 +0200
-@@ -40,8 +40,8 @@
-  */
- 
- 
--#include <sys/types.h>
- #include <config.h>
-+#include <sys/types.h>
- 
- #include <assert.h>
- #include <stdlib.h>

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

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


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


From svn at tinysofa.org  Mon Oct 18 12:44:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 18 Oct 2004 08:44:36 -0400 (EDT)
Subject: [tinysofa-svn] r5000 - contrib/1.1/gimp/current/specs
Message-ID: <20041018124436.750EA34429F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-18 08:44:35 -0400 (Mon, 18 Oct 2004)
New Revision: 5000

Modified:
   contrib/1.1/gimp/current/specs/gimp.spec
Log:
- own %%dir %%{_libdir}/gimp

Modified: contrib/1.1/gimp/current/specs/gimp.spec
===================================================================
--- contrib/1.1/gimp/current/specs/gimp.spec	2004-10-18 06:40:31 UTC (rev 4999)
+++ contrib/1.1/gimp/current/specs/gimp.spec	2004-10-18 12:44:35 UTC (rev 5000)
@@ -7,7 +7,7 @@
 Summary: The GNU Image Manipulation Program.
 Name: gimp
 Version: %{subver}.%{microver}
-Release: 3gd
+Release: 4jh
 Epoch: 0
 License: GPL, LGPL
 Group: contrib
@@ -240,6 +240,7 @@
 %dir %{_datadir}/gimp
 %dir %{_datadir}/gimp/%{subver}
 %dir %{_datadir}/gimp/%{subver}/tips
+%dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{subver}
 %dir %{_libdir}/gimp/%{subver}/modules
 %dir %{_libdir}/gimp/%{subver}/plug-ins
@@ -322,6 +323,9 @@
 %endif
 
 %changelog
+* Mon Oct 18 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.5-4jh
+- own %%dir %%{_libdir}/gimp
+
 * Tue Oct 12 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.5-3gd
 - fixed permissions 
 


From svn at tinysofa.org  Mon Oct 18 15:57:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 18 Oct 2004 11:57:21 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5001 - in tinysofa/releases/1.1/httpd/current: sources specs
Message-ID: <20041018155721.DBB9534429F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-18 11:57:21 -0400 (Mon, 18 Oct 2004)
New Revision: 5001

Added:
   tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch
Modified:
   tinysofa/releases/1.1/httpd/current/specs/httpd.spec
Log:
- fix CAN-2004-0885

Added: tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch
===================================================================
--- tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch	2004-10-18 12:44:35 UTC (rev 5000)
+++ tinysofa/releases/1.1/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch	2004-10-18 15:57:21 UTC (rev 5001)
@@ -0,0 +1,48 @@
+
+Add fix for CAN-2004-0885, SSLCipherSuite bypass.  
+
+Upstream-2.0: pending
+Upstream-HEAD: committed
+Upstream-Status: mod_ssl fix for CAN-2004-0885
+
+--- httpd-2.0.52/modules/ssl/ssl_engine_kernel.c.can0885
++++ httpd-2.0.52/modules/ssl/ssl_engine_kernel.c
+@@ -719,6 +719,21 @@
+                 X509_free(peercert);
+             }
+         }
++        
++        /*
++         * Also check that SSLCipherSuite has been enforced as expected.
++         */
++        if (cipher_list) {
++            cipher = SSL_get_current_cipher(ssl);
++            if (sk_SSL_CIPHER_find(cipher_list, cipher) < 0) {
++                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                             "SSL cipher suite not renegotiated: "
++                             "access to %s denied using cipher %s",
++                              r->filename,
++                              SSL_CIPHER_get_name(cipher));
++                return HTTP_FORBIDDEN;
++            }
++        }
+     }
+ 
+     /*
+--- httpd-2.0.52/modules/ssl/ssl_engine_init.c.can0885
++++ httpd-2.0.52/modules/ssl/ssl_engine_init.c
+@@ -439,6 +439,14 @@
+      * Configure additional context ingredients
+      */
+     SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
++
++#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
++    /* 
++     * Disallow a session from being resumed during a renegotiation,
++     * so that an acceptable cipher suite can be negotiated.
++     */
++    SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
++#endif
+ }
+ 
+ static void ssl_init_ctx_session_cache(server_rec *s,

Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec
===================================================================
--- tinysofa/releases/1.1/httpd/current/specs/httpd.spec	2004-10-18 12:44:35 UTC (rev 5000)
+++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec	2004-10-18 15:57:21 UTC (rev 5001)
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.0.50
-Release: 4jh
+Release: 5jh
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html.tinysofa
@@ -75,6 +75,7 @@
 Patch102: http://www.apache.org/dist/httpd/patches/apply_to_2.0.50/CAN-2004-0751.patch
 Patch103: http://www.apache.org/dist/httpd/patches/apply_to_2.0.50/CAN-2004-0786.patch
 Patch104: http://www.apache.org/dist/httpd/patches/apply_to_2.0.50/CAN-2004-0809.patch
+Patch105: httpd-2.0.52-CAN-2004-0885.patch
 
 License: Apache Software License
 Group: main
@@ -196,6 +197,7 @@
 %patch102 -p1
 %patch103 -p1
 %patch104 -p1
+%patch105 -p1
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
@@ -590,6 +592,9 @@
 %{_mandir}/man8/suexec.8*
 
 %changelog
+* Mon Oct 18 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.50-5jh
+- fix CAN-2004-0885
+
 * Thu Sep 16 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.50-4jh
 - CAN-2004-0747, CAN-2004-0748, CAN-2004-0751, CAN-2004-0786 and CAN-2004-0809
   fixes


From svn at tinysofa.org  Mon Oct 18 17:40:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 18 Oct 2004 13:40:35 -0400 (EDT)
Subject: [tinysofa-svn] r5002 - contrib/1.1/clamassassin/current/sources
Message-ID: <20041018174035.5B28B34429F@minbar.tinysofa.org>

Author: gda
Date: 2004-10-18 13:40:34 -0400 (Mon, 18 Oct 2004)
New Revision: 5002

Added:
   contrib/1.1/clamassassin/current/sources/clamassassin-1.2.2.tar.gz
Log:
was missing something

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


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


From svn at tinysofa.org  Tue Oct 19 07:57:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Oct 2004 03:57:33 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5003 - in tinysofa/releases/1.1/gdb/current: sources specs
Message-ID: <20041019075733.B1C953442AA@minbar.tinysofa.org>

Author: jh
Date: 2004-10-19 03:57:32 -0400 (Tue, 19 Oct 2004)
New Revision: 5003

Added:
   tinysofa/releases/1.1/gdb/current/sources/gdb-6.2.1.tar.bz2
Removed:
   tinysofa/releases/1.1/gdb/current/sources/gdb-6.0.tar.bz2
Modified:
   tinysofa/releases/1.1/gdb/current/specs/gdb.spec
Log:
- 6.2.1
- fix configure call


Deleted: tinysofa/releases/1.1/gdb/current/sources/gdb-6.0.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/gdb/current/sources/gdb-6.2.1.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/gdb/current/sources/gdb-6.2.1.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec
===================================================================
--- tinysofa/releases/1.1/gdb/current/specs/gdb.spec	2004-10-18 17:40:34 UTC (rev 5002)
+++ tinysofa/releases/1.1/gdb/current/specs/gdb.spec	2004-10-19 07:57:32 UTC (rev 5003)
@@ -1,7 +1,7 @@
-Summary: GNU Debugger
+Summary: A GNU source-level debugger for C, C++ and other languages.
 Name: gdb
-Version: 6.0
-Release: 3ts
+Version: 6.2.1
+Release: 1jh
 License: GPL
 Group: development
 Source0: ftp://ftp.gnu.org/gdb/gdb/gdb-%{version}/gdb-%{version}.tar.bz2
@@ -10,22 +10,37 @@
 BuildRequires: ncurses-devel glibc-devel gcc make gzip gettext
 
 %description
-The gdb package contains the GNU Debugger.
+GDB, the GNU debugger, allows you to debug programs written in C, C++,
+and other languages, by executing them in a controlled fashion and
+printing their data.
 
+
 %prep
 %setup -q
 
+
 %build
-%configure \
-	--with-separate-debug-dir=/usr/lib/debug
+CFLAGS="$RPM_OPT_FLAGS" \
+./configure \
+	--prefix=%{_prefix} \
+	--sysconfdir=%{_sysconfdir} \
+	--bindir=%{_bindir} \
+	--mandir=%{_mandir} \
+	--infodir=%{_infodir} \
+	--with-separate-debug-dir=/usr/lib/debug \
+	%{_target_platform}
+
 %make
 
+
 %install
 %makeinstall
 
 %nuke_info
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib{bfd*,opcodes*,iberty*,mmalloc*}
+rm -rf $RPM_BUILD_ROOT/%{_includedir}
 
+
 %clean
 %clean_buildroot
 
@@ -33,11 +48,16 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/gdb
-%{_mandir}/man1/gdb.1*
+%{_bindir}/gdbtui
+%{_mandir}/man1/gdb*.1*
 %exclude /usr/share/locale
 
 
 %changelog
+* Tue Oct 19 2004 Jaakko Heinonen <jh at tinysofa dot org> 6.2.1-1jh
+- 6.2.1
+- fix configure call
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 6.0-3ts
 - current (6.0-3jh) integrated as 6.0-3ts for release 1.1
 


From svn at tinysofa.org  Tue Oct 19 15:15:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Oct 2004 11:15:00 -0400 (EDT)
Subject: [tinysofa-svn] r5004 - tinysofa/releases/1.1/dhcp/current/specs
Message-ID: <20041019151500.F422E3442AD@minbar.tinysofa.org>

Author: jh
Date: 2004-10-19 11:14:59 -0400 (Tue, 19 Oct 2004)
New Revision: 5004

Modified:
   tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec
Log:
- add epoch to requirements

Modified: tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec
===================================================================
--- tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec	2004-10-19 07:57:32 UTC (rev 5003)
+++ tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec	2004-10-19 15:14:59 UTC (rev 5004)
@@ -2,7 +2,7 @@
 Name: dhcp
 Epoch: 1
 Version: 3.0.1
-Release: 1ts
+Release: 2jh
 License: distributable
 Group: main
 URL: http://isc.org/products/DHCP/
@@ -57,7 +57,7 @@
 %package client
 Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client
 Group: main
-Requires: dhcp-common = %{version}
+Requires: dhcp-common = %{epoch}:%{version}
 
 %description client
 DHCP client is the Internet Software Consortium (ISC) DHCP client for various
@@ -71,7 +71,7 @@
 %package server
 Summary:        The ISC DHCP (Dynamic Host Configuration Protocol) server
 Group: extra
-Requires:       dhcp-common = %version
+Requires:       dhcp-common = %{epoch}:%{version}
 %service_requires
 Obsoletes:      dhcp
 
@@ -86,7 +86,7 @@
 %package devel
 Summary:        Development headers and libraries for the dhcpctl API 
 Group: development
-Requires:       dhcp-common = %version
+Requires:       dhcp-common = %{epoch}:%{version}
 
 %description devel
 DHCP devel contains all of the libraries and headers for developing with th
@@ -232,6 +232,9 @@
 
 
 %changelog
+* Tue Oct 19 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.1-2jh
+- add epoch to requirements
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 3.0.1-1ts
 - current (3.0.1-1jh) integrated as 3.0.1-1ts for release 1.1-U1
 


From svn at tinysofa.org  Tue Oct 19 19:05:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Oct 2004 15:05:46 -0400 (EDT)
Subject: [tinysofa-svn] r5005 - contrib/1.1/librsync/current/specs
Message-ID: <20041019190546.E00873442B0@minbar.tinysofa.org>

Author: jh
Date: 2004-10-19 15:05:45 -0400 (Tue, 19 Oct 2004)
New Revision: 5005

Modified:
   contrib/1.1/librsync/current/specs/librsync.spec
Log:
- BuildRequires: gcc-c++

Modified: contrib/1.1/librsync/current/specs/librsync.spec
===================================================================
--- contrib/1.1/librsync/current/specs/librsync.spec	2004-10-19 15:14:59 UTC (rev 5004)
+++ contrib/1.1/librsync/current/specs/librsync.spec	2004-10-19 19:05:45 UTC (rev 5005)
@@ -7,7 +7,7 @@
 Source:		%{name}-%{version}.tar.gz
 URL:		http://www.sourceforge.net/projects/librsync
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	zlib-devel, bzip2-devel, popt
+BuildRequires:	zlib-devel, bzip2-devel, popt, gcc-c++
 
 
 %description


From svn at tinysofa.org  Tue Oct 19 19:06:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Oct 2004 15:06:52 -0400 (EDT)
Subject: [tinysofa-svn] r5006 - contrib/1.1/xmms/current/sources
Message-ID: <20041019190652.E10403442B0@minbar.tinysofa.org>

Author: jh
Date: 2004-10-19 15:06:52 -0400 (Tue, 19 Oct 2004)
New Revision: 5006

Removed:
   contrib/1.1/xmms/current/sources/xmms.spec
Log:
- remove spec file from sources


Deleted: contrib/1.1/xmms/current/sources/xmms.spec
===================================================================
--- contrib/1.1/xmms/current/sources/xmms.spec	2004-10-19 19:05:45 UTC (rev 5005)
+++ contrib/1.1/xmms/current/sources/xmms.spec	2004-10-19 19:06:52 UTC (rev 5006)
@@ -1,558 +0,0 @@
-%define arts_plugin 1
-%define artsplugin_ver 0.6.0
-
-Summary: A media player for X which resembles Winamp.
-Name: xmms
-Version: 1.2.10
-Release: 6
-Epoch: 1
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.xmms.org/
-Source: http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
-Source4: arts_output-%{artsplugin_ver}.tar.gz
-Source5: xmms.req
-Source6: xmms.xpm
-Source7: xmmsskins-1.0.tar.gz
-Source8: rh_mp3.c
-Patch1: xmms-1.2.6-audio.patch
-Patch2: xmms-1.2.6-lazy.patch
-Patch3: xmms-1.2.8-default-skin.patch
-Patch4: xmms-1.2.9-nomp3.patch
-Patch5: xmms-1.2.8-arts.patch
-Patch6: xmms-1.2.8-alsalib.patch
-#Patch8: http://www3.big.or.jp/~sian/linux/products/xmms/xmms-1.2.5pre1j_20010601.diff.bz2
-Patch10: arts_output-0.6.0-buffer.patch
-Patch11: xmms-underquoted.patch
-
-Requires: gtk+ >= 1:1.2.2, unzip
-# the desktop file and redhat-menus are redundant requires really
-Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop
-Requires: redhat-menus >= 0.11
-
-BuildRequires: arts-devel >= 1.0.1 gtk+-devel esound-devel mikmod
-BuildRequires: /usr/bin/automake-1.4 /usr/bin/autoconf-2.13 libvorbis-devel
-BuildRequires: alsa-lib-devel glib2-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: x11amp0.7-1-1 x11amp xmms-esd xmms-gl xmms-mikmod xmms-gnome
-
-Conflicts: arts < 1.2.0-1.5
-
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE5}
-
-%description
-Xmms is a multimedia (Ogg Vorbis, CDs) player for the X Window System with
-an interface similar to Winamp's. Xmms supports playlists and
-streaming content and has a configurable interface.
-
-%package devel
-Summary: Static libraries and header files for Xmms plug-in development.
-Group: Development/Libraries
-Obsoletes: x11amp-devel
-Requires: %{name} = %{epoch}:%{version} gtk+-devel
-
-%description devel
-The static libraries and header files needed for building plug-ins for
-the Xmms multimedia player.
-
-%package skins
-Summary: Skins for the xmms multimedia player.
-Group: Applications/Multimedia
-Obsoletes: xmmsskins
-Requires: %{name}
-
-%description skins
-This is a collection of skins for the xmms multimedia player. The
-skins were obtained from http://www.xmms.org/skins.html .
-
-%prep
-%setup -q -a 4
-# Set default output plugin to ALSA
-%patch1 -p1 -b .audio
-# Use RTLD_LAZY, not RTLD_NOW
-%patch2 -p1 -b .lazy
-# Change the default skin
-%patch3 -p1 -b .default-skin
-# Don't build MP3 support, support bits for MP3 placeholder
-%patch4 -p1 -b .nomp3
-%if %{arts_plugin}
-# Link arts dynamically and detect its presence for choosing output plugin
-%patch5 -p1 -b .arts
-# bump up the default buffer size to avoid audio artifacts
-%patch10 -p0 -b .buffer
-%endif
-# Don't link *everything* against alsa-lib
-%patch6 -p1 -b .alsalib
-%patch11 -p1 -b .underquoted
-
-#%patch8 -p1 -b .ja
-
-%build
-%configure \
-  --enable-kanji \
-  --enable-texthack \
-%if %{arts_plugin}
-  --enable-arts-shared \
-%endif
-  --enable-ipv6
-
-make
-
-ln -snf ../libxmms/configfile.h xmms/configfile.h
-
-%if %{arts_plugin}
-export XMMS_CONFIG=`pwd`/xmms-config
-cd arts_output-%{artsplugin_ver}
-CFLAGS="$RPM_OPT_FLAGS -I.." %configure 
-make
-cd ..
-%endif
-
-gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
-     %{SOURCE8} -I. `gtk-config --cflags gtk`
-
-%install
-rm -rf %{buildroot}
-
-mkdir %{buildroot}
-make install DESTDIR=%{buildroot}
-
-%if %{arts_plugin}
-cd arts_output-%{artsplugin_ver}
-make install DESTDIR=%{buildroot}
-cd ..
-%endif
-
-install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
-
-mkdir -p %{buildroot}%{_datadir}/xmms/Skins
-pushd %{buildroot}%{_datadir}/xmms/Skins
-  tar xvfz %{SOURCE7}
-popd
-
-mkdir -pv %{buildroot}%{_datadir}/applications
-(cd $RPM_BUILD_ROOT%{_datadir}/applications && ln -sf \
-  %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop)
-
-mkdir -p %{buildroot}%{_datadir}/pixmaps/mini
-install xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps
-install xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini
-install -m 644 $RPM_SOURCE_DIR/xmms.xpm %{buildroot}%{_datadir}/pixmaps
-
-# unpackaged files
-rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
-      %{buildroot}/%{_libdir}/libxmms.la \
-      %{buildroot}/%{_libdir}/xmms/*/*.la \
-      %{buildroot}/%{_mandir}/man1/gnomexmms*
-
-%find_lang %{name}
-
-%post -p /sbin/ldconfig  
-
-%postun -p /sbin/ldconfig 
-
-%clean
-rm -rf %{buildroot}
-
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS TODO README 
-%{_bindir}/xmms
-%{_bindir}/wmxmms
-%{_libdir}/libxmms.so.1*
-%dir %{_libdir}/xmms
-%{_libdir}/xmms/Effect
-%{_libdir}/xmms/General
-%{_libdir}/xmms/Input
-%{_libdir}/xmms/Output
-%{_libdir}/xmms/Visualization
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/xmms.xpm
-%{_datadir}/pixmaps/xmms_logo.xpm
-%{_datadir}/pixmaps/mini/xmms_mini.xpm
-%dir %{_datadir}/xmms
-%{_datadir}/xmms/*.xpm
-%{_mandir}/man1/[wx]*
-
-%files devel
-%defattr(-,root,root)
-%{_includedir}/xmms
-%{_bindir}/xmms-config
-%{_datadir}/aclocal/xmms.m4
-%{_libdir}/lib*.a
-%{_libdir}/lib*.so
-
-%files skins
-%defattr(-,root,root)
-%{_datadir}/xmms/Skins
-
-%changelog
-* Sun Aug 15 2004 Tim Waugh <twaugh at redhat.com> 1:1.2.10-6
-- Fixed another underquoted m4 definition.
-
-* Thu Jul 15 2004 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
-- Fixed warnings in shipped m4 file.
-
-* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon May 31 2004 Warren Togami <wtogami at redhat.com> 1:1.2.10-3.p
-- #124701 -devel req gtk+-devel
-
-* Thu Mar 11 2004 Bill Nottingham <notting at redhat.com> 1:1.2.10-2.p
-- update to 1.2.10
-- fix buildreqs (#114857)
-- switch default output plugin to ALSA
-
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon Feb 23 2004 Than Ngo <than at redhat.com> 1:1.2.9-5.p
-- enable arts plugin, it should work with arts-1.2.0-1.5 or newer.
-
-* Sat Feb 14 2004 Than Ngo <than at redhat.com> 1:1.2.9-4.p
-- disable xmms-1.2.8-arts.patch
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed Jan 28 2004 Bill Nottingham <notting at redhat.com> 1:1.2.9-2.p
-- enable ipv6 (#105774)
-
-* Wed Jan 28 2004 Bill Nottingham <notting at redhat.com> 1:1.2.9-1.p
-- update to 1.2.9
-
-* Fri Dec 12 2003 Bill Nottingham <notting at redhat.com> 1:1.2.8-4.p
-- rebuild, pick up alsa plugin
-
-* Wed Oct 22 2003 Bill Nottingham <notting at redhat.com> 1:1.2.8-3.p
-- fix dependency blacklisting (corollary of #100917)
-
-* Mon Oct 13 2003 Than Ngo <than at redhat.com> 1:1.2.8-2.p
-- workaround to fix arts crash
-
-* Mon Sep  8 2003 Bill Nottingham <notting at redhat.com> 1:1.2.8-1.p
-- update to 1.2.8
-- clean out now-upstream stuff (Welsh po file, other patches)
-- switch to H?vard's arts plugin, tweak it's default buffer size
-- don't explicitly require trademarked skin name (#84554)
-
-* Mon Jun 30 2003 Bill Nottingham <notting at redhat.com> 1:1.2.7-23.p
-- add welsh po file (#98244)
-
-* Sun Jun  8 2003 Tim Powers <timp at redhat.com> 1:1.2.7-22.1.p
-- built for RHEL
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Tue Jun  3 2003 Jeff Johnson <jbj at redhat.com>
-- add explicit epoch's where needed.
-
-* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Feb 21 2003 Havoc Pennington <hp at redhat.com> 1:1.2.7-20.p
-- patch to fix session management which may prevent gnome-session hangs
-
-* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 1.2.7-19.p
-- rename zz_mp3 to rh_mp3
-- fix rh_mp3 taking precedence over other plugins (#81002)
-- nuke .la files (#68341)
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan 14 2003 Owen Taylor <otaylor at redhat.com> 1.2.7-17.p
-- Add patch from havardk at netcom.no to fix problem with file browser not 
-  updating in CDROM directories (#65173)
-
-* Tue Nov 12 2002 Bill Nottingham <notting at redhat.com> 1.2.7-16.p
-- rebuild on more arches
-
-* Wed Oct  2 2002 Bill Nottingham <notting at redhat.com> 1.2.7-15.p
-- fix zz_mp3 plugin, tweak some buildprereqs
-
-* Tue Oct  1 2002 Bill Nottingham <notting at redhat.com> 1.2.7-14.p
-- fix arts config code (#72440, #74708, #74717)
-- fix selection of 'no skin' (#73799)
-
-* Mon Sep  2 2002 Bill Nottingham <notting at redhat.com> 1.2.7-13.p
-- placeholder mp3 plugin
-
-* Thu Aug 22 2002 Bill Nottingham <notting at redhat.com> 1.2.7-12.p
-- absolute symlinks
-
-* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 1.2.7-11.p
-- add mikmod buildprereq to insure plugin actually gets built (#70088)
-
-* Tue Aug 20 2002 Bill Nottingham <notting at redhat.com> 1.2.7-10.p
-- take out mpg123 plugin
-
-* Sat Aug 10 2002 Than Ngo <than at redhat.com> 1.2.7-10
-- Fix to use Bluecurve
-
-* Sat Aug  3 2002 Havoc Pennington <hp at redhat.com>
-- add a patch to default to redhat-artwork skin
-
-* Wed Jul 31 2002 Havoc Pennington <hp at redhat.com> 1.2.7-8
-- use override desktop file from redhat-menus so we can translate it
-- desktop file is not a config file
-
-* Tue Jul 30 2002 Bill Nottingham <notting at redhat.com> 1.2.7-7
-- desktop file tweaks (#69549)
-
-* Thu Jul 25 2002 Bill Nottingham <notting at redhat.com> 1.2.7-6
-- desktop file tweaks (#69549)
-
-* Fri Jul 18 2002 Bill Nottingham <notting at redhat.com> 1.2.7-5
-- build against current libvorbis
-
-* Wed Jun 27 2002 Karsten Hopp <karsten at redhat.de> 1.2.7-4
-- fix buildprereq (arts-devel instead of kdelibs-sound-devel)
-- added patch to avoid dynamic linkage against libarts (static libarts is no 
-  longer available), use dlopen instead
-
-* Sun May 26 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Thu May 16 2002 Bill Nottingham <notting at redhat.com> 1.2.7-2
-- kill -gnome subpackage
-
-* Mon Mar  4 2002 Bill Nottingham <notting at redhat.com> 1.2.7-1
-- update to 1.2.7
-
-* Tue Feb 26 2002 Bill Nottingham <notting at redhat.com> 1.2.6-2
-- don't strip libs
-
-* Tue Jan 15 2002 Bill Nottingham <notting at redhat.com> 1.2.6-0.7
-- update to 1.2.6
-
-* Tue Sep  4 2001 Bill Nottingham <notting at redhat.com>
-- ship man pages (#53095)
-
-* Mon Aug 20 2001 Bill Nottingham <notting at redhat.com>
-- add patch to fix vorbis on big-endian machines (<havardk at xmms.org>)
-- fix double ownership of files that made xmms-skins irrelevant (#51581)
-
-* Mon Jul 23 2001 Bill Nottingham <notting at redhat.com>
-- buildrequire gnome-libs-devel (#44849)
-
-* Tue Jul 17 2001 Bill Nottingham <notting at redhat.com>
-- own %%{_datadir}/xmms
-- take out the realtime patch for now
-- remove other obsoleted patches
-
-* Tue Jul 17 2001 Preston Brown <pbrown at redhat.com>
-- add audio/mpegurl to list of acceptable MimeTypes
-
-* Tue Jun 26 2001 Florian La Roche <Florian.LaRoche at redhat.de>
-- change filelist to include link from lib major version number
-
-* Wed Jun 20 2001 Preston Brown <pbrown at redhat.com>
-- 1.2.5
-- italian i18n patch disabled until a newer one available
-- japanese patch disabled until there is one available for 1.2.5
-- add OGG mimetype to .desktop file
-
-* Wed Jun  6 2001 Bill Nottingham <notting at redhat.com>
-- make it build
-
-* Mon May 21 2001 Tim Powers <timp at redhat.com>
-- added skins subpackage
- 
-* Mon May 14 2001 Bill Nottingham <notting at redhat.com>
-- remove extraneous printf in tmpdir patch
-- add prototype for mpg123_munge_sample in downsample_vis patch
-
-* Thu Apr 11 2001 Bill Nottingham <notting at redhat.com>
-- rebuild to fix dependencies on ia64
-
-* Tue Mar 20 2001 Bill Nottingham <notting at redhat.com>
-- remove a couple of patches that are no longer needed (<havardk at xmms.org>)
-
-* Tue Mar 20 2001 Harald Hoyer <harald at redhat.de>
-- added euro patch to fix font loading
-
-* Tue Mar 13 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Fix arts plugin installation
-
-* Mon Mar 05 2001 Owen Taylor <otaylor at redhat.com>
-- Rebuild for GTK+-1.2.9 include dirs
-
-* Thu Mar  1 2001 Bill Nottingham <notting at redhat.com>
-- fix arts pluging build to be self hosting (#30049)
-
-* Thu Feb 22 2001 Bill Nottingham <notting at redhat.com>
-- add recommended bugfixes from the XMMS team (<havardk at xmms.org>)
-
-* Thu Feb  8 2001 Bill Nottingham <notting at redhat.com>
-- fix tmpdir patch & skin saving (#26494)
-
-* Thu Feb  1 2001 Bill Nottingham <notting at redhat.com>
-- hack to fix visualization scope when downsampling (#19642)
-- install xmms.xpm and fix icon entry in desktop,
-  add some #include fixes (#20944, <tothwolf at concentric.net>)
-- make realtime not make xmms perform *worse* (#23951)
-
-* Thu Jan 18 2001 Bill Nottingham <notting at redhat.com>
-- don't segfault on skin change (#24284)
-
-* Mon Jan  8 2001 Bill Nottingham <notting at redhat.com>
-- kill separate kde package
-
-* Mon Jan  8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Add arts backend (new kde subpackage)
-- Add a hack to determine whether arts, esd or oss should be used
-- Fix requires
-- Mark locale files
-
-* Tue Jan  2 2001 Bill Nottingham <notting at redhat.com>
-- clean up japanese support patch some
-- don't enable transparenthack; it's broken
-- fix possible temp race
-
-* Mon Dec 25 2000 Yukihiro Nakai <ynakai at redhat.com>
-- Add Japanese resources.
-
-* Tue Nov 28 2000 Bill Nottingham <notting at redhat.com>
-- update to 1.2.4
-
-* Mon Nov 13 2000 Bill Nottingham <notting at redhat.com>
-- fix some compiler warnings (#20135)
-- add Ogg Vorbis plugin
-
-* Mon Oct 30 2000 Preston Brown <pbrown at redhat.com>
-- even better .desktop file handling streaming MP3 types
-
-* Mon Oct 16 2000 Bill Nottingham <notting at redhat.com>
-- um, if we're going to ship a japanese translation, we should probably
-  ship the .mo files
-- add a patch for small files from Thomas Woller
-- add alpha patches (#19141)
-
-* Fri Oct 13 2000 Preston Brown <pbrown at redhat.com>
-- improved .desktop file
-- 1.2.3
-
-* Thu Aug 31 2000 Satoru Sato <ssato at redhat.com>
-- fix SPEC
-
-* Wed Aug 30 2000 Satoru Sato <ssato at redhat.com>
-- apply nls patch (by Hiroshi Takekawa <sian at big.or.jp>)
-
-* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
-- Up Epoch and release
-
-* Mon Aug  7 2000 Bill Nottingham <notting at redhat.com>
-- rebuild against new DGA
-
-* Fri Aug  4 2000 Bill Nottingham <notting at redhat.com>
-- add translation to desktop entry
-
-* Wed Jul 19 2000 Bill Nottingham <notting at redhat.com>
-- version 1.2.2
-
-* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
-- automatic rebuild
-
-* Fri Jul  7 2000 Bill Nottingham <notting at redhat.com>
-- use lazy symbol resolution in the plugin loader
-
-* Mon Jun 18 2000 Bill Nottingham <notting at redhat.com>
-- 1.2.1
-
-* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
-- some fixes to the .desktop entry
-
-* Mon Jun 12 2000 Preston Brown <pbrown at redhat.com>
-- 1.2.0
-- use rpm macros
-- fix gnomexmms buildroot breakage
-
-* Sun Jun 11 2000 Bill Nottingham <notting at redhat.com>
-- rebuild in new environment
-- work around some toolchain madness
-
-* Mon Mar 27 2000 Bill Nottingham <notting at redhat.com>
-- include /usr/share/xmmms/wmxmms.xpm
-
-* Tue Feb 22 2000 Bill Nottingham <notting at redhat.com>
-- use /usr prefix to be consistent with xmms.org (why not?)
-- find something more appropriate than the disk writer to use
-  as output plugin if configured one doesn't exist
-
-* Wed Feb 16 2000 Matt Wilson <msw at redhat.com>
-- include /usr/X11R6/bin/wmxmms
-
-* Thu Feb  3 2000 Bill Nottingham <notting at redhat.com>
-- some cleanups
-
-* Mon Jan 31 2000 Bill Nottingham <notting at redhat.com>
-- update to 1.0.1
-
-* Fri Jan 28 2000 Bill Nottingham <notting at redhat.com>
-- update to 1.0.0
-
-* Tue Sep 28 1999 Bill Nottingham <notting at redhat.com>
-- update to 0.9.5.1
-
-* Wed Sep 23 1999 Preston Brown <pbrown at redhat.com>
-- latest stable release (0.9.5)
-
-* Wed Sep 22 1999 Bill Nottingham <notting at redhat.com>
-- open in non-blocking mode, then reset
-- make esd the default
-
-* Mon Sep 13 1999 Bill Nottingham <notting at redhat.com>
-- fix binaries
-
-* Thu Sep  9 1999 Bill Nottingham <notting at redhat.com>
-- fix gtk+ requirements
-
-* Wed Aug 18 1999 Bill Nottingham <notting at redhat.com>
-- fix a /0 in the disk writer
-
-* Tue Jul 20 1999 Bill Nottingham <notting at redhat.com>
-- 0.9.1
-
-* Mon Jun 21 1999 Bill Nottingham <notting at redhat.com>
-- use other fallback patch
-- obsolete x11amp-devel
-
-* Fri Jun 11 1999 Matt Wilson <msw at redhat.com>
-- updated to xmms 0.9 final
-
-* Thu Apr 8 1999 The Rasterman <raster at redhat.com>
-- patched to have plugin fallback to other plugins for output if plugin fails.
-
-* Mon Mar 29 1999 Michael Maher <mike at redhat.com>
-- added desktop entry.
-
-* Mon Mar 22 1999 Michael Maher <mike at redhat.com>
-- made some changes to the spec file. 
-- has 'esd' support now.
-- stripped executables.
-
-* Mon Feb 15 1999 Michael Maher <mike at redhat.com>
-- built pacakge for 6.0
-- changed spec file, added mp3 licenses.
-
-* Mon Feb 15 1999 Ryan Weaver <ryanw at infohwy.com>
-  [x11amp-0.9-alpha3-1]
-- Updated to alpha3 see ChangLog for changes.
-
-* Wed Jan 13 1999 Ryan Weaver <ryanw at infohwy.com>
-  [x11amp-0.9-alpha2-1]
-- fixed close button in PL/EQ windows
-- fixed shuffel/randomize functions
-- removed imlib, no need for imlib anymore
-- mpg123 plugin now works on SMP machines, also reduced cpu usage
-- fixed so mainwindow will be positioned correct at startup in some windowmanagers
-- fixed the playlistwindow buttons that ended up behind the window
-- added mikmod plugin into the source tree
-- now you can configure the OSS drivers and mpg123 plugin
-- SKINSDIR variable can be used again
-- added bars as analyzer mode
-- in playlistwindow the player control buttons now work, also time window works


From svn at tinysofa.org  Wed Oct 20 04:28:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 20 Oct 2004 00:28:35 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5007 - in tinysofa/releases/1.1/glib/current: sources specs
Message-ID: <20041020042835.39DA33442C7@minbar.tinysofa.org>

Author: jh
Date: 2004-10-20 00:28:34 -0400 (Wed, 20 Oct 2004)
New Revision: 5007

Added:
   tinysofa/releases/1.1/glib/current/sources/glib-2.4.7.tar.bz2
Removed:
   tinysofa/releases/1.1/glib/current/sources/glib-2.4.6.tar.bz2
Modified:
   tinysofa/releases/1.1/glib/current/specs/glib.spec
Log:
- update to 2.4.7

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

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


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

Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec
===================================================================
--- tinysofa/releases/1.1/glib/current/specs/glib.spec	2004-10-19 19:06:52 UTC (rev 5006)
+++ tinysofa/releases/1.1/glib/current/specs/glib.spec	2004-10-20 04:28:34 UTC (rev 5007)
@@ -1,6 +1,6 @@
 Summary: A library of handy utility functions.
 Name: glib
-Version: 2.4.6
+Version: 2.4.7
 Release: 1jh
 License: LGPL
 Group: main


From svn at tinysofa.org  Wed Oct 20 18:00:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 20 Oct 2004 14:00:29 -0400 (EDT)
Subject: [tinysofa-svn] r5008 - contrib/1.1/pango/current/specs
Message-ID: <20041020180029.27C95344120@minbar.tinysofa.org>

Author: gda
Date: 2004-10-20 14:00:27 -0400 (Wed, 20 Oct 2004)
New Revision: 5008

Modified:
   contrib/1.1/pango/current/specs/pango.spec
Log:
fixed permission

Modified: contrib/1.1/pango/current/specs/pango.spec
===================================================================
--- contrib/1.1/pango/current/specs/pango.spec	2004-10-20 04:28:34 UTC (rev 5007)
+++ contrib/1.1/pango/current/specs/pango.spec	2004-10-20 18:00:27 UTC (rev 5008)
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text.
 Name: pango
 Version: 1.4.0
-Release: 5jh
+Release: 6gd
 License: LGPL
 Group: contrib
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
@@ -161,6 +161,8 @@
    ;;
 esac
 
+chmod 644 %{_sysconfdir}/pango/$host/pango.modules
+
 %postun -p /sbin/ldconfig
 
 %files -f modules.files
@@ -185,6 +187,9 @@
 
 
 %changelog
+* Wed Oct 20 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.0-6gd
+- really changed permission for pango.modules
+
 * Thu Oct  7 2004 Gerald Dachs <gda at tinysofa dot org> 1.4.0-4gd
 - changed permission for pango.modules and dir
 


From svn at tinysofa.org  Wed Oct 20 18:14:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 20 Oct 2004 14:14:36 -0400 (EDT)
Subject: [tinysofa-svn] r5009 - in contrib/1.1: . perl-parse-syslog
	perl-parse-syslog/current perl-parse-syslog/current/sources
	perl-parse-syslog/current/specs
Message-ID: <20041020181436.4CBF5344120@minbar.tinysofa.org>

Author: gda
Date: 2004-10-20 14:14:35 -0400 (Wed, 20 Oct 2004)
New Revision: 5009

Added:
   contrib/1.1/perl-parse-syslog/
   contrib/1.1/perl-parse-syslog/current/
   contrib/1.1/perl-parse-syslog/current/sources/
   contrib/1.1/perl-parse-syslog/current/sources/Parse-Syslog-1.03.tar.gz
   contrib/1.1/perl-parse-syslog/current/specs/
   contrib/1.1/perl-parse-syslog/current/specs/perl-parse-syslog.spec
   contrib/1.1/perl-parse-syslog/pristine/
   contrib/1.1/perl-parse-syslog/releases/
Log:
spamassassin-tools needs it

Added: contrib/1.1/perl-parse-syslog/current/sources/Parse-Syslog-1.03.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-parse-syslog/current/sources/Parse-Syslog-1.03.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/perl-parse-syslog/current/specs/perl-parse-syslog.spec
===================================================================
--- contrib/1.1/perl-parse-syslog/current/specs/perl-parse-syslog.spec	2004-10-20 18:00:27 UTC (rev 5008)
+++ contrib/1.1/perl-parse-syslog/current/specs/perl-parse-syslog.spec	2004-10-20 18:14:35 UTC (rev 5009)
@@ -0,0 +1,52 @@
+%define perlname Parse-Syslog
+
+Summary:The Perl module Parse-Syslog.
+Name: perl-parse-syslog
+Version: 1.03
+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 Parse-Syslog.
+
+%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 README
+
+
+%changelog
+* Wed Oct 20 2004 Gerald Dachs <gda at tinysofa dot org> 1.03-1gd
+- fresh build
+


From svn at tinysofa.org  Wed Oct 20 18:34:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 20 Oct 2004 14:34:24 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5010 - in contrib/1.1: . perl-date-manip perl-date-manip/current
	perl-date-manip/current/sources perl-date-manip/current/specs
Message-ID: <20041020183424.AC410344120@minbar.tinysofa.org>

Author: gda
Date: 2004-10-20 14:34:24 -0400 (Wed, 20 Oct 2004)
New Revision: 5010

Added:
   contrib/1.1/perl-date-manip/
   contrib/1.1/perl-date-manip/current/
   contrib/1.1/perl-date-manip/current/sources/
   contrib/1.1/perl-date-manip/current/sources/DateManip-5.42a.tar.gz
   contrib/1.1/perl-date-manip/current/specs/
   contrib/1.1/perl-date-manip/current/specs/perl-date-manip.spec
   contrib/1.1/perl-date-manip/pristine/
   contrib/1.1/perl-date-manip/releases/
Log:
spamassassin-tools needs it

Added: contrib/1.1/perl-date-manip/current/sources/DateManip-5.42a.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-date-manip/current/sources/DateManip-5.42a.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/perl-date-manip/current/specs/perl-date-manip.spec
===================================================================
--- contrib/1.1/perl-date-manip/current/specs/perl-date-manip.spec	2004-10-20 18:14:35 UTC (rev 5009)
+++ contrib/1.1/perl-date-manip/current/specs/perl-date-manip.spec	2004-10-20 18:34:24 UTC (rev 5010)
@@ -0,0 +1,51 @@
+%define perlname DateManip
+
+Summary:The Perl module DateManip.
+Name: perl-date-manip
+Version: 5.42a
+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 DateManip.
+
+%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 HISTORY TODO INSTALL
+
+%changelog
+* Wed Oct 20 2004 Gerald Dachs <gda at tinysofa dot org> 5.42a-1gd
+- fresh build
+


From svn at tinysofa.org  Wed Oct 20 18:44:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 20 Oct 2004 14:44:56 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5011 - in contrib/1.1: . perl-statistics-distributions
	perl-statistics-distributions/current
	perl-statistics-distributions/current/sources
	perl-statistics-distributions/current/specs
Message-ID: <20041020184456.9987B344120@minbar.tinysofa.org>

Author: gda
Date: 2004-10-20 14:44:56 -0400 (Wed, 20 Oct 2004)
New Revision: 5011

Added:
   contrib/1.1/perl-statistics-distributions/
   contrib/1.1/perl-statistics-distributions/current/
   contrib/1.1/perl-statistics-distributions/current/sources/
   contrib/1.1/perl-statistics-distributions/current/sources/Statistics-Distributions-1.02.tar.gz
   contrib/1.1/perl-statistics-distributions/current/specs/
   contrib/1.1/perl-statistics-distributions/current/specs/perl-statistics-distributions.spec
   contrib/1.1/perl-statistics-distributions/pristine/
   contrib/1.1/perl-statistics-distributions/releases/
Log:
spamassassin needs it

Added: contrib/1.1/perl-statistics-distributions/current/sources/Statistics-Distributions-1.02.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/1.1/perl-statistics-distributions/current/sources/Statistics-Distributions-1.02.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/1.1/perl-statistics-distributions/current/specs/perl-statistics-distributions.spec
===================================================================
--- contrib/1.1/perl-statistics-distributions/current/specs/perl-statistics-distributions.spec	2004-10-20 18:34:24 UTC (rev 5010)
+++ contrib/1.1/perl-statistics-distributions/current/specs/perl-statistics-distributions.spec	2004-10-20 18:44:56 UTC (rev 5011)
@@ -0,0 +1,52 @@
+%define perlname Statistics-Distributions
+
+Summary:The Perl module Statistics-Distributions.
+Name: perl-statistics-distributions
+Version: 1.02
+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 Statistics-Distributions.
+
+%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 Oct 20 2004 Gerald Dachs <gda at tinysofa dot org> 1.02-1gd
+- fresh build
+


From svn at tinysofa.org  Wed Oct 20 19:13:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 20 Oct 2004 15:13:41 -0400 (EDT)
Subject: [tinysofa-svn] r5012 - contrib/1.1/xorg-x11/current/specs
Message-ID: <20041020191341.9D7A7344120@minbar.tinysofa.org>

Author: gda
Date: 2004-10-20 15:13:41 -0400 (Wed, 20 Oct 2004)
New Revision: 5012

Modified:
   contrib/1.1/xorg-x11/current/specs/xorg-x11.spec
Log:
Cards file back in xorg-x11

Modified: contrib/1.1/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/1.1/xorg-x11/current/specs/xorg-x11.spec	2004-10-20 18:44:56 UTC (rev 5011)
+++ contrib/1.1/xorg-x11/current/specs/xorg-x11.spec	2004-10-20 19:13:41 UTC (rev 5012)
@@ -879,8 +879,6 @@
 Summary: X server configuration program
 Group: contrib
 Requires: %{name} = %{version}-%{release}
-# Removed dep on Xconfigurator and changed to the actual Cards file instead
-Requires: %{_x11datadir}/X11/Cards
 
 %description xorgcfg
 X server configuration tool
@@ -1796,8 +1794,6 @@
    # Remove example config files that we do not ship
    # FIXME: these might not be present in Xorg X11 anymore, future cleanup
    rm -f $RPM_BUILD_ROOT%{_x11datadir}/X11/XF86Config.{98,eg,indy}
-   # The Cards database is part of our "hwdata" package
-   rm -f $RPM_BUILD_ROOT%{_x11datadir}/X11/Cards
    # Remove the XftConfig file, as it isn't used anymore
    rm -f $RPM_BUILD_ROOT/etc/X11/XftConfig
    # The following are uncommented for the time being as I'm lazy.
@@ -2409,9 +2405,7 @@
 %{_x11bindir}/xwud
 
 %if %{with_Xserver}
-# Provided by the Xconfigurator package in RHL 7.x, and in the hwdata
-# currently in rawhide.
-#%{_x11datadir}/X11/Cards
+%{_x11datadir}/X11/Cards
 %{_x11datadir}/X11/Options
 #%{_x11datadir}/X11/XF86Config
 %dir %{_x11datadir}/X11/doc
@@ -3279,6 +3273,9 @@
 %clean_buildroot
 
 %changelog
+* Wed Oct 20 2004 Gerald Dachs <gda at tinysofa dot org> 6.7.0-12gd
+- put Cards file back
+
 * Thu Sep 23 2004 Jaakko Heinonen <jh at tinysofa dot org> 6.7.0-11jh
 - CAN-2004-0687-0688
 


From svn at tinysofa.org  Thu Oct 21 17:26:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 13:26:06 -0400 (EDT)
Subject: [tinysofa-svn] r5013 - tinysofa/releases/1.1/bash/current/specs
Message-ID: <20041021172606.A1AFE344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 13:26:05 -0400 (Thu, 21 Oct 2004)
New Revision: 5013

Modified:
   tinysofa/releases/1.1/bash/current/specs/bash.spec
Log:
- fix -doc permissions


Modified: tinysofa/releases/1.1/bash/current/specs/bash.spec
===================================================================
--- tinysofa/releases/1.1/bash/current/specs/bash.spec	2004-10-20 19:13:41 UTC (rev 5012)
+++ tinysofa/releases/1.1/bash/current/specs/bash.spec	2004-10-21 17:26:05 UTC (rev 5013)
@@ -239,7 +239,7 @@
 %{_mandir}/*/..1*
 
 %files doc
-%defattr(644,root,root)
+%defattr(644,root,root,755)
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 


From svn at tinysofa.org  Thu Oct 21 17:28:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 13:28:55 -0400 (EDT)
Subject: [tinysofa-svn] r5014 - in tinysofa/releases/1.1: dkms/current/specs
	lilo/current/specs man-pages/current/specs nss_ldap/current/specs
Message-ID: <20041021172855.DE08F344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 13:28:54 -0400 (Thu, 21 Oct 2004)
New Revision: 5014

Modified:
   tinysofa/releases/1.1/dkms/current/specs/dkms.spec
   tinysofa/releases/1.1/lilo/current/specs/lilo.spec
   tinysofa/releases/1.1/man-pages/current/specs/man-pages.spec
   tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
Log:
- fix documentation directory permissions


Modified: tinysofa/releases/1.1/dkms/current/specs/dkms.spec
===================================================================
--- tinysofa/releases/1.1/dkms/current/specs/dkms.spec	2004-10-21 17:26:05 UTC (rev 5013)
+++ tinysofa/releases/1.1/dkms/current/specs/dkms.spec	2004-10-21 17:28:54 UTC (rev 5014)
@@ -34,7 +34,7 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,755)
 %attr(0755,root,root) /usr/sbin/dkms
 %attr(0755,root,root) /var/dkms
 %attr(0755,root,root) /etc/init.d/dkms_autoinstaller

Modified: tinysofa/releases/1.1/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/releases/1.1/lilo/current/specs/lilo.spec	2004-10-21 17:26:05 UTC (rev 5013)
+++ tinysofa/releases/1.1/lilo/current/specs/lilo.spec	2004-10-21 17:28:54 UTC (rev 5014)
@@ -79,7 +79,7 @@
 
 
 %files
-%defattr(644,root,root)
+%defattr(644,root,root,755)
 %doc CHANGES COPYING INCOMPAT QuickInst README README.bitmaps
 %doc README.common.problems README.disk README.pseudo README.raid1
 %doc sample/lilo.raid.conf sample/lilo.sample.conf

Modified: tinysofa/releases/1.1/man-pages/current/specs/man-pages.spec
===================================================================
--- tinysofa/releases/1.1/man-pages/current/specs/man-pages.spec	2004-10-21 17:26:05 UTC (rev 5013)
+++ tinysofa/releases/1.1/man-pages/current/specs/man-pages.spec	2004-10-21 17:28:54 UTC (rev 5014)
@@ -79,7 +79,7 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root)
+%defattr(0644,root,root,755)
 %doc README man-pages-%{version}.Announce
 /usr/share/man/man*/*
 

Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec
===================================================================
--- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-10-21 17:26:05 UTC (rev 5013)
+++ tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec	2004-10-21 17:28:54 UTC (rev 5014)
@@ -199,13 +199,13 @@
 
 
 %files
-%defattr(644,root,root)
+%defattr(644,root,root,755)
 %attr(0755,root,root) /%{_lib}/libnss_ldap-*.so
 %attr(0755,root,root) %{_libdir}/*.so
 %doc nsswitch.ldap *.nss_ldap $RPM_SOURCE_DIR/README.TLS
 
 %files -n pam_ldap
-%defattr(644, root, root)
+%defattr(644, root, root,755)
 %attr(0755,root,root) /%{_lib}/security/*.so*
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 %doc *.pam_ldap pam_ldap-%{pam_ldap_version}/pam.d 


From svn at tinysofa.org  Thu Oct 21 17:31:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 13:31:35 -0400 (EDT)
Subject: [tinysofa-svn] r5015 - in contrib/1.1/clamav/current: sources specs
Message-ID: <20041021173135.63136344120@minbar.tinysofa.org>

Author: omar
Date: 2004-10-21 13:31:34 -0400 (Thu, 21 Oct 2004)
New Revision: 5015

Added:
   contrib/1.1/clamav/current/sources/clamav-0.80.tar.gz
   contrib/1.1/clamav/current/sources/clamd.conf
Removed:
   contrib/1.1/clamav/current/sources/clamav-0.75.1.tar.gz
   contrib/1.1/clamav/current/sources/clamav.conf
Modified:
   contrib/1.1/clamav/current/sources/clamd.sh
   contrib/1.1/clamav/current/sources/freshclam.conf
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
- Update to 0.80.


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

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


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

Deleted: contrib/1.1/clamav/current/sources/clamav.conf
===================================================================
--- contrib/1.1/clamav/current/sources/clamav.conf	2004-10-21 17:28:54 UTC (rev 5014)
+++ contrib/1.1/clamav/current/sources/clamav.conf	2004-10-21 17:31:34 UTC (rev 5015)
@@ -1,231 +0,0 @@
-##
-## Example config file for the Clam AV daemon
-## Please read the clamav.conf(5) manual before editing this file.
-##
- 
-
-# Comment or remove the line below.
-#Example
-
-# Uncomment this option to enable logging.
-# LogFile must be writable for the user running the daemon.
-# Full path is required.
-LogFile /var/log/clamav/clamd.log
-
-# By default the log file is locked for writing - the lock protects against
-# running clamd multiple times (if want to run another clamd, please
-# copy the configuration file, change the LogFile variable, and run
-# the daemon with --config-file option). That's why you shouldn't uncomment
-# this option.
-#LogFileUnlock
-
-# Maximal size of the log file. Default is 1 Mb.
-# Value of 0 disables the limit.
-# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
-# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
-# in bytes just don't use modifiers.
-LogFileMaxSize 0
-
-# Log time with an each message.
-LogTime
-
-# Log also clean files. May be useful in debugging but will drastically
-# increase the log size.
-#LogClean
-
-# Use system logger (can work together with LogFile).
-LogSyslog
-
-# Specify the type of syslog messages - please refer to 'man syslog'
-# for facility names. Default is LOG_LOCAL6.
-#LogFacility LOG_MAIL
-
-# Enable verbose logging.
-#LogVerbose
-
-# This option allows you to save the process identifier of the listening
-# daemon (main thread).
-PidFile /var/run/clamav/clamd.pid
-
-# Optional path to the global temporary directory.
-# Default is system specific - usually /var/tmp or /tmp.
-#TemporaryDirectory /var/tmp
-
-# Path to the database directory.
-# Default is the hardcoded directory (mostly /usr/local/share/clamav,
-# but it depends on installation options).
-DataDirectory /var/lib/clamav
- 
-# The daemon works in local or network mode. Currently the local mode is
-# recommended for security reasons.
-
-# Path to the local socket. The daemon doesn't change the mode of the
-# created file (portability reasons). You may want to create it in a directory
-# which is only accessible for a user running daemon.
-LocalSocket /var/run/clamav/clamd.sock
-
-# Remove stale socket after unclean shutdown.
-FixStaleSocket
-
-# TCP port address.
-#TCPSocket 3310
-
-# TCP address.
-# By default we bind to INADDR_ANY, probably not wise.
-# Enable the following to provide some degree of protection
-# from the outside world.
-#TCPAddr 127.0.0.1
-
-# Maximum length the queue of pending connections may grow to.
-# Default is 15.
-#MaxConnectionQueueLength 30
-
-# When activated, input stream (see STREAM command) will be saved to disk before
-# scanning - this allows scanning within archives.
-StreamSaveToDisk
-
-# Close the connection if this limit is exceeded.
-#StreamMaxLength 10M
-
-# Maximal number of a threads running at the same time.
-# Default is 5, and it should be sufficient for a typical workstation.
-# You may need to increase threads number for a server machine.
-MaxThreads 10
-
-# Thread (scanner - single task) will be stopped after this time (seconds).
-# Default is 180. Value of 0 disables the timeout. SECURITY HINT: Increase the
-# timeout instead of disabling it.
-#ThreadTimeout 500
-
-# Maximal depth the directories are scanned at.
-MaxDirectoryRecursion 15
-
-# Follow a directory symlinks.
-# SECURITY HINT: You should have enabled directory recursion limit to
-# avoid potential problems.
-#FollowDirectorySymlinks
-
-# Follow regular file symlinks.
-#FollowFileSymlinks
-
-# Do internal checks (eg. check the integrity of the database structures)
-# By default clamd checks itself every 3600 seconds (1 hour).
-#SelfCheck 600
-
-# Execute a command when virus is found. In the command string %v and %f will
-# be replaced by the virus name and the infected file name respectively.
-#
-# SECURITY WARNING: Make sure the virus event command cannot be exploited,
-#		    eg. by using some special file name when %f is used.
-#		    Always use a full path to the command.
-#		    Never delete/move files with this directive !
-#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %f: %v"
-
-# Run as selected user (clamd must be started by root).
-# By default it doesn't drop privileges.
-User amavis
-
-# Initialize the supplementary group access (for all groups in /etc/group
-# user is added in. clamd must be started by root).
-AllowSupplementaryGroups
-
-# Don't fork into background. Useful in debugging.
-#Foreground
-
-# Enable debug messages in libclamav.
-#Debug
-
-# Do not remove temporary files (for debug purposes).
-#LeaveTemporaryFiles
-
-##
-## Document scanning
-##
-
-# This option enables scanning of Microsoft Office document macros.
-ScanOLE2
-
-##
-## Mail support
-##
-
-# Uncomment this option if you are planning to scan mail files.
-ScanMail
-
-##
-## Archive support
-##
-
-
-# Comment this line to disable scanning of the archives.
-ScanArchive
-
-
-# By default the built-in RAR unpacker is disabled by default because the code
-# terribly leaks, however it's probably a good idea to enable it.
-#ScanRAR
-
-
-# Options below protect your system against Denial of Service attacks
-# with archive bombs.
-
-# Files in archives larger than this limit won't be scanned.
-# Value of 0 disables the limit.
-# WARNING: Due to the unrarlib implementation, whole files (one by one) in RAR
-#	   archives are decompressed to the memory. That's why never disable
-#	   this limit (but you may increase it of course!)
-ArchiveMaxFileSize 10M
-
-# Archives are scanned recursively - e.g. if Zip archive contains RAR file,
-# the RAR file will be decompressed, too (but only if recursion limit is set
-# at least to 1). With this option you may set the recursion level.
-# Value of 0 disables the limit.
-ArchiveMaxRecursion 5
-
-# Number of files to be scanned within archive.
-# Value of 0 disables the limit.
-ArchiveMaxFiles 1000
-
-# Mark potential archive bombs as viruses (0 disables the limit)
-ArchiveMaxCompressionRatio 200
-
-# Use slower decompression algorithm which uses less memory. This option 
-# affects bzip2 decompressor only.
-#ArchiveLimitMemoryUsage
-
-# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
-#ArchiveBlockEncrypted
-
-
-##
-## Clamuko settings
-## WARNING: This is experimental software. It is very likely it will hang
-##	    up your system !!!
-##
-
-# Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
-#ClamukoScanOnAccess
-
-# Set access mask for Clamuko.
-ClamukoScanOnOpen
-ClamukoScanOnClose
-ClamukoScanOnExec
-
-# Set the include paths (all files in them will be scanned). You can have
-# multiple ClamukoIncludePath options, but each directory must be added
-# in a seperate option. All subdirectories are scanned, too.
-ClamukoIncludePath /home
-#ClamukoIncludePath /students
-
-# Set the exclude paths. All subdirectories are also excluded.
-#ClamukoExcludePath /home/guru
-
-# Limit the file size to be scanned (probably you don't want to scan your movie
-# files ;))
-# Value of 0 disables the limit. 1 Mb should be fine.
-ClamukoMaxFileSize 1M
-
-# Enable archive support. It uses the limits from clamd section.
-# (This option doesn't depend on ScanArchive, you can have archive support
-# in clamd disabled).
-ClamukoScanArchive

Copied: contrib/1.1/clamav/current/sources/clamd.conf (from rev 5012, contrib/1.1/clamav/current/sources/clamav.conf)
===================================================================
--- contrib/1.1/clamav/current/sources/clamav.conf	2004-10-20 19:13:41 UTC (rev 5012)
+++ contrib/1.1/clamav/current/sources/clamd.conf	2004-10-21 17:31:34 UTC (rev 5015)
@@ -0,0 +1,245 @@
+##
+## Example config file for the Clam AV daemon
+## Please read the clamd.conf(5) manual before editing this file.
+##
+ 
+
+# Comment or remove the line below.
+#Example
+
+# Uncomment this option to enable logging.
+# LogFile must be writable for the user running the daemon.
+# Full path is required.
+LogFile /var/log/clamav/clamd.log
+
+# By default the log file is locked for writing - the lock protects against
+# running clamd multiple times (if want to run another clamd, please
+# copy the configuration file, change the LogFile variable, and run
+# the daemon with --config-file option). That's why you shouldn't uncomment
+# this option.
+#LogFileUnlock
+
+# Maximal size of the log file. Default is 1 Mb.
+# Value of 0 disables the limit.
+# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
+# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
+# in bytes just don't use modifiers.
+LogFileMaxSize 0
+
+# Log time with an each message.
+LogTime
+
+# Log also clean files. May be useful in debugging but will drastically
+# increase the log size.
+#LogClean
+
+# Use system logger (can work together with LogFile).
+LogSyslog
+
+# Specify the type of syslog messages - please refer to 'man syslog'
+# for facility names. Default is LOG_LOCAL6.
+#LogFacility LOG_MAIL
+
+# Enable verbose logging.
+#LogVerbose
+
+# This option allows you to save the process identifier of the listening
+# daemon (main thread).
+PidFile /var/run/clamav/clamd.pid
+
+# Optional path to the global temporary directory.
+# Default is system specific - usually /var/tmp or /tmp.
+#TemporaryDirectory /var/tmp
+
+# Path to the database directory.
+# Default is the hardcoded directory (mostly /usr/local/share/clamav,
+# but it depends on installation options).
+DataDirectory /var/lib/clamav
+ 
+# The daemon works in local or network mode. Currently the local mode is
+# recommended for security reasons.
+
+# Path to the local socket. The daemon doesn't change the mode of the
+# created file (portability reasons). You may want to create it in a directory
+# which is only accessible for a user running daemon.
+LocalSocket /var/run/clamav/clamd.sock
+
+# Remove stale socket after unclean shutdown.
+FixStaleSocket
+
+# TCP port address.
+#TCPSocket 3310
+
+# TCP address.
+# By default we bind to INADDR_ANY, probably not wise.
+# Enable the following to provide some degree of protection
+# from the outside world.
+#TCPAddr 127.0.0.1
+
+# Maximum length the queue of pending connections may grow to.
+# Default is 15.
+#MaxConnectionQueueLength 30
+
+# When activated, input stream (see STREAM command) will be saved to disk before
+# scanning - this allows scanning within archives.
+StreamSaveToDisk
+
+# Close the connection if this limit is exceeded.
+#StreamMaxLength 10M
+
+# Maximal number of a threads running at the same time.
+# Default is 5, and it should be sufficient for a typical workstation.
+# You may need to increase threads number for a server machine.
+MaxThreads 10
+
+# Thread (scanner - single task) will be stopped after this time (seconds).
+# Default is 180. Value of 0 disables the timeout. SECURITY HINT: Increase the
+# timeout instead of disabling it.
+#ThreadTimeout 500
+
+# Maximal depth the directories are scanned at.
+MaxDirectoryRecursion 15
+
+# Follow a directory symlinks.
+# SECURITY HINT: You should have enabled directory recursion limit to
+# avoid potential problems.
+#FollowDirectorySymlinks
+
+# Follow regular file symlinks.
+#FollowFileSymlinks
+
+# Do internal checks (eg. check the integrity of the database structures)
+# By default clamd checks itself every 3600 seconds (1 hour).
+#SelfCheck 600
+
+# Execute a command when virus is found. In the command string %v and %f will
+# be replaced by the virus name and the infected file name respectively.
+#
+# SECURITY WARNING: Make sure the virus event command cannot be exploited,
+#		    eg. by using some special file name when %f is used.
+#		    Always use a full path to the command.
+#		    Never delete/move files with this directive !
+#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %f: %v"
+
+# Run as selected user (clamd must be started by root).
+# By default it doesn't drop privileges.
+User amavis
+
+# Initialize the supplementary group access (for all groups in /etc/group
+# user is added in. clamd must be started by root).
+AllowSupplementaryGroups
+
+# Don't fork into background. Useful in debugging.
+#Foreground
+
+# Enable debug messages in libclamav.
+#Debug
+
+# Do not remove temporary files (for debug purposes).
+#LeaveTemporaryFiles
+
+##
+## Executable files
+##
+
+# PE stands for Portable Executable - it's an executable file format used
+# in all 32-bit versions of Windows operating systems. This option allows
+# ClamAV to perform a deeper analysis of executable files and it's also
+# required for decompression of popular executable packers such as UPX.
+ScanPE
+
+# With this option clamav will try to detect broken executables and mark
+# them as Broken.Executable
+DetectBrokenExecutables
+
+##
+## Document scanning
+##
+
+# This option enables scanning of Microsoft Office document macros.
+ScanOLE2
+
+##
+## Mail support
+##
+
+# Uncomment this option if you are planning to scan mail files.
+ScanMail
+
+##
+## Archive support
+##
+
+
+# Comment this line to disable scanning of the archives.
+ScanArchive
+
+
+# By default the built-in RAR unpacker is disabled by default because the code
+# terribly leaks, however it's probably a good idea to enable it.
+#ScanRAR
+
+
+# Options below protect your system against Denial of Service attacks
+# with archive bombs.
+
+# Files in archives larger than this limit won't be scanned.
+# Value of 0 disables the limit.
+# WARNING: Due to the unrarlib implementation, whole files (one by one) in RAR
+#	   archives are decompressed to the memory. That's why never disable
+#	   this limit (but you may increase it of course!)
+ArchiveMaxFileSize 10M
+
+# Archives are scanned recursively - e.g. if Zip archive contains RAR file,
+# the RAR file will be decompressed, too (but only if recursion limit is set
+# at least to 1). With this option you may set the recursion level.
+# Value of 0 disables the limit.
+ArchiveMaxRecursion 5
+
+# Number of files to be scanned within archive.
+# Value of 0 disables the limit.
+ArchiveMaxFiles 1000
+
+# Mark potential archive bombs as viruses (0 disables the limit)
+ArchiveMaxCompressionRatio 200
+
+# Use slower decompression algorithm which uses less memory. This option 
+# affects bzip2 decompressor only.
+#ArchiveLimitMemoryUsage
+
+# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
+#ArchiveBlockEncrypted
+
+
+##
+## Clamuko settings
+## WARNING: This is experimental software. It is very likely it will hang
+##	    up your system !!!
+##
+
+# Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
+#ClamukoScanOnAccess
+
+# Set access mask for Clamuko.
+ClamukoScanOnOpen
+ClamukoScanOnClose
+ClamukoScanOnExec
+
+# Set the include paths (all files in them will be scanned). You can have
+# multiple ClamukoIncludePath options, but each directory must be added
+# in a seperate option. All subdirectories are scanned, too.
+ClamukoIncludePath /home
+#ClamukoIncludePath /students
+
+# Set the exclude paths. All subdirectories are also excluded.
+#ClamukoExcludePath /home/guru
+
+# Limit the file size to be scanned (probably you don't want to scan your movie
+# files ;))
+# Value of 0 disables the limit. 1 Mb should be fine.
+ClamukoMaxFileSize 1M
+
+# Enable archive support. It uses the limits from clamd section.
+# (This option doesn't depend on ScanArchive, you can have archive support
+# in clamd disabled).
+ClamukoScanArchive

Modified: contrib/1.1/clamav/current/sources/clamd.sh
===================================================================
--- contrib/1.1/clamav/current/sources/clamd.sh	2004-10-21 17:28:54 UTC (rev 5014)
+++ contrib/1.1/clamav/current/sources/clamd.sh	2004-10-21 17:31:34 UTC (rev 5015)
@@ -6,7 +6,7 @@
 # description:	clamd is an antivirus daemon.
 #
 # processname: clamd
-# config: /etc/clamav.conf
+# config: /etc/clamd.conf
 # pidfile: /var/run/clamav/clamd.pid
 
 # Source function library
@@ -15,7 +15,7 @@
 # Get network config
 . /etc/sysconfig/network
 
-test -f /etc/clamav.conf || exit 0
+test -f /etc/clamd.conf || exit 0
 
 RETVAL=0
 

Modified: contrib/1.1/clamav/current/sources/freshclam.conf
===================================================================
--- contrib/1.1/clamav/current/sources/freshclam.conf	2004-10-21 17:28:54 UTC (rev 5014)
+++ contrib/1.1/clamav/current/sources/freshclam.conf	2004-10-21 17:31:34 UTC (rev 5015)
@@ -1,10 +1,10 @@
 ##
 ## Example config file for freshclam
-## Please read the clamav.conf(5) manual before editing this file.
-## This file may be optionally merged with clamav.conf.
+## Please read the clamd.conf(5) manual before editing this file.
+## This file may be optionally merged with clamd.conf.
 ##
 
-# It should match clamav.conf's directive ! (in most cases you shouldn't
+# It should match clamd.conf's directive ! (in most cases you shouldn't
 # change it)
 DatabaseDirectory /var/lib/clamav
 
@@ -25,6 +25,9 @@
 # switches to the "clamav" user. You can change this behaviour here.
 #DatabaseOwner clamav
 
+# Use DNS to verify virus database version.
+DNSDatabaseInfo current.cvd.clamav.net
+
 # The main database mirror is database.clamav.net (this is a round-robin
 # DNS that points to many mirrors on the world) and in most cases you
 # SHOULD NOT change it.

Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2004-10-21 17:28:54 UTC (rev 5014)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2004-10-21 17:31:34 UTC (rev 5015)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.75.1
-Release: 1gd
+Version: 0.80
+Release: 1ok
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -12,7 +12,7 @@
 Source6: clamd.logrotate
 Source7: freshclam.logrotate
 Source8: freshclam.conf
-Source10: clamav.conf
+Source10: clamd.conf
 BuildRequires: sed, zlib-devel, gmp-devel
 BuildRequires: zlib, gmp
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -103,7 +103,7 @@
 sed -e 's/OWNER/%{user_name}/g' -e 's/GROUP/%{group_name}/g' %{SOURCE7} >\
     %buildroot%{_sysconfdir}/logrotate.d/freshclam
 
-install %{SOURCE10} %buildroot%{_sysconfdir}/clamav.conf
+install %{SOURCE10} %buildroot%{_sysconfdir}/clamd.conf
 install %{SOURCE8} %buildroot%{_sysconfdir}/freshclam.conf
 
 mkdir -p %buildroot/%{_defaultdocdir}/%{name}-%{version}
@@ -143,7 +143,7 @@
 
 %files
 %defattr(-,root,root)
-%attr(0640,root,%{group_name}) %config %{_sysconfdir}/clamav.conf
+%attr(0640,root,%{group_name}) %config %{_sysconfdir}/clamd.conf
 %attr(0640,root,%{group_name}) %config %{_sysconfdir}/freshclam.conf
 %attr(0640,root,%{group_name}) %config %{_sysconfdir}/sysconfig/freshclam
 %{_initrddir}/clamd
@@ -162,7 +162,7 @@
 %{_mandir}/man1/clamscan.1*
 %{_mandir}/man1/freshclam.1*
 %{_mandir}/man1/sigtool.1*
-%{_mandir}/man5/clamav.conf.5*
+%{_mandir}/man5/clamd.conf.5*
 %{_mandir}/man5/freshclam.conf.5*
 %{_mandir}/man8/clamd.8*
 


From svn at tinysofa.org  Thu Oct 21 18:03:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 14:03:01 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5017 - in tinysofa/releases/1.1/postgresql/current: sources specs
Message-ID: <20041021180301.F15DA344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 14:03:01 -0400 (Thu, 21 Oct 2004)
New Revision: 5017

Added:
   tinysofa/releases/1.1/postgresql/current/sources/postgresql-7.4.5-tempfile.patch
   tinysofa/releases/1.1/postgresql/current/sources/postgresql-7.4.5.tar.bz2
   tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.5.patch
Removed:
   tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.3.patch
Modified:
   tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec
Log:
- postgresql 7.4.5

Added: tinysofa/releases/1.1/postgresql/current/sources/postgresql-7.4.5-tempfile.patch
===================================================================
--- tinysofa/releases/1.1/postgresql/current/sources/postgresql-7.4.5-tempfile.patch	2004-10-21 17:59:02 UTC (rev 5016)
+++ tinysofa/releases/1.1/postgresql/current/sources/postgresql-7.4.5-tempfile.patch	2004-10-21 18:03:01 UTC (rev 5017)
@@ -0,0 +1,48 @@
+diff -ur postgresql-7.4.5.orig/contrib/findoidjoins/make_oidjoins_check postgresql-7.4.5/contrib/findoidjoins/make_oidjoins_check
+--- postgresql-7.4.5.orig/contrib/findoidjoins/make_oidjoins_check	2002-09-05 21:57:32.000000000 +0200
++++ postgresql-7.4.5/contrib/findoidjoins/make_oidjoins_check	2004-09-20 11:51:39.000000000 +0200
+@@ -10,27 +10,35 @@
+ # Caution: you may need to use GNU awk.
+ AWK=${AWK:-awk}
+ 
+-trap "rm -f /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
++TMP=
++TMPA=
++TMPB=
++trap 'rm -f -- "$TMP" "$TMPA" "$TMPB"' EXIT
++trap 'trap - EXIT; rm -f -- "$TMP" "$TMPA" "$TMPB"; exit 1' HUP INT QUIT TERM
++
++TMP=`mktemp -t oidjoins.XXXXXX` || exit 1
++TMPA=`mktemp -t oidjoins.a.XXXXXX` || exit 1
++TMPB=`mktemp -t oidjoins.b.XXXXXX` || exit 1
+ 
+ # Read input
+-cat "$@" >/tmp/$$
++cat "$@" > $TMP
+ 
+ # Look for fields with multiple references.
+-cat /tmp/$$ | cut -d' ' -f2 | sort | uniq -d >/tmp/$$a
+-if [ -s /tmp/$$a ] ; then
++cat $TMP | cut -d' ' -f2 | sort | uniq -d > $TMPA
++if [ -s $TMPA ] ; then
+ 	echo "Ignoring these fields that link to multiple tables:" 1>&2
+-	cat /tmp/$$a 1>&2
++	cat $TMPA 1>&2
+ fi
+ 
+ # Get the non-multiply-referenced fields.
+-cat /tmp/$$ | while read LINE
++cat $TMP | while read LINE
+ do
+ 	set -- $LINE
+-	grep "^$2\$" /tmp/$$a >/dev/null 2>&1 || echo $LINE
+-done >/tmp/$$b
++	grep "^$2\$" $TMPA >/dev/null 2>&1 || echo $LINE
++done > $TMPB
+ 
+ # Generate the output.
+-cat /tmp/$$b |
++cat $TMPB |
+ $AWK -F'[ \.]' '\
+ 	BEGIN \
+ 	{

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


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

Deleted: tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.3.patch
===================================================================
--- tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.3.patch	2004-10-21 17:59:02 UTC (rev 5016)
+++ tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.3.patch	2004-10-21 18:03:01 UTC (rev 5017)
@@ -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.3], [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
-   ])

Added: tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.5.patch
===================================================================
--- tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.5.patch	2004-10-21 17:59:02 UTC (rev 5016)
+++ tinysofa/releases/1.1/postgresql/current/sources/rpm-multilib-7.4.5.patch	2004-10-21 18:03:01 UTC (rev 5017)
@@ -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.5], [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.1/postgresql/current/specs/postgresql.spec
===================================================================
--- tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec	2004-10-21 17:59:02 UTC (rev 5016)
+++ tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec	2004-10-21 18:03:01 UTC (rev 5017)
@@ -7,8 +7,8 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.4.3
-Release: 3ts
+Version: 7.4.5
+Release: 1jh
 License: BSD
 Group: main
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -33,7 +33,8 @@
 # Cleanup
 # Not in use
 Patch4: postgresql-7.3.2-rpm.patch
-Patch5: rpm-multilib-7.4.3.patch
+Patch5: rpm-multilib-7.4.5.patch
+Patch6: postgresql-7.4.5-tempfile.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
@@ -163,6 +164,7 @@
 %setup -q
 %patch2 -p1 -b .plperl
 %patch5 -p1 -b .multilib
+%patch6 -p1 -b .tempfile
 
 chmod -R go-w . || :
 chown -R $USER. . || :
@@ -651,6 +653,10 @@
 
 
 %changelog
+* Tue Oct 19 2004 Jaakko Heinonen <jh at tinysofa dot org> 7.4.5-1jh
+- 7.4.5
+- add tempfile patch
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 7.4.3-3ts
 - current (7.4.3-3jh) integrated as 7.4.3-3ts for release 1.1
 


From svn at tinysofa.org  Thu Oct 21 18:08:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 14:08:35 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5018 - in tinysofa/releases/1.1: bzip2/current/specs
	db4/current/specs libxml2/current/specs ncurses/current/specs
	zlib/current/specs
Message-ID: <20041021180835.C02D9344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 14:08:35 -0400 (Thu, 21 Oct 2004)
New Revision: 5018

Modified:
   tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec
   tinysofa/releases/1.1/db4/current/specs/db4.spec
   tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec
   tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec
   tinysofa/releases/1.1/zlib/current/specs/zlib.spec
Log:
- fix various lib permissions


Modified: tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec
===================================================================
--- tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec	2004-10-21 18:03:01 UTC (rev 5017)
+++ tinysofa/releases/1.1/bzip2/current/specs/bzip2.spec	2004-10-21 18:08:35 UTC (rev 5018)
@@ -100,7 +100,7 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
-%{_libdir}/*.a
+%attr(644,root,root) %{_libdir}/*.a
 %{_libdir}/*so
 
 

Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec
===================================================================
--- tinysofa/releases/1.1/db4/current/specs/db4.spec	2004-10-21 18:03:01 UTC (rev 5017)
+++ tinysofa/releases/1.1/db4/current/specs/db4.spec	2004-10-21 18:08:35 UTC (rev 5018)
@@ -337,7 +337,9 @@
 %defattr(-,root,root)
 %doc docs/java
 %doc examples_java
-%{_libdir}/libdb_java*
+%{_libdir}/libdb_java*so
+%{_libdir}/libdb_java*.a
+%attr(755,root,root) %{_libdir}/libdb_java*.la
 %{_datadir}/java/*.jar
 %endif
 %ifarch %{nptl_java_arches}

Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec
===================================================================
--- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec	2004-10-21 18:03:01 UTC (rev 5017)
+++ tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec	2004-10-21 18:08:35 UTC (rev 5018)
@@ -97,7 +97,8 @@
 %doc doc/tutorial doc/libxml2-api.xml
 
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(644,root,root) %{_libdir}/*a
+%attr(644,root,root) %{_libdir}/*.a
+%attr(755,root,root) %{_libdir}/*.la
 %{_libdir}/*.sh
 %{_includedir}/*
 %{_bindir}/xml2-config

Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec
===================================================================
--- tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec	2004-10-21 18:03:01 UTC (rev 5017)
+++ tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec	2004-10-21 18:08:35 UTC (rev 5018)
@@ -162,7 +162,7 @@
 %doc doc/html/ncurses-intro.html
 %doc c++/README*
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
+%attr(644,root,root) %{_libdir}/lib*.a
 %dir %{_includedir}/ncurses
 %dir %{_includedir}/ncursesw
 %{_includedir}/ncurses/*.h

Modified: tinysofa/releases/1.1/zlib/current/specs/zlib.spec
===================================================================
--- tinysofa/releases/1.1/zlib/current/specs/zlib.spec	2004-10-21 18:03:01 UTC (rev 5017)
+++ tinysofa/releases/1.1/zlib/current/specs/zlib.spec	2004-10-21 18:08:35 UTC (rev 5018)
@@ -75,7 +75,7 @@
 %files devel
 %defattr(-,root,root)
 %doc ChangeLog algorithm.txt minigzip.c example.c
-%{_libdir}/*.a
+%attr(644,root,root) %{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/*
 %{_mandir}/man3/zlib.3*


From svn at tinysofa.org  Thu Oct 21 18:50:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 14:50:30 -0400 (EDT)
Subject: [tinysofa-svn] r5019 - contrib/1.1/clamav/current/sources
Message-ID: <20041021185030.CA1FA344120@minbar.tinysofa.org>

Author: omar
Date: 2004-10-21 14:50:29 -0400 (Thu, 21 Oct 2004)
New Revision: 5019

Modified:
   contrib/1.1/clamav/current/sources/clamd.conf
Log:
- StreamSaveToDisk is now on by default.


Modified: contrib/1.1/clamav/current/sources/clamd.conf
===================================================================
--- contrib/1.1/clamav/current/sources/clamd.conf	2004-10-21 18:08:35 UTC (rev 5018)
+++ contrib/1.1/clamav/current/sources/clamd.conf	2004-10-21 18:50:29 UTC (rev 5019)
@@ -80,10 +80,6 @@
 # Default is 15.
 #MaxConnectionQueueLength 30
 
-# When activated, input stream (see STREAM command) will be saved to disk before
-# scanning - this allows scanning within archives.
-StreamSaveToDisk
-
 # Close the connection if this limit is exceeded.
 #StreamMaxLength 10M
 


From svn at tinysofa.org  Thu Oct 21 19:18:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 15:18:06 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5020 - tinysofa/releases/1.1/openldap/current/sources
Message-ID: <20041021191806.2793F344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 15:18:04 -0400 (Thu, 21 Oct 2004)
New Revision: 5020

Modified:
   tinysofa/releases/1.1/openldap/current/sources/openldap.init
Log:
- change start and stop priority levels


Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.init
===================================================================
--- tinysofa/releases/1.1/openldap/current/sources/openldap.init	2004-10-21 18:50:29 UTC (rev 5019)
+++ tinysofa/releases/1.1/openldap/current/sources/openldap.init	2004-10-21 19:18:04 UTC (rev 5020)
@@ -2,7 +2,7 @@
 #
 # Startup script for the OpenLDAP server
 #
-# chkconfig: - 80 20
+# chkconfig: - 39 61
 #
 # description: OpenLDAP is a Lightweight Directory Access Protocol server
 #


From svn at tinysofa.org  Thu Oct 21 19:23:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 15:23:46 -0400 (EDT)
Subject: [tinysofa-svn] r5021 - tinysofa/releases/1.1/openldap/current/specs
Message-ID: <20041021192346.E518C344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 15:23:41 -0400 (Thu, 21 Oct 2004)
New Revision: 5021

Modified:
   tinysofa/releases/1.1/openldap/current/specs/openldap.spec
Log:
- bump up release


Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec
===================================================================
--- tinysofa/releases/1.1/openldap/current/specs/openldap.spec	2004-10-21 19:18:04 UTC (rev 5020)
+++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec	2004-10-21 19:23:41 UTC (rev 5021)
@@ -6,7 +6,7 @@
 Summary: Lightweight Directory Access Protocol clients/servers
 Name: openldap
 Version: 2.1.30
-Release: 4jh
+Release: 5jh
 Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
 Source1: openldap.init
 Source2: openldap-slapd.conf
@@ -283,6 +283,9 @@
 
 
 %changelog
+* Thu Oct 21 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.1.30-5jh
+- change start priority
+
 * Fri Oct  8 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.1.30-4jh
 - configure with --enable-crypt
 - improve requirements


From svn at tinysofa.org  Thu Oct 21 19:40:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 15:40:37 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5022 - tinysofa/releases/1.1/chkconfig/current/specs
Message-ID: <20041021194037.1B668344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 15:40:36 -0400 (Thu, 21 Oct 2004)
New Revision: 5022

Modified:
   tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec
Log:
- remove reference to restart_maybe from manual page

Modified: tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec
===================================================================
--- tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec	2004-10-21 19:23:41 UTC (rev 5021)
+++ tinysofa/releases/1.1/chkconfig/current/specs/chkconfig.spec	2004-10-21 19:40:36 UTC (rev 5022)
@@ -1,13 +1,13 @@
 Summary: A system tool for maintaining the /etc/rcN.d hierarchy.
 Name: chkconfig
 Version: 1.3.8
-Release: 6ts
+Release: 7jh
 License: GPL
 Group: main
 Source:  ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz
 Patch1: chkconfig-1.3.8-tinysofa.patch
 BuildRequires: autoconf
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: initscripts
 PreReq: filesystem
 
@@ -19,32 +19,35 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p1 -b .tinysofa
 
 %build
 
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} install
 
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 /sbin/chkconfig
 /usr/sbin/alternatives
 /usr/sbin/update-alternatives
-/usr/share/man/man8/*
+%{_mandir}/man8/*
 /var/lib/alternatives
 /etc/alternatives
 
 
 %changelog
+* Thu Oct 21 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.8-7jh
+- remove reference to restart_maybe from manual page
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.3.8-6ts
 - current (1.3.8-6jh) integrated as 1.3.8-6ts for release 1.1
 


From svn at tinysofa.org  Thu Oct 21 19:40:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 21 Oct 2004 15:40:53 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5023 - tinysofa/releases/1.1/chkconfig/current/sources
Message-ID: <20041021194053.A86B3344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-21 15:40:53 -0400 (Thu, 21 Oct 2004)
New Revision: 5023

Modified:
   tinysofa/releases/1.1/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch
Log:
- remove reference to restart_maybe from manual page

Modified: tinysofa/releases/1.1/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch
===================================================================
--- tinysofa/releases/1.1/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch	2004-10-21 19:40:36 UTC (rev 5022)
+++ tinysofa/releases/1.1/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch	2004-10-21 19:40:53 UTC (rev 5023)
@@ -1,6 +1,21 @@
-diff -Nur chkconfig-1.3.8.orig/Makefile chkconfig-1.3.8/Makefile
---- chkconfig-1.3.8.orig/Makefile	2002-12-12 20:34:37.000000000 +0100
-+++ chkconfig-1.3.8/Makefile	2004-01-27 16:38:07.000000000 +0100
+--- chkconfig-1.3.8/leveldb.c.tinysofa	2002-03-13 09:09:03.000000000 +0200
++++ chkconfig-1.3.8/leveldb.c	2004-10-21 22:37:06.829023792 +0300
+@@ -328,10 +328,9 @@
+ 		return 1;
+ 	    }
+ 
+-	    if (!strcmp(levelbuf, "-"))
+-		serv.levels = 0;
+-	    else
+-		serv.levels = parseLevels(levelbuf, 0);
++            /* Setting default runlevels 2,3,4,5 when '-' is found. */
++            if (!strcmp(levelbuf, "-")) strcpy(levelbuf, "2345");
++            serv.levels = parseLevels(levelbuf, 0);
+ 	    if (serv.levels == -1) {
+ 		if (serv.desc) free(serv.desc);
+ 		free(bufstart);
+--- chkconfig-1.3.8/Makefile.tinysofa	2002-12-12 21:34:37.000000000 +0200
++++ chkconfig-1.3.8/Makefile	2004-10-21 22:37:06.825024400 +0300
 @@ -4,75 +4,55 @@
  
  CFLAGS=-g -Wall $(RPM_OPT_FLAGS) -D_GNU_SOURCE
@@ -94,125 +109,8 @@
  
  archive:
  	cvs tag -F $(CVSTAG) .
-diff -Nur chkconfig-1.3.8.orig/chkconfig.8 chkconfig-1.3.8/chkconfig.8
---- chkconfig-1.3.8.orig/chkconfig.8	2003-01-31 21:51:37.000000000 +0100
-+++ chkconfig-1.3.8/chkconfig.8	2004-01-27 16:36:23.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH CHKCONFIG 8 "Wed Oct 8 1997"
-+.TH CHKCONFIG 8 "Tue Jan 27 2004"
- .UC 4
- .SH NAME
- chkconfig \- updates and queries runlevel information for system services
-@@ -28,6 +28,10 @@
- of the configuration information regarding what services \fIinit\fR
- starts in a single location.
- 
-+This implementation is modified to fit the need of the 
-+\fBtinysofa distribution\fR. 
-+This manual page reflects the modifications. 
-+
- \fBchkconfig\fR has five distinct functions: adding new services for
- management, removing services from management, listing the current
- startup information for services, changing the startup information
-@@ -40,27 +44,37 @@
- \fB--level\fR option may be used to have \fBchkconfig\fR query an
- alternative runlevel rather than the current one.
- 
--If one of \fBon\fR, \fBoff\fR, or \fRreset\fR is specified after the
-+If one of \fBon\fR, \fBoff\fR, or \fBreset\fR is specified after the
- service name, \fBchkconfig\fR changes the startup information for the
- specified service.  The \fBon\fR and \fBoff\fR flags cause the service
- to be started or stopped, respectively, in the runlevels being changed.
--The \fBreset\fR flag resets the startup information for the service to
--whatever is specified in the init script in question.
-+The \fBreset\fR flag resets the startup information for the service to 
-+\fBnot\fR start the service in any runlevel.
-+
-+If the chkconfig setting, in the initscript of the service, does not define
-+any specific runlevel (using '-' in the runlevel location), the \fBon\fR 
-+option will affect runlevels 2, 3, 4, and 5. 
-+
-+The \fB--level\fR option will always override any setting in the initscript,
-+when using the \fBon\fR option.
- 
--By default, the \fBon\fR and \fBoff\fR options affect only runlevels 2, 3, 4,
--and 5, while \fBreset\fR affects all of the runlevels.  The \fB--level\fR
--option may be used to specify which runlevels are affected.
-+The \fBoff\fR option will affects all of the runlevels unless the 
-+\fB--level\fR option are used to specify which runlevels are affected.
- 
- Note that for every service, each runlevel has either a start script
- or a stop script.  When switching runlevels, init will not re-start
- an already-started service, and will not re-stop a service that is
- not running.
- 
-+If using \fBtinysofa\fR, you may use the \fBrestart_maybe\fR script, commonly 
-+found as \fB/sbin/restart_maybe\fR, to make the current status of the 
-+service reflect the updated runlevel setup for that service.
-+
- .SH OPTIONS
- .TP
- \fB-\-level \fIlevels\fR
- Specifies the run levels an operation should pertain to. It is given as
--a string of numbers from 0 to 7. For example, \fB--level 35\fR specifies
-+a string of numbers from 0 to 6. For example, \fB--level 35\fR specifies
- runlevels 3 and 5.
- 
- .TP
-@@ -69,10 +83,8 @@
- This option adds a new service for management by \fBchkconfig\fR.
- When a new service is added, \fBchkconfig\fR ensures that the service
- has either a start or a kill entry in every runlevel. If any runlevel
--is missing such an entry, \fBchkconfig\fR creates the appropriate entry
--as specified by the default values in the init script. Note that
--default entries in LSB-delimited 'INIT INFO' sections take precedence
--over the default runlevels in the initscript.
-+is missing such an entry, \fBchkconfig\fR creates a kill entry in that
-+runlevel.
- 
- .TP
- \fB-\-del\fR \fIname\fR
-@@ -92,30 +104,30 @@
- tells \fBchkconfig\fR what runlevels the service should be started in
- by default, as well as the start and stop priority levels. If the service
- should not, by default, be started in any runlevels, a \fB\-\fR should be
--used in place of the runlevels list.  The second
--line contains a description for the service, and may be extended across
--multiple lines with backslash continuation.
-+used in place of the runlevels list.  The second line contains a description 
-+for the service, and may be extended across multiple lines with backslash 
-+continuation.
-+
- 
- For example, random.init has these three lines:
- .nf
- .fn C
--# chkconfig: 2345 20 80
-+# chkconfig: - 20 80
- # description: Saves and restores system entropy pool for \e
- #              higher quality random number generation.
- .fn R
- .fi
- This says that the random script should be started in levels 2, 3, 4,
--and 5, that its start priority should be 20, and that its stop
-+and 5 (default), that its start priority should be 20, and that its stop
- priority should be 80.  You should be able to figure out what the
- description says; the \e causes the line to be continued.  The
- extra space in front of the line is ignored.
- 
- .SH SEE ALSO
- .IR init (8)
--.IR ntsysv (8)
--.IR serviceconf (8)
- 
- .SH AUTHOR
- .nf
- Erik Troan <ewt at redhat.com>
-+Updated by Christian H. Toldnes <christht at trustix dot org>
- .fi
-diff -Nur chkconfig-1.3.8.orig/chkconfig.c chkconfig-1.3.8/chkconfig.c
---- chkconfig-1.3.8.orig/chkconfig.c	2002-08-12 21:53:42.000000000 +0200
-+++ chkconfig-1.3.8/chkconfig.c	2004-01-27 16:36:23.000000000 +0100
+--- chkconfig-1.3.8/chkconfig.c.tinysofa	2002-08-12 22:53:42.000000000 +0300
++++ chkconfig-1.3.8/chkconfig.c	2004-10-21 22:37:06.828023944 +0300
 @@ -18,15 +18,16 @@
  #include "leveldb.h"
  
@@ -400,20 +298,111 @@
      }
  
      usage();
-diff -Nur chkconfig-1.3.8.orig/leveldb.c chkconfig-1.3.8/leveldb.c
---- chkconfig-1.3.8.orig/leveldb.c	2002-03-13 08:09:03.000000000 +0100
-+++ chkconfig-1.3.8/leveldb.c	2004-01-27 16:36:23.000000000 +0100
-@@ -328,10 +328,9 @@
- 		return 1;
- 	    }
+--- chkconfig-1.3.8/chkconfig.8.tinysofa	2003-01-31 22:51:37.000000000 +0200
++++ chkconfig-1.3.8/chkconfig.8	2004-10-21 22:37:44.004372280 +0300
+@@ -1,4 +1,4 @@
+-.TH CHKCONFIG 8 "Wed Oct 8 1997"
++.TH CHKCONFIG 8 "Tue Jan 27 2004"
+ .UC 4
+ .SH NAME
+ chkconfig \- updates and queries runlevel information for system services
+@@ -28,6 +28,10 @@
+ of the configuration information regarding what services \fIinit\fR
+ starts in a single location.
  
--	    if (!strcmp(levelbuf, "-"))
--		serv.levels = 0;
--	    else
--		serv.levels = parseLevels(levelbuf, 0);
-+            /* Setting default runlevels 2,3,4,5 when '-' is found. */
-+            if (!strcmp(levelbuf, "-")) strcpy(levelbuf, "2345");
-+            serv.levels = parseLevels(levelbuf, 0);
- 	    if (serv.levels == -1) {
- 		if (serv.desc) free(serv.desc);
- 		free(bufstart);
++This implementation is modified to fit the need of the 
++\fBtinysofa distribution\fR. 
++This manual page reflects the modifications. 
++
+ \fBchkconfig\fR has five distinct functions: adding new services for
+ management, removing services from management, listing the current
+ startup information for services, changing the startup information
+@@ -40,16 +44,22 @@
+ \fB--level\fR option may be used to have \fBchkconfig\fR query an
+ alternative runlevel rather than the current one.
+ 
+-If one of \fBon\fR, \fBoff\fR, or \fRreset\fR is specified after the
++If one of \fBon\fR, \fBoff\fR, or \fBreset\fR is specified after the
+ service name, \fBchkconfig\fR changes the startup information for the
+ specified service.  The \fBon\fR and \fBoff\fR flags cause the service
+ to be started or stopped, respectively, in the runlevels being changed.
+-The \fBreset\fR flag resets the startup information for the service to
+-whatever is specified in the init script in question.
++The \fBreset\fR flag resets the startup information for the service to 
++\fBnot\fR start the service in any runlevel.
++
++If the chkconfig setting, in the initscript of the service, does not define
++any specific runlevel (using '-' in the runlevel location), the \fBon\fR 
++option will affect runlevels 2, 3, 4, and 5. 
+ 
+-By default, the \fBon\fR and \fBoff\fR options affect only runlevels 2, 3, 4,
+-and 5, while \fBreset\fR affects all of the runlevels.  The \fB--level\fR
+-option may be used to specify which runlevels are affected.
++The \fB--level\fR option will always override any setting in the initscript,
++when using the \fBon\fR option.
++
++The \fBoff\fR option will affects all of the runlevels unless the 
++\fB--level\fR option are used to specify which runlevels are affected.
+ 
+ Note that for every service, each runlevel has either a start script
+ or a stop script.  When switching runlevels, init will not re-start
+@@ -60,7 +70,7 @@
+ .TP
+ \fB-\-level \fIlevels\fR
+ Specifies the run levels an operation should pertain to. It is given as
+-a string of numbers from 0 to 7. For example, \fB--level 35\fR specifies
++a string of numbers from 0 to 6. For example, \fB--level 35\fR specifies
+ runlevels 3 and 5.
+ 
+ .TP
+@@ -69,10 +79,8 @@
+ This option adds a new service for management by \fBchkconfig\fR.
+ When a new service is added, \fBchkconfig\fR ensures that the service
+ has either a start or a kill entry in every runlevel. If any runlevel
+-is missing such an entry, \fBchkconfig\fR creates the appropriate entry
+-as specified by the default values in the init script. Note that
+-default entries in LSB-delimited 'INIT INFO' sections take precedence
+-over the default runlevels in the initscript.
++is missing such an entry, \fBchkconfig\fR creates a kill entry in that
++runlevel.
+ 
+ .TP
+ \fB-\-del\fR \fIname\fR
+@@ -92,30 +100,30 @@
+ tells \fBchkconfig\fR what runlevels the service should be started in
+ by default, as well as the start and stop priority levels. If the service
+ should not, by default, be started in any runlevels, a \fB\-\fR should be
+-used in place of the runlevels list.  The second
+-line contains a description for the service, and may be extended across
+-multiple lines with backslash continuation.
++used in place of the runlevels list.  The second line contains a description 
++for the service, and may be extended across multiple lines with backslash 
++continuation.
++
+ 
+ For example, random.init has these three lines:
+ .nf
+ .fn C
+-# chkconfig: 2345 20 80
++# chkconfig: - 20 80
+ # description: Saves and restores system entropy pool for \e
+ #              higher quality random number generation.
+ .fn R
+ .fi
+ This says that the random script should be started in levels 2, 3, 4,
+-and 5, that its start priority should be 20, and that its stop
++and 5 (default), that its start priority should be 20, and that its stop
+ priority should be 80.  You should be able to figure out what the
+ description says; the \e causes the line to be continued.  The
+ extra space in front of the line is ignored.
+ 
+ .SH SEE ALSO
+ .IR init (8)
+-.IR ntsysv (8)
+-.IR serviceconf (8)
+ 
+ .SH AUTHOR
+ .nf
+ Erik Troan <ewt at redhat.com>
++Updated by Christian H. Toldnes <christht at trustix dot org>
+ .fi


From svn at tinysofa.org  Fri Oct 22 08:30:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 22 Oct 2004 04:30:28 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5024 - tinysofa/releases/1.1/initscripts/current/specs
Message-ID: <20041022083028.17BF1344120@minbar.tinysofa.org>

Author: jh
Date: 2004-10-22 04:30:28 -0400 (Fri, 22 Oct 2004)
New Revision: 5024

Modified:
   tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec
Log:
- apply s390 patch only on s390 (fixes a problem with hwclock in local time)

Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec	2004-10-21 19:40:53 UTC (rev 5023)
+++ tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec	2004-10-22 08:30:28 UTC (rev 5024)
@@ -3,7 +3,7 @@
 Version: 7.31.9
 License: GPL
 Group: main
-Release: 7gd
+Release: 8jh
 Source: initscripts-%{version}.tar.bz2
 URL: http://rhlinux.redhat.com/initscripts/
 Patch0: initscripts-s390.patch
@@ -36,7 +36,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%ifarch s390 s390x
+%patch0 -p1 -b .s390init
+%endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -201,6 +203,9 @@
 
 
 %changelog
+* Fri Oct 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-8jh
+- apply s390 patch only on s390 (fixes a problem with hwclock in local time)
+
 * Tue Sep 14 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - add patch to save alsa mixer settings
 


From svn at tinysofa.org  Fri Oct 22 13:21:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 22 Oct 2004 09:21:59 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5025 - in tinysofa/releases/1.1/ghostscript/current: sources specs
Message-ID: <20041022132159.95D54344123@minbar.tinysofa.org>

Author: jh
Date: 2004-10-22 09:21:58 -0400 (Fri, 22 Oct 2004)
New Revision: 5025

Added:
   tinysofa/releases/1.1/ghostscript/current/sources/ghostscript-7.07.1-tempfile.patch
Modified:
   tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec
Log:
- add tempfile patch
- install cups files to correct location on multilib systems


Added: tinysofa/releases/1.1/ghostscript/current/sources/ghostscript-7.07.1-tempfile.patch
===================================================================
--- tinysofa/releases/1.1/ghostscript/current/sources/ghostscript-7.07.1-tempfile.patch	2004-10-22 08:30:28 UTC (rev 5024)
+++ tinysofa/releases/1.1/ghostscript/current/sources/ghostscript-7.07.1-tempfile.patch	2004-10-22 13:21:58 UTC (rev 5025)
@@ -0,0 +1,105 @@
+diff -ur espgs-7.07.1.orig/lib/pj-gs.sh espgs-7.07.1/lib/pj-gs.sh
+--- espgs-7.07.1.orig/lib/pj-gs.sh	2002-04-23 13:58:36.000000000 +0200
++++ espgs-7.07.1/lib/pj-gs.sh	2004-09-13 10:04:00.000000000 +0200
+@@ -241,6 +241,7 @@
+ 			then
+ 				/usr/lib/lprcat $Nofilter $Nolabel $file PCL1 $user $dev
+ 			else
++				TEMPFILE=`mktemp -t pjXXXXXX` || exit 1
+ 				type=`file $file | sed 's/^[^:]*..//'`
+ 				case "$type" in
+ 				postscript*)
+@@ -251,22 +252,22 @@
+ #
+ #					gs -q -sDEVICE=paintjet -r180 -sOutputFile=- -dDISKFONTS -dNOPAUSE - < $file 2>/tmp/sh$$
+ 
+-					gs -q -sDEVICE=paintjet -r180 -sOutputFile=/tmp/pj$$ -dDISKFONTS -dNOPAUSE - < $file 1>2
+-					cat /tmp/pj$$
+-					rm /tmp/pj$$
++					gs -q -sDEVICE=paintjet -r180 -sOutputFile=$TEMPFILE -dDISKFONTS -dNOPAUSE - < $file 1>2
++					cat $TEMPFILE
++					rm $TEMPFILE
+ 					needff=
+ 					;;
+-				*)	cat "$file" 2>/tmp/sh$$
++				*)	cat "$file" 2>$TEMPFILE
+ 					needff=1
+ 					;;
+ 				esac
+ 
+-				if [ -s /tmp/sh$$ ]
++				if [ -s $TEMPFILE ]
+ 				then
+ #				    cat /tmp/sh$$	# output any errors
+-				    cat /tmp/sh$$ 1>2	# output any errors
++				    cat $TEMPFILE 1>2	# output any errors
+ 				fi
+-				rm -f /tmp/sh$$
++				rm -f $TEMPFILE
+ 				if [ $needff ]; then echo "\014\r\c"; fi
+ 			fi
+ 
+diff -ur espgs-7.07.1.orig/lib/ps2epsi espgs-7.07.1/lib/ps2epsi
+--- espgs-7.07.1.orig/lib/ps2epsi	2003-09-02 20:01:31.000000000 +0200
++++ espgs-7.07.1/lib/ps2epsi	2004-09-13 10:05:31.000000000 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ # $Id: ps2epsi,v 1.7 2003/09/02 18:01:31 easysw Exp $
+ 
+-tmpfile=/tmp/ps2epsi$$
+-rm -f $tmpfile
+-if test -e $tmpfile; then
+-	echo "$0: Our temporary file $tmpfile already exists." 1>&2
+-	exit 1
+-fi
++tmpfile=`mktemp -t ps2epsiXXXXXX` || exit 1
+ trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
+ 
+ export outfile
+diff -ur espgs-7.07.1.orig/lib/pv.sh espgs-7.07.1/lib/pv.sh
+--- espgs-7.07.1.orig/lib/pv.sh	2002-04-23 13:58:36.000000000 +0200
++++ espgs-7.07.1/lib/pv.sh	2004-09-13 10:08:01.000000000 +0200
+@@ -29,9 +29,10 @@
+ PAGE=$1
+ shift
+ FILE=$1
++TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
+ shift
+-trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
++trap "rm -rf $TEMPFILE" 0 1 2 15
+ #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+-dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+-gs $FILE.$$.pv
++dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
++gs $TEMPFILE
+ exit 0
+diff -ur espgs-7.07.1.orig/lib/sysvlp.sh espgs-7.07.1/lib/sysvlp.sh
+--- espgs-7.07.1.orig/lib/sysvlp.sh	2002-04-23 13:58:37.000000000 +0200
++++ espgs-7.07.1/lib/sysvlp.sh	2004-09-13 10:14:46.000000000 +0200
+@@ -27,20 +27,23 @@
+ # Brother HL-4: switch to HP laserjet II+ emulation
+ # echo "\033\015H\c"
+ 
++TEMPDIR=`mktemp -td sysvlp.XXXXXX` || exit 1
++
+ i=1
+ while [ $i -le $copies ]
+ do
+ 	for file in $files
+ 	do
+ 		$GSHOME/gs \
+-			-sOUTPUTFILE=/tmp/psp$$.%02d \
++			-sOUTPUTFILE=$TEMPDIR/psp$$.%02d \
+ 			-sDEVICE=$DEVICE \
+ 			$EHANDLER $file \
+ 			< /dev/null >> /usr/tmp/ps_log 2>&1
+ 
+-		cat /tmp/psp$$.* 2>> /usr/tmp/ps_log
+-		rm -f /tmp/psp$$.*
++		cat $TEMPDIR/psp$$.* 2>> /usr/tmp/ps_log
++		rm -f $TEMPDIR/psp$$.*
+ 	done
+ 	i=`expr $i + 1`
+ done
++rmdir $TEMPDIR
+ exit 0

Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec
===================================================================
--- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec	2004-10-22 08:30:28 UTC (rev 5024)
+++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec	2004-10-22 13:21:58 UTC (rev 5025)
@@ -1,13 +1,14 @@
 Summary: ESP Ghostscript
 Name: ghostscript
 Version: 7.07.1
-Release: 6ts
+Release: 7jh
 License: GPL
 Group: extra
 Source: ftp://ftp.easysw.com/pub/ghostscript/espgs-%{version}-source.tar.bz2
 Source2: http://heanet.dl.sourceforge.net/sourceforge/gs-fonts/gnu-gs-fonts-std-6.0.tar.gz
+Patch0: ghostscript-7.07.1-tempfile.patch
 Url: http://www.cups.org/ghostscript.html
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdc++-devel
 BuildRequires: zlib zlib-devel cups cups-devel libpng libpng-devel
 Buildrequires: openssl openssl-devel
@@ -38,16 +39,16 @@
 ("CUPS"). This package is required to support non-PostScript
 printers with CUPS.
 
+
 %prep
-%setup -q -n espgs-%{version}
-# fonts:
-tar zxf %{SOURCE2}
+%setup -q -n espgs-%{version} -a 2
+%patch0 -p1 -b .tempfile
 
+
 %build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir}
+%configure
+%make
 
-# If we got this far, all prerequisite libraries must be here.
-make
 
 %install
 # Make sure destination directories are there, since Ghostscript doesn't make them...
@@ -57,13 +58,15 @@
 mkdir -m 755 -p $RPM_BUILD_ROOT%{_datadir}/ghostscript/7.05/examples
 mkdir -m 755 -p $RPM_BUILD_ROOT%{_datadir}/fonts/default/ghostscript
 
-make prefix=$RPM_BUILD_ROOT/usr install_prefix=$RPM_BUILD_ROOT/ bindir=$RPM_BUILD_ROOT/usr/bin datadir=$RPM_BUILD_ROOT/usr/share mandir=$RPM_BUILD_ROOT%{_mandir} install
+%makeinstall install_prefix=$RPM_BUILD_ROOT/
 
 install -m 644 fonts/*  $RPM_BUILD_ROOT%{_datadir}/fonts/default/ghostscript/
 
+
 %clean
 %clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %{_bindir}/*
@@ -76,11 +79,16 @@
 
 %files cups
 %defattr(-,root,root)
-/etc/cups/*
-/usr/lib/cups/filter/*
-/usr/share/cups/model/*
+%{_sysconfdir}/cups/*
+%{_libdir}/cups/filter/*
+%{_datadir}/cups/model/*
 
+
 %changelog
+* Fri Oct 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 7.07.1-7jh
+- add tempfile patch
+- install cups files to correct location on multilib systems
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 7.07.1-6ts
 - current (7.07.1-6jh) integrated as 7.07.1-6ts for release 1.1
 


From svn at tinysofa.org  Sun Oct 24 20:27:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 24 Oct 2004 16:27:39 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5026 - in contrib/1.1: . fox fox/current fox/current/sources
	fox/current/specs
Message-ID: <20041024202739.B8E0F344123@minbar.tinysofa.org>

Author: gda
Date: 2004-10-24 16:27:38 -0400 (Sun, 24 Oct 2004)
New Revision: 5026

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

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


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

Added: contrib/1.1/fox/current/specs/fox.spec
===================================================================
--- contrib/1.1/fox/current/specs/fox.spec	2004-10-22 13:21:58 UTC (rev 5025)
+++ contrib/1.1/fox/current/specs/fox.spec	2004-10-24 20:27:38 UTC (rev 5026)
@@ -0,0 +1,183 @@
+Summary: Shared libraries for the FOX 1.2.x toolkit.
+Name: fox
+Version: 1.2.9
+Release: 1gd
+Copyright: LGPL
+Group: contrib
+Source: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz
+URL: http://www.fox-toolkit.org
+BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRequires: gcc-c++ xorg-x11-devel xorg-x11-Mesa-libGLU
+Requires:  xorg-x11 xorg-x11-Mesa-libGLU
+
+%description
+FOX is a C++-based library for graphical user interface development
+FOX supports modern GUI features, such as drag-and-drop, tooltips, tab
+books, tree lists, icons, multiple document interfaces (MDI), timers,
+idle processing, automatic GUI updating, as well as OpenGL/Mesa for
+3D graphics. Subclassing of basic FOX widgets allows for easy
+extension beyond the built-in widgets by application writers.
+
+%package devel
+Summary: Development files and documentation for the FOX GUI toolkit.
+Group: contrib
+
+%description devel
+The fox-devel package contains the files necessary to develop applications
+using the FOX GUI toolkit: the header files, the reswrap resource compiler,
+manual pages, and HTML documentation.
+
+%package static
+Summary: A version of the FOX GUI toolkit for static linking.
+Group: contrib
+
+%description static
+The fox-static package contains the files necessary to link applications
+to the FOX GUI toolkit statically (rather than dynamically). Statically
+linked applications do not require the library to be installed on the system
+running the application.
+
+%package -n adie
+Summary: Adie Programmer's Text Editor
+Group: contrib
+Version: 3.0.0
+
+%description -n adie
+Adie is an extremely fast and convenient programming text editor written using the FOX Toolkit.
+
+%package -n calculator
+Summary: FOX-based Calculator Applet
+Group: contrib
+Version: 2.0.0
+
+%description -n calculator
+The FOX calculator is a simple desktop calculator geared towards the programmer.
+It supports not only a full complement of scientific functions, but also common
+operations that programmers need, such as bitwise operations, bitwise shifting,
+and base-2 logarithm and exponents, and numeric conversion between hexadecimal,
+octal, binary, and decimal.
+The FOX Calculator implements correct operator precedences, so expressions like
+2+3*5 yield the correct result, which is 17, and not 25.
+Also featured is a constant memory, which permanently stores its value even if
+you exit the calculator and restart it later.
+
+%package -n pathfinder
+Summary: contrib
+Group: X11/Applications
+Version: 1.0.0
+
+%description -n pathfinder
+PathFinder is a file browser application written using the FOX Toolkit.
+
+%package -n shutterbug
+Summary: Shutterbug Screenshot Utility
+Group: contrib
+Version: 2.0.0
+
+%description -n shutterbug
+Shutterbug is a FOX-based screenshot utility.
+
+%prep
+%setup -q
+
+%build
+CPPFLAGS="$RPM_OPT_FLAGS -frtti" CFLAGS="$RPM_OPT_FLAGS -frtti"
+./configure --prefix=%{_prefix} --mandir=\${prefix}/share/man --enable-release --with-xft --with-xcursor --enable-cups --with-opengl
+make
+
+%install
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
+rm -f doc/Makefile.am doc/Makefile.in doc/Makefile
+rm -r doc/art/Makefile.am doc/art/Makefile.in doc/art/Makefile
+rm -f doc/screenshots/Makefile.am doc/screenshots/Makefile.in doc/screenshots/Makefile
+rm -rf $RPM_BUILD_ROOT%{_prefix}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%{_libdir}/libFOX-1.2.so
+%{_libdir}/libFOX-1.2.so.0
+%{_libdir}/libFOX-1.2.so.0.0.*
+%{_libdir}/libCHART-1.2.so
+%{_libdir}/libCHART-1.2.so.0
+%{_libdir}/libCHART-1.2.so.0.0.*
+%doc doc
+%doc ADDITIONS AUTHORS INSTALL LICENSE README TRACING index.html
+
+%files devel
+%defattr(-,root,root)
+%{_bindir}/reswrap
+/usr/include/fox-1.2
+%{_libdir}/libFOX-1.2.la
+%{_libdir}/libCHART-1.2.la
+%{_mandir}/man1/reswrap.1*
+
+%files static
+%defattr(-,root,root)
+%{_libdir}/libFOX-1.2.a
+%{_libdir}/libCHART-1.2.a
+
+%files -n adie
+%defattr(-,root,root)
+%{_bindir}/adie
+%{_mandir}/man1/adie.1*
+
+%files -n calculator
+%defattr(-,root,root)
+%{_bindir}/calculator
+%{_mandir}/man1/calculator.1*
+
+%files -n pathfinder
+%defattr(-,root,root)
+%{_bindir}/PathFinder
+%{_mandir}/man1/PathFinder.1*
+
+%files -n shutterbug
+%defattr(-,root,root)
+%{_bindir}/shutterbug
+%{_mandir}/man1/shutterbug.1*
+
+%changelog
+* Tue Oct 19 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-1gd
+- new in tinysofa contrib
+
+* Tue May 25 2004 Roland Baudin <rolan65 at free.fr>
+- RPM build for Fedora Core 1
+
+* Thu Dec 4 2003 Lyle Johnson <lyle at knology.net>
+- incorporated Yan-Fa Li's changes for compatibility with latest RPM tools.
+
+* Thu Sep 25 2003 Lyle Johnson <lyle at knology.net>
+- added files for the new chart library to the fox, fox-devel and fox-static
+  packages.
+- added a Prefix tag to the header section so that this package is
+  relocatable.
+- Spin off Adie, calculator, PathFinder and shutterbug into their own subpackages.
+- Removed the '--with-opengl=opengl' flag from the %build section (no longer needed).
+
+* Thu Aug 28 2003 Lyle Johnson <lyle at users.sourceforge.net>
+- correct installed file names to reflect new naming scheme
+
+* Wed Aug 27 2002 Lyle Johnson <lyle at users.sourceforge.net>
+- remove Makefile scraps from the doc subdirectories
+
+* Wed Aug 21 2002 Lyle Johnson <lyle at users.sourceforge.net>
+- added the fox-devel and fox-static subpackages.
+
+* Tue Oct 10 2000 David Sugar <dyfet at ostel.com> 0.99.132-3
+- rtti forced for rpm build specs that use -fno-rtti.
+
+* Fri Mar 24 2000 Jos? Romildo Malaquias <romildo at iceb.ufpo.b> 0.99.122-1
+- new version
+
+* Fri Mar 24 2000 Jos? Romildo Malaquias <romildo at iceb.ufpo.b> 0.99.119-1
+- new version
+
+* Sun Mar 05 2000 Jos? Romildo Malaquias <romildo at iceb.ufpo.b>
+- some adaptations
+
+* Tue Nov 10 1998 Ren? van Paassen <M.M.vanPaassen at lr.tudelft.nl>
+- initial package


From svn at tinysofa.org  Sun Oct 24 20:41:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 24 Oct 2004 16:41:01 -0400 (EDT)
Subject: [tinysofa-svn] r5027 - tinysofa/releases/1.1/postfix/current/specs
Message-ID: <20041024204101.97A02344123@minbar.tinysofa.org>

Author: jh
Date: 2004-10-24 16:41:01 -0400 (Sun, 24 Oct 2004)
New Revision: 5027

Modified:
   tinysofa/releases/1.1/postfix/current/specs/postfix.spec
Log:
- 2.0.20
- multilib fixes


Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-10-24 20:27:38 UTC (rev 5026)
+++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-10-24 20:41:01 UTC (rev 5027)
@@ -1,7 +1,7 @@
 Summary: The Postfix mailer daemon
 Name: postfix
-Version: 2.0.19
-Release: 4ts
+Version: 2.0.20
+Release: 1jh
 License: IBM Public Licence
 Group: main
 Source: ftp://ftp.sunet.se/pub/unix/mail/postfix/official/postfix-%{version}.tar.gz
@@ -129,6 +129,7 @@
 %patch16 -p1
 %patch17 -p1 -b .pie
 
+
 %build
 make makefiles \
 	DEBUG="" \
@@ -149,6 +150,7 @@
 cd ..
 make LD_LIBRARY_PATH=`pwd`/lib
 
+
 %install
 make upgrade \
     install_root="${RPM_BUILD_ROOT}" \
@@ -197,7 +199,7 @@
 chmod 0600 $RPM_BUILD_ROOT/etc/postfix/prng_exch
 install -m 0644 conf/dynamicmaps.cf $RPM_BUILD_ROOT/etc/postfix
 
-#install postfix dynamic libs
+# install postfix dynamic libs
 install lib/*.so.1 $RPM_BUILD_ROOT%{_libdir}
 install lib/dict*  $RPM_BUILD_ROOT%{_libdir}/postfix/
 
@@ -226,10 +228,10 @@
 cat >> "$RPM_BUILD_ROOT%{_sysconfdir}/postfix/postfix-files" << EOF
 \$daemon_directory/dict_sdbm.so:f:root:-:755
 \$daemon_directory/dict_tcp.so:f:root:-:755
-/usr/lib/libpostfix-dns.so.1:f:root:-:755
-/usr/lib/libpostfix-global.so.1:f:root:-:755
-/usr/lib/libpostfix-master.so.1:f:root:-:755
-/usr/lib/libpostfix-util.so.1:f:root:-:755
+%{_libdir}/libpostfix-dns.so.1:f:root:-:755
+%{_libdir}/libpostfix-global.so.1:f:root:-:755
+%{_libdir}/libpostfix-master.so.1:f:root:-:755
+%{_libdir}/libpostfix-util.so.1:f:root:-:755
 \$config_directory/dynamicmaps.cf:f:root:-:644:p
 EOF
 TMPFILE=`mktemp /tmp/postfix.XXXXXX`
@@ -476,6 +478,10 @@
 %attr(644,root,root) %{_mandir}/man8/rmail.8*
 
 %changelog
+* Sun Oct 24 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.0.20-1jh
+- 2.0.20
+- multilib fixes
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.0.19-4ts
 - current (2.0.19-4jh) integrated as 2.0.19-4ts for release 1.1
 


From svn at tinysofa.org  Sun Oct 24 22:45:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 24 Oct 2004 18:45:25 -0400 (EDT)
Subject: [tinysofa-svn] r5028 - contrib/1.1/fox/current/specs
Message-ID: <20041024224525.A5F07344123@minbar.tinysofa.org>

Author: gda
Date: 2004-10-24 18:45:25 -0400 (Sun, 24 Oct 2004)
New Revision: 5028

Modified:
   contrib/1.1/fox/current/specs/fox.spec
Log:
fixed requirements

Modified: contrib/1.1/fox/current/specs/fox.spec
===================================================================
--- contrib/1.1/fox/current/specs/fox.spec	2004-10-24 20:41:01 UTC (rev 5027)
+++ contrib/1.1/fox/current/specs/fox.spec	2004-10-24 22:45:25 UTC (rev 5028)
@@ -1,14 +1,14 @@
 Summary: Shared libraries for the FOX 1.2.x toolkit.
 Name: fox
 Version: 1.2.9
-Release: 1gd
+Release: 2gd
 Copyright: LGPL
 Group: contrib
 Source: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz
 URL: http://www.fox-toolkit.org
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: gcc-c++ xorg-x11-devel xorg-x11-Mesa-libGLU
-Requires:  xorg-x11 xorg-x11-Mesa-libGLU
+Requires:  xorg-x11-libs xorg-x11-Mesa-libGLU
 
 %description
 FOX is a C++-based library for graphical user interface development
@@ -21,7 +21,7 @@
 %package devel
 Summary: Development files and documentation for the FOX GUI toolkit.
 Group: contrib
-
+Requires: %{name} = %{version}-%{release}
 %description devel
 The fox-devel package contains the files necessary to develop applications
 using the FOX GUI toolkit: the header files, the reswrap resource compiler,
@@ -141,6 +141,9 @@
 %{_mandir}/man1/shutterbug.1*
 
 %changelog
+* Tue Oct 24 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-2gd
+- fixed requirements
+
 * Tue Oct 19 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-1gd
 - new in tinysofa contrib
 


From svn at tinysofa.org  Mon Oct 25 10:45:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 25 Oct 2004 06:45:43 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5029 - in tinysofa/releases/1.1/postfix/current: sources specs
Message-ID: <20041025104543.C492E344129@minbar.tinysofa.org>

Author: jh
Date: 2004-10-25 06:45:41 -0400 (Mon, 25 Oct 2004)
New Revision: 5029

Added:
   tinysofa/releases/1.1/postfix/current/sources/pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz
   tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20.tar.gz
Removed:
   tinysofa/releases/1.1/postfix/current/sources/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz
   tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.19.tar.gz
Modified:
   tinysofa/releases/1.1/postfix/current/specs/postfix.spec
Log:
- update tls patch

Deleted: tinysofa/releases/1.1/postfix/current/sources/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/postfix/current/sources/pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/postfix/current/sources/pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.19.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/postfix/current/sources/postfix-2.0.20.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec
===================================================================
--- tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-10-24 22:45:25 UTC (rev 5028)
+++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec	2004-10-25 10:45:41 UTC (rev 5029)
@@ -8,11 +8,11 @@
 Source1: postfix-main.cf
 Source2: postfix-init
 # Postfix version of pfixtls patch. Normaly this should be the same as %version
-%define version_pfix 2.0.16
+%define version_pfix 2.0.18
 # The version of the TLS patch
 %define version_tls  0.8.16
 # the version of SSL the TLS patch is for
-%define version_ssl  0.9.7b
+%define version_ssl  0.9.7c
 Source3: ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-%{version_tls}-%{version_pfix}-%{version_ssl}.tar.gz
 Source4: postfix-master.cf
 Source5: postfix-transport
@@ -30,7 +30,6 @@
 Patch6: postfix-1.1.11-20020822-rmail.patch
 Patch7: postfix-1.1.4-mailname.patch
 Patch8: http://www.mat.cc/postfix/postfix-pg.postfix-2.0.0.2.patch
-#Patch9: pfixtls-%{version_tls}-%{version}-%{version_ssl}.patch
 Patch10: postfix-2.0.18-dynamicmaps-ipv6.patch
 Patch11: postfix-2.0.7-trustix.patch
 Patch12: postfix-2.0.13-saslpath.patch
@@ -52,6 +51,7 @@
 # only needs /usr/bin/cmp from diffutils
 Requires: /usr/bin/cmp
 Requires: openssl >= %{version_ssl}
+PreReq: /sbin/ldconfig
 Provides: smtpdaemon
 
 %description
@@ -117,9 +117,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-# get diff/patch from pfixtsl tgz, not as seperate patch
-#%patch9 -p1
-#patch -p1 < pfixtls-%{version_tls}-%{version_pfix}-%{version_ssl}/pfixtls.diff
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -275,6 +272,7 @@
 
 
 %post
+/sbin/ldconfig
 %service_post -o postfix
 /etc/postfix/postfix-dynupdate normal
 /etc/postfix/post-install upgrade-source
@@ -286,7 +284,7 @@
 %postun
 %service_postun postfix
 #refresh dynamic libraries
-ldconfig
+/sbin/ldconfig
 
 %post mysql
 /etc/postfix/postfix-dynupdate mysql-post >/dev/null 2>&1 || :


From svn at tinysofa.org  Mon Oct 25 21:42:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 25 Oct 2004 17:42:47 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5030 - in tinysofa/releases/1.1/fcron/current: sources specs
Message-ID: <20041025214247.379A9344129@minbar.tinysofa.org>

Author: jh
Date: 2004-10-25 17:42:45 -0400 (Mon, 25 Oct 2004)
New Revision: 5030

Added:
   tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.src.tar.gz
Removed:
   tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.4-selinux.patch
   tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.4.src.tar.gz
Modified:
   tinysofa/releases/1.1/fcron/current/specs/fcron.spec
Log:
- 2.9.5
- do not replace configuration files
- deny cron usage from users as default


Deleted: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.4-selinux.patch
===================================================================
--- tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.4-selinux.patch	2004-10-25 10:45:41 UTC (rev 5029)
+++ tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.4-selinux.patch	2004-10-25 21:42:45 UTC (rev 5030)
@@ -1,252 +0,0 @@
---- fcron-2.9.4.orig/job.c
-+++ fcron-2.9.4/job.c
-@@ -41,7 +41,7 @@
- char env_shell[PATH_LEN];
- #endif
- 
--#ifdef CONFIG_FLASK
-+#ifdef WITH_SELINUX
- extern char **environ;
- #endif
- 
-@@ -249,8 +249,8 @@
-  	int to_stdout = foreground && is_stdout(line->cl_option);
- 	int pipe_fd[2];
- 	short int mailpos = 0;	/* 'empty mail file' size */
--#ifdef CONFIG_FLASK
--	int flask_enabled = is_flask_enabled();
-+#ifdef WITH_SELINUX
-+	int flask_enabled = is_selinux_enabled();
- #endif
-  
- 	/* */
-@@ -352,10 +352,9 @@
- 	    debug("Execing \"%s -c %s\"", curshell, line->cl_shell);
- #endif /* CHECKJOBS */
- 
--#ifdef CONFIG_FLASK
--	    if(flask_enabled)
--		execle_secure(shell, line->cl_file->cf_user_sid, shell, "-c", line->cl_shell, NULL, environ);
--	    else
-+#ifdef WITH_SELINUX
-+	    if(flask_enabled && setexeccon(line->cl_file->cf_user_context) )
-+		die_e("Can't set execute context \"%s\".", line->cl_file->cf_user_context);
- #endif
- 	    execl(curshell, curshell, "-c", line->cl_shell, NULL);
- 	    /* execl returns only on error */
---- fcron-2.9.4.orig/configure.in
-+++ fcron-2.9.4/configure.in
-@@ -44,7 +44,6 @@
- AC_CHECK_HEADERS(sys/types.h sys/socket.h sys/un.h)
- AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h crypt.h shadow.h)
- AC_CHECK_HEADERS(sys/resource.h)
--AC_CHECK_HEADERS(flask_util.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -61,7 +60,7 @@
- AC_FUNC_STRFTIME
- AC_FUNC_WAIT3
- AC_CHECK_LIB(xnet, shutdown)
--AC_CHECK_LIB(secure, getsecsid, [flaskavail=1], [flaskavail=0])
-+AC_CHECK_LIB(selinux, getcon, [selinuxavail=1], [selinuxavail=0])
- AC_CHECK_FUNC(getloadavg, [getloadavg=1], [getloadavg=0])
- AC_CHECK_LIB(kstat, kstat_open, [kstat=1], [kstat=0])
- if test $getloadavg -eq 1; then
-@@ -925,7 +924,7 @@
-     AC_MSG_RESULT(no)
-     ;;
-   yes)
--    if test "$flaskavail" -eq 1; then
-+    if test "$selinuxavail" -eq 1; then
- 	useselinux=1
- 	AC_MSG_RESULT(yes)
-     else
-@@ -940,7 +939,7 @@
-     AC_MSG_ERROR(Must be set to either "yes" or "no".)
-     ;;
-   esac ],
--  if test "$useselinux" != "0" && test "$flaskavail" -eq 1; then
-+  if test "$useselinux" != "0" && test "$selinuxavail" -eq 1; then
-     useselinux=1
-     AC_MSG_RESULT(yes)
-   else
-@@ -949,8 +948,9 @@
-   fi
- )
- if test "$useselinux" -eq 1; then
--  LIBS="$LIBS -lsecure"
--  AC_DEFINE(CONFIG_FLASK)
-+  LIBS="$LIBS -lselinux"
-+  AC_DEFINE(WITH_SELINUX)
-+  CFLAGS="$CFLAGS -I/usr/include/selinux"
- fi
- 
- 
-@@ -1149,4 +1149,5 @@
- echo
- echo "You can now run 'make' to compile"
- echo "and then (as root) 'make install' to install fcron."
--echo
-\ No newline at end of file
-+echo
-+
---- fcron-2.9.4.orig/global.h
-+++ fcron-2.9.4/global.h
-@@ -43,12 +43,11 @@
- #include <errno.h>
- #endif
- 
--#ifdef CONFIG_FLASK
--#include <flask_util.h>
--#include <fs_secure.h>
--#include <ss.h>
--#include <linux/flask/av_permissions.h>
--#include <get_sid_list.h>
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#include <selinux/get_context_list.h>
-+#include <selinux/flask.h>
-+#include <selinux/av_permissions.h>
- #endif
- 
- #ifdef HAVE_GETOPT_H
-@@ -167,9 +166,9 @@
-     struct env_t *cf_env_base;  /* list of all env variables to set          */
-     int		  cf_running;	/* number of jobs running                    */
-     signed char	  cf_tzdiff;    /* time diff between system and local hour   */
--#ifdef CONFIG_FLASK
--    security_id_t cf_user_sid;
--    security_id_t cf_file_sid;
-+#ifdef WITH_SELINUX
-+    security_context_t cf_user_context;
-+    security_context_t cf_file_context;
- #endif
- } cf_t;
- 
---- fcron-2.9.4.orig/conf.c
-+++ fcron-2.9.4/conf.c
-@@ -437,11 +437,10 @@
-     struct passwd *pass = NULL;
-     short int type = 0, size = 0;
-     int rc;
--#ifdef CONFIG_FLASK
--    int flask_enabled = is_flask_enabled();
--    struct security_query qry;
--    struct security_response rsp;
-+#ifdef WITH_SELINUX
-+    int flask_enabled = is_selinux_enabled();
-     int retval;
-+    struct av_decision avd;
-     const char *user_name;
- #endif
- 
-@@ -453,16 +452,18 @@
- 
-     /* check if this file is owned by root : otherwise, all runas fields
-      * of this field should be set to the owner */
--#ifdef CONFIG_FLASK
--    if(flask_enabled)
--	rc = fstat_secure(fileno(ff), &file_stat, &cf->cf_file_sid);
--    else
--#endif
-     rc = fstat(fileno(ff), &file_stat);
-     if ( rc != 0 ) {
- 	error_e("Could not stat %s", file_name);
- 	goto err;
-     }
-+#ifdef WITH_SELINUX
-+    if(flask_enabled && fgetfilecon(fileno(ff), &cf->cf_file_context) < 0 )
-+    {
-+	error_e("Could not get context of %s", file_name);
-+	goto err;
-+    }
-+#endif
- 
-     if ( strncmp(file_name,"new.", 4) == 0 ) {
- 	if ( file_stat.st_uid == ROOTUID ) {
-@@ -495,7 +496,7 @@
- 	}
-     }
- 
--#ifdef CONFIG_FLASK
-+#ifdef WITH_SELINUX
-     /*
-      * Since crontab files are not directly executed,
-      * crond must ensure that the crontab file has
-@@ -507,17 +508,19 @@
- 	user_name = "system_u";
-     else
- 	user_name = cf->cf_user;
--    if(get_default_sid(user_name, 0, &cf->cf_user_sid))
--	error_e("NO SID for user \"%s\"", cf->cf_user_sid);
--    qry.ssid = cf->cf_user_sid;
--    qry.tsid = cf->cf_file_sid;
--    qry.tclass = SECCLASS_FILE;
--    qry.requested = FILE__ENTRYPOINT;
--    retval = security_compute_av(&qry, &rsp);
--    if(retval || ((qry.requested & rsp.allowed) != qry.requested)) {
--	syslog(LOG_ERR, "ENTRYPOINT FAILED for \"%s\" (SID %u) for file SID %u"
--	       , cf->cf_user, cf->cf_user_sid, cf->cf_file_sid);
--	goto err;
-+    if(flask_enabled)
-+    {
-+	if(get_default_context(user_name, NULL, &cf->cf_user_context))
-+	    error_e("NO CONTEXT for user \"%s\"", cf->cf_user_context);
-+	retval = security_compute_av(cf->cf_user_context, cf->cf_file_context
-+		, SECCLASS_FILE, FILE__ENTRYPOINT, &avd);
-+
-+	if(retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT))
-+	{
-+	    syslog(LOG_ERR, "ENTRYPOINT FAILED for user \"%s\" (CONTEXT %s) for file CONTEXT %s"
-+		, cf->cf_user, cf->cf_user_context, cf->cf_file_context);
-+	    goto err;
-+	}
-     }
- #endif
- 
-@@ -525,7 +528,7 @@
-     bzero(buf, sizeof(buf));
- 
-     /* get version of fcrontab file: it permits to daemon not to load
--     * a file which he won't understand the syntax, for exemple
-+     * a file which he won't understand the syntax, for example
-      * a file using a depreciated format generated by an old fcrontab,
-      * if the syntax has changed */
-     if ( read_type(fileno(ff), &type, &size) != OK || type != S_HEADER_T ||
---- fcron-2.9.4.orig/config.h.in
-+++ fcron-2.9.4/config.h.in
-@@ -393,7 +393,7 @@
- #undef HAVE_LIBSHADOW
- 
- /* Have SE Linux support */
--#undef CONFIG_FLASK
-+#undef WITH_SELINUX
- 
- /* Define if you have the xnet library (-lxnet).  */
- #undef HAVE_LIBXNET
---- fcron-2.9.4.orig/save.c
-+++ fcron-2.9.4/save.c
-@@ -298,12 +298,18 @@
-     int fd;
- 
-     /* open file */
--#ifdef CONFIG_FLASK
--    if ( is_flask_enabled() )
--	fd = open_secure(filename, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, S_IRUSR | S_IWUSR, file->cf_file_sid);
--    else
-+#ifdef WITH_SELINUX
-+    if ( is_selinux_enabled() && setfscreatecon(file->cf_file_context) )
-+    {
-+	error_e("Could not set create context for file %s", filename);
-+	return ERR;
-+    }
- #endif
-     fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, S_IRUSR|S_IWUSR);
-+#ifdef WITH_SELINUX
-+    if ( is_selinux_enabled() )
-+	setfscreatecon(NULL);
-+#endif
-     if ( fd == -1 ) {
- 	error_e("Could not open %s", filename);
- 	return ERR;

Deleted: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.4.src.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.src.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/fcron/current/sources/fcron-2.9.5.src.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec
===================================================================
--- tinysofa/releases/1.1/fcron/current/specs/fcron.spec	2004-10-25 10:45:41 UTC (rev 5029)
+++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec	2004-10-25 21:42:45 UTC (rev 5030)
@@ -1,19 +1,18 @@
 Summary: The fcron daemon for executing specified programs at set times
 Name: fcron
-Version: 2.9.4
-Release: 13ts
+Version: 2.9.5
+Release: 1jh
 License: GPL
 Group: main
 Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz
 Source1: fcron.init
 Source2: fcrontab-default
-Patch0: fcron-2.9.4-selinux.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Provides: crond
 PreReq: crontabs initscripts
 %accountman_requires
 %service_requires
-BuildRequires: autoconf postfix vim
+BuildRequires: autoconf postfix vim sed
 
 %description
 Fcron is a scheduler. It aims at replacing Vixie Cron, so it implements most
@@ -29,7 +28,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .selinux
 
 
 %build
@@ -62,13 +60,13 @@
 	DESTMAN=%{buildroot}%{_mandir} \
 	DESTDOC=%{buildroot}%{_docdir} \
 	FCRONTABS=%{buildroot}%{_localstatedir}/spool/fcron \
-	BINMODE=511 \
+	BINMODE=755 \
 	ROOTNAME=`id -un` \
 	ROOTGROUP=`id -gn` \
 	USERNAME=`id -un` \
 	GROUPNAME=`id -gn`
 
-chmod u+r %{buildroot}%{_sbindir}/fcron
+chmod u+rw %{buildroot}%{_sbindir}/* %{buildroot}%{_bindir}/*
 
 install -c -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/fcron
 install -c -m 755 convert-fcrontab %{buildroot}%{_bindir}
@@ -83,7 +81,9 @@
 
 install -m 644 %{SOURCE2} fcrontab-default
 
+sed -i '/^all$/d' %{buildroot}%{_sysconfdir}/fcron.allow
 
+
 %pre
 %groupadd fcron 108
 %useradd fcron 108 fcron -s /bin/false -c fcron
@@ -120,9 +120,9 @@
 %{_mandir}/man5/fcron.conf.5*
 %{_mandir}/man3/bitstring.3*
 %defattr(-,root,root)
-%attr(640,root,fcron) %config %{_sysconfdir}/fcron.conf
-%attr(640,root,fcron) %config %{_sysconfdir}/fcron.allow
-%attr(640,root,fcron) %config %{_sysconfdir}/fcron.deny
+%attr(640,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.conf
+%attr(640,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.allow
+%attr(640,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.deny
 %{_initrddir}/fcron
 %attr(6755,root,root) %{_bindir}/convert-fcrontab
 %attr(6755,root,root) %{_bindir}/fcronsighup
@@ -134,6 +134,11 @@
 
 
 %changelog
+* Tue Oct 26 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.5-1jh
+- 2.9.5
+- do not replace configuration files
+- deny cron usage from users as default
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 2.9.4-13ts
 - current (2.9.4-13jh) integrated as 2.9.4-13ts for release 1.1
 


From svn at tinysofa.org  Tue Oct 26 17:20:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 26 Oct 2004 13:20:17 -0400 (EDT)
Subject: [tinysofa-svn] r5031 - contrib/1.1/fox/current/specs
Message-ID: <20041026172017.8D0B4344129@minbar.tinysofa.org>

Author: gda
Date: 2004-10-26 13:20:16 -0400 (Tue, 26 Oct 2004)
New Revision: 5031

Modified:
   contrib/1.1/fox/current/specs/fox.spec
Log:
fixed some requirements

Modified: contrib/1.1/fox/current/specs/fox.spec
===================================================================
--- contrib/1.1/fox/current/specs/fox.spec	2004-10-25 21:42:45 UTC (rev 5030)
+++ contrib/1.1/fox/current/specs/fox.spec	2004-10-26 17:20:16 UTC (rev 5031)
@@ -7,8 +7,8 @@
 Source: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz
 URL: http://www.fox-toolkit.org
 BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: gcc-c++ xorg-x11-devel xorg-x11-Mesa-libGLU
-Requires:  xorg-x11-libs xorg-x11-Mesa-libGLU
+BuildRequires: gcc-c++ xorg-x11-devel xorg-x11-Mesa-libGLU libpng-devel
+Requires:  xorg-x11-libs xorg-x11-Mesa-libGLU libpng
 
 %description
 FOX is a C++-based library for graphical user interface development
@@ -21,7 +21,7 @@
 %package devel
 Summary: Development files and documentation for the FOX GUI toolkit.
 Group: contrib
-Requires: %{name} = %{version}-%{release}
+
 %description devel
 The fox-devel package contains the files necessary to develop applications
 using the FOX GUI toolkit: the header files, the reswrap resource compiler,
@@ -141,7 +141,7 @@
 %{_mandir}/man1/shutterbug.1*
 
 %changelog
-* Tue Oct 24 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-2gd
+* Mon Oct 25 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-2gd
 - fixed requirements
 
 * Tue Oct 19 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.9-1gd


From svn at tinysofa.org  Tue Oct 26 17:21:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 26 Oct 2004 13:21:46 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5032 - in contrib/1.1: . xfe xfe/current xfe/current/sources
	xfe/current/specs
Message-ID: <20041026172146.B46F7344129@minbar.tinysofa.org>

Author: gda
Date: 2004-10-26 13:21:46 -0400 (Tue, 26 Oct 2004)
New Revision: 5032

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

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


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

Added: contrib/1.1/xfe/current/specs/xfe.spec
===================================================================
--- contrib/1.1/xfe/current/specs/xfe.spec	2004-10-26 17:20:16 UTC (rev 5031)
+++ contrib/1.1/xfe/current/specs/xfe.spec	2004-10-26 17:21:46 UTC (rev 5032)
@@ -0,0 +1,98 @@
+%define icewm_menu 1
+
+# NB : For a static build, enable 'with-static=yes' and disable 'with-included-gettext'
+Name: xfe
+Version: 0.72
+Summary: X File Explorer (Xfe) is a filemanager for X. 
+Release: 1gd
+License: GPL
+Group: File tools
+Requires: fox >= 1.2 libpng >= 1.0
+BuildRequires: gcc-c++
+BuildRequires: fox >= 1.2 fox-devel >= 1.2 libpng-devel >= 1.0
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-buildroot
+
+%description
+X File Explorer (Xfe) is a filemanager for X. It is based on the popular X Win Commander, which is
+discontinued. Xfe is desktop independent and is written with the C++ Fox Toolkit. It has Windows Commander
+or MS-Explorer look and is very fast and simple. The main features are: file associations,
+mount/umount devices, directory tree for quick cd, change file attributes, auto
+save registry, compressed archives view/creation/extraction and much more.
+
+%prep
+%setup -q
+
+%build
+%configure --with-included-gettext --with-static=no
+make
+
+%install
+%makeinstall
+%find_lang %{name}
+if [ -f %{buildroot}%{_datadir}/locale/locale.alias ]; then
+	rm %{buildroot}%{_datadir}/locale/locale.alias
+fi
+%if %{icewm_menu}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icewm/icons
+cp $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png $RPM_BUILD_ROOT/%{_datadir}/icewm/icons 
+mkdir -p %{buildroot}%{_datadir}/icewm/programs
+cat << __EOF__ > %{buildroot}%{_datadir}/icewm/programs/%{name}
+prog "X File Explorer"                   xfe.png xfe
+__EOF__
+%endif
+
+
+%clean
+%clean_buildroot
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING README TODO FAQ BUGS
+%attr(755,root,root) %{_bindir}/*
+%{_libdir}/foxicons
+%{_libdir}/foxrc
+%{_datadir}/pixmaps/*
+%{_mandir}/man1/*
+%if %{icewm_menu}
+%{_datadir}/icewm/programs/%{name}
+%{_datadir}/icewm/icons/%{name}.png
+%endif
+
+
+%changelog
+* Tue Oct 19 2004 Gerald Dachs <gda at tinysofa dot org> 0.72-1gd
+- new in tinysofa contrib
+
+* Tue Aug 3 2004 Andrzej Stypula <andrzej at altair.krakow.pl>
+- locale adjustment
+
+* Thu Jul 29 2004 Andrzej Stypula <andrzej at altair.krakow.pl>
+- file permissions adjustment
+
+* Thu Jul 29 2004 Roland Baudin <roland65 at free.fr>
+- FOX 1.2.x support.
+
+* Fri Dec 19 2003 Roland Baudin <roland65 at free.fr>
+- Rebuild for Fedora Core 1.
+
+* Mon Oct 8 2003 Roland Baudin <roland65 at free.fr>
+- Add of libPNG requirements.
+
+* Mon Sep 8 2003 Roland Baudin <roland65 at free.fr>
+- Spec file for RedHat 9.
+
+* Fri Jul 18 2003 Roland Baudin <roland65 at free.fr>
+- Add of the man pages and fix of the locale.alias problem.
+
+* Mon Apr 14 2003 Roland Baudin <roland65 at free.fr>
+- Fixed the Xfe icon destination.
+ 
+* Fri Apr 11 2003 Roland Baudin <roland65 at free.fr>
+- Add of i18n.
+
+* Tue Jan 28 2003 Roland Baudin <roland65 at free.fr>
+- Add of the '--with-static' build option.
+
+* Thu Oct 15 2002 Roland Baudin <roland65 at free.fr>
+- First release of the spec file for RedHat 7.3.


From svn at tinysofa.org  Wed Oct 27 16:56:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 12:56:33 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5034 - in tinysofa/releases/1.1/libpng/current: sources specs
Message-ID: <20041027165633.E1DA634414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 12:56:33 -0400 (Wed, 27 Oct 2004)
New Revision: 5034

Added:
   tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7.tar.bz2
Removed:
   tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.5-all-patches.txt
   tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.5.tar.bz2
Modified:
   tinysofa/releases/1.1/libpng/current/specs/libpng.spec
Log:
- 1.2.7, which fixes security vulnerabilites

Deleted: tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.5-all-patches.txt
===================================================================
--- tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.5-all-patches.txt	2004-10-27 16:49:53 UTC (rev 5033)
+++ tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.5-all-patches.txt	2004-10-27 16:56:33 UTC (rev 5034)
@@ -1,328 +0,0 @@
-diff -r -U 3 libpng-1.2.5/png.h libpng-1.2.5p/png.h
---- libpng-1.2.5/png.h	Thu Oct  3 06:32:26 2002
-+++ libpng-1.2.5p/png.h	Tue Aug  3 21:45:21 2004
-@@ -833,7 +833,11 @@
- typedef png_info FAR * FAR * png_infopp;
- 
- /* Maximum positive integer used in PNG is (2^31)-1 */
--#define PNG_MAX_UINT ((png_uint_32)0x7fffffffL)
-+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-+#define PNG_UINT_32_MAX (~((png_uint_32)0))
-+#define PNG_SIZE_MAX (~((png_size_t)0))
-+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
-+#define PNG_MAX_UINT PNG_UINT_31_MAX
- 
- /* These describe the color_type field in png_info. */
- /* color type masks */
-@@ -2655,6 +2659,8 @@
- PNG_EXTERN png_uint_32 png_get_uint_32 PNGARG((png_bytep buf));
- PNG_EXTERN png_uint_16 png_get_uint_16 PNGARG((png_bytep buf));
- #endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
-+PNG_EXTERN png_uint_32 png_get_uint_31 PNGARG((png_structp png_ptr,
-+  png_bytep buf));
- 
- /* Initialize png_ptr struct for reading, and allocate any other memory.
-  * (old interface - DEPRECATED - use png_create_read_struct instead).
-diff -r -U 3 libpng-1.2.5/pngconf.h libpng-1.2.5p/pngconf.h
---- libpng-1.2.5/pngconf.h	Thu Oct  3 06:32:27 2002
-+++ libpng-1.2.5p/pngconf.h	Tue Aug  3 21:45:29 2004
-@@ -663,6 +663,13 @@
- #endif
- #endif /* PNG_1_0_X */
- 
-+#ifndef PNG_USER_WIDTH_MAX
-+#  define PNG_USER_WIDTH_MAX 1000000L
-+#endif
-+#ifndef PNG_USER_HEIGHT_MAX
-+#  define PNG_USER_HEIGHT_MAX 1000000L
-+#endif
-+
- /* These are currently experimental features, define them if you want */
- 
- /* very little testing */
-@@ -1280,6 +1287,7 @@
- #  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
- #  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
- #  define png_strcpy _fstrcpy
-+#  define png_strncpy _fstrncpy    /* Added to v 1.2.6 */
- #  define png_strlen _fstrlen
- #  define png_memcmp _fmemcmp      /* SJT: added */
- #  define png_memcpy _fmemcpy
-@@ -1288,6 +1296,7 @@
- #  define CVT_PTR(ptr)         (ptr)
- #  define CVT_PTR_NOCHECK(ptr) (ptr)
- #  define png_strcpy strcpy
-+#  define png_strncpy strncpy   /* Added to v 1.2.6 */
- #  define png_strlen strlen
- #  define png_memcmp memcmp     /* SJT: added */
- #  define png_memcpy memcpy
-diff -r -U 3 libpng-1.2.5/pngerror.c libpng-1.2.5p/pngerror.c
---- libpng-1.2.5/pngerror.c	Thu Oct  3 06:32:27 2002
-+++ libpng-1.2.5p/pngerror.c	Tue Aug  3 21:45:22 2004
-@@ -137,7 +137,7 @@
-    {
-       buffer[iout++] = ':';
-       buffer[iout++] = ' ';
--      png_memcpy(buffer+iout, error_message, 64);
-+      png_strncpy(buffer+iout, error_message, 63);
-       buffer[iout+63] = 0;
-    }
- }
-diff -r -U 3 libpng-1.2.5/pngpread.c libpng-1.2.5p/pngpread.c
---- libpng-1.2.5/pngpread.c	Thu Oct  3 06:32:28 2002
-+++ libpng-1.2.5p/pngpread.c	Tue Aug  3 21:45:22 2004
-@@ -208,7 +208,7 @@
-       }
- 
-       png_push_fill_buffer(png_ptr, chunk_length, 4);
--      png_ptr->push_length = png_get_uint_32(chunk_length);
-+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-@@ -591,6 +591,11 @@
-       png_size_t new_max;
-       png_bytep old_buffer;
- 
-+      if (png_ptr->save_buffer_size > PNG_SIZE_MAX - 
-+         (png_ptr->current_buffer_size + 256))
-+      {
-+        png_error(png_ptr, "Potential overflow of save_buffer");
-+      }
-       new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
-       old_buffer = png_ptr->save_buffer;
-       png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
-@@ -637,8 +642,7 @@
-       }
- 
-       png_push_fill_buffer(png_ptr, chunk_length, 4);
--      png_ptr->push_length = png_get_uint_32(chunk_length);
--
-+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-diff -r -U 3 libpng-1.2.5/pngread.c libpng-1.2.5p/pngread.c
---- libpng-1.2.5/pngread.c	Thu Oct  3 06:32:29 2002
-+++ libpng-1.2.5p/pngread.c	Tue Aug  3 21:45:22 2004
-@@ -384,7 +384,7 @@
-       png_uint_32 length;
- 
-       png_read_data(png_ptr, chunk_length, 4);
--      length = png_get_uint_32(chunk_length);
-+      length = png_get_uint_31(png_ptr,chunk_length);
- 
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-@@ -392,9 +392,6 @@
-       png_debug2(0, "Reading %s chunk, length=%lu.\n", png_ptr->chunk_name,
-          length);
- 
--      if (length > PNG_MAX_UINT)
--         png_error(png_ptr, "Invalid chunk length.");
--
-       /* This should be a binary subdivision search or a hash for
-        * matching the chunk name rather than a linear search.
-        */
-@@ -673,10 +670,7 @@
-             png_crc_finish(png_ptr, 0);
- 
-             png_read_data(png_ptr, chunk_length, 4);
--            png_ptr->idat_size = png_get_uint_32(chunk_length);
--
--            if (png_ptr->idat_size > PNG_MAX_UINT)
--              png_error(png_ptr, "Invalid chunk length.");
-+            png_ptr->idat_size = png_get_uint_31(png_ptr,chunk_length);
- 
-             png_reset_crc(png_ptr);
-             png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-@@ -946,16 +940,13 @@
- #endif /* PNG_GLOBAL_ARRAYS */
- 
-       png_read_data(png_ptr, chunk_length, 4);
--      length = png_get_uint_32(chunk_length);
-+      length = png_get_uint_31(png_ptr,chunk_length);
- 
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
- 
-       png_debug1(0, "Reading %s chunk.\n", png_ptr->chunk_name);
- 
--      if (length > PNG_MAX_UINT)
--         png_error(png_ptr, "Invalid chunk length.");
--
-       if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
-          png_handle_IHDR(png_ptr, info_ptr, length);
-       else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
-@@ -1298,6 +1289,9 @@
-     * PNG file before the first IDAT (image data chunk).
-     */
-    png_read_info(png_ptr, info_ptr);
-+
-+   if (info_ptr->height > PNG_UINT_32_MAX/sizeof(png_bytep))
-+      png_error(png_ptr,"Image is too high to process with png_read_png()");
- 
-    /* -------------- image transformations start here ------------------- */
- 
-diff -r -U 3 libpng-1.2.5/pngrtran.c libpng-1.2.5p/pngrtran.c
---- libpng-1.2.5/pngrtran.c	Thu Oct  3 06:32:29 2002
-+++ libpng-1.2.5p/pngrtran.c	Tue Aug  3 21:45:22 2004
-@@ -1889,8 +1889,8 @@
-          /* This changes the data from GG to GGXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 2;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1907,8 +1907,8 @@
-          /* This changes the data from GG to XXGG */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 2;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
-@@ -1965,8 +1965,8 @@
-          /* This changes the data from RRGGBB to RRGGBBXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1987,8 +1987,8 @@
-          /* This changes the data from RRGGBB to XXRRGGBB */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
-diff -r -U 3 libpng-1.2.5/pngrutil.c libpng-1.2.5p/pngrutil.c
---- libpng-1.2.5/pngrutil.c	Thu Oct  3 06:32:30 2002
-+++ libpng-1.2.5p/pngrutil.c	Tue Aug  3 21:45:22 2004
-@@ -38,6 +38,14 @@
- #  endif
- #endif
- 
-+png_uint_32 /* PRIVATE */
-+png_get_uint_31(png_structp png_ptr, png_bytep buf)
-+{
-+   png_uint_32 i = png_get_uint_32(buf);
-+   if (i > PNG_UINT_31_MAX)
-+     png_error(png_ptr, "PNG unsigned integer out of range.\n");
-+   return (i);
-+}
- #ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
- /* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
- png_uint_32 /* PRIVATE */
-@@ -579,7 +587,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place gAMA chunk");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
- #if defined(PNG_READ_sRGB_SUPPORTED)
-       && !(info_ptr->valid & PNG_INFO_sRGB)
- #endif
-@@ -660,7 +668,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place sBIT chunk");
-    }
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-    {
-       png_warning(png_ptr, "Duplicate sBIT chunk");
-       png_crc_finish(png_ptr, length);
-@@ -729,7 +737,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Missing PLTE before cHRM");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
- #if defined(PNG_READ_sRGB_SUPPORTED)
-       && !(info_ptr->valid & PNG_INFO_sRGB)
- #endif
-@@ -891,7 +899,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place sRGB chunk");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-    {
-       png_warning(png_ptr, "Duplicate sRGB chunk");
-       png_crc_finish(png_ptr, length);
-@@ -977,8 +985,7 @@
-    png_bytep pC;
-    png_charp profile;
-    png_uint_32 skip = 0;
--   png_uint_32 profile_size = 0;
--   png_uint_32 profile_length = 0;
-+   png_uint_32 profile_size, profile_length;
-    png_size_t slength, prefix_length, data_length;
- 
-    png_debug(1, "in png_handle_iCCP\n");
-@@ -995,7 +1002,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place iCCP chunk");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-    {
-       png_warning(png_ptr, "Duplicate iCCP chunk");
-       png_crc_finish(png_ptr, length);
-@@ -1154,8 +1161,18 @@
-    }
- 
-    new_palette.nentries = data_length / entry_size;
--   new_palette.entries = (png_sPLT_entryp)png_malloc(
-+   if (new_palette.nentries > PNG_SIZE_MAX / sizeof(png_sPLT_entry))
-+   {
-+       png_warning(png_ptr, "sPLT chunk too long");
-+       return;
-+   }
-+   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
-        png_ptr, new_palette.nentries * sizeof(png_sPLT_entry));
-+   if (new_palette.entries == NULL)
-+   {
-+       png_warning(png_ptr, "sPLT chunk requires too much memory");
-+       return;
-+   }
- 
- #ifndef PNG_NO_POINTER_INDEXING
-    for (i = 0; i < new_palette.nentries; i++)
-@@ -1241,7 +1258,8 @@
-          /* Should be an error, but we can cope with it */
-          png_warning(png_ptr, "Missing PLTE before tRNS");
-       }
--      else if (length > (png_uint_32)png_ptr->num_palette)
-+      if (length > (png_uint_32)png_ptr->num_palette ||
-+          length > PNG_MAX_PALETTE_LENGTH)
-       {
-          png_warning(png_ptr, "Incorrect tRNS chunk length");
-          png_crc_finish(png_ptr, length);
-diff -r -U 3 libpng-1.2.5/pngset.c libpng-1.2.5p/pngset.c
---- libpng-1.2.5/pngset.c	Thu Oct  3 06:32:30 2002
-+++ libpng-1.2.5p/pngset.c	Tue Aug  3 21:45:29 2004
-@@ -253,6 +253,8 @@
-       png_error(png_ptr, "Image width or height is zero in IHDR");
-    if (width > PNG_MAX_UINT || height > PNG_MAX_UINT)
-       png_error(png_ptr, "Invalid image size in IHDR");
-+   if (width > PNG_USER_WIDTH_MAX || height > PNG_USER_HEIGHT_MAX)
-+      png_error(png_ptr, "image size exceeds user limits in IHDR");
- 
-    /* check other values */
-    if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&

Deleted: tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.5.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/libpng/current/specs/libpng.spec
===================================================================
--- tinysofa/releases/1.1/libpng/current/specs/libpng.spec	2004-10-27 16:49:53 UTC (rev 5033)
+++ tinysofa/releases/1.1/libpng/current/specs/libpng.spec	2004-10-27 16:56:33 UTC (rev 5034)
@@ -1,12 +1,11 @@
 Summary: libpng, library for working with PNG files
 Name: libpng
-Version: 1.2.5
-Release: 14ts
+Version: 1.2.7
+Release: 1jh
 License: OSI
 Group: extra
-Source: http://www.libpng.org/pub/png/src/libpng-1.2.5.tar.bz2
-Patch: libpng-1.2.5-all-patches.txt
-BuildRoot: %{_tmppath}/%{name}-root
+Source: http://www.libpng.org/pub/png/src/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng12
 Obsoletes: libpng12
@@ -47,7 +46,6 @@
 
 %prep
 %setup -q -n libpng-%{version}
-%patch -p1
 ln -s scripts/makefile.linux Makefile
 
 %build
@@ -118,6 +116,9 @@
 
 
 %changelog
+* Fri Oct 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.7-1jh
+- 1.2.7, which fixes security vulnerabilites
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.2.5-14ts
 - current (1.2.5-14jh) integrated as 1.2.5-14ts for release 1.1
 


From svn at tinysofa.org  Wed Oct 27 16:57:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 12:57:58 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5035 - in tinysofa/releases/1.1: glibc/current/sources
	glibc/current/specs groff/current/sources groff/current/specs
	netatalk/current/specs
Message-ID: <20041027165758.85D7A34414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 12:57:57 -0400 (Wed, 27 Oct 2004)
New Revision: 5035

Added:
   tinysofa/releases/1.1/glibc/current/sources/glibc-catchsegv.patch
   tinysofa/releases/1.1/groff/current/sources/groff-1.19-tempfile.patch
Modified:
   tinysofa/releases/1.1/glibc/current/specs/glibc.spec
   tinysofa/releases/1.1/groff/current/specs/groff.spec
   tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec
Log:
- insecure tempfile handling fixes


Added: tinysofa/releases/1.1/glibc/current/sources/glibc-catchsegv.patch
===================================================================
--- tinysofa/releases/1.1/glibc/current/sources/glibc-catchsegv.patch	2004-10-27 16:56:33 UTC (rev 5034)
+++ tinysofa/releases/1.1/glibc/current/sources/glibc-catchsegv.patch	2004-10-27 16:57:57 UTC (rev 5035)
@@ -0,0 +1,52 @@
+===================================================================
+RCS file: /cvs/glibc/libc/debug/catchsegv.sh,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff -u -r1.16 -r1.17
+--- libc/debug/catchsegv.sh	2004/05/17 18:37:11	1.16
++++ libc/debug/catchsegv.sh	2004/10/19 10:34:20	1.17
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ # Contributed by Ulrich Drepper <drepper at cygnus.com>, 1998.
+ 
+@@ -39,7 +39,7 @@
+       ;;
+     --v | --ve | --ver | --vers | --versi | --versio | --version)
+       echo 'catchsegv (GNU libc) @VERSION@'
+-      echo 'Copyright (C) 2003 Free Software Foundation, Inc.
++      echo 'Copyright (C) 2004 Free Software Foundation, Inc.
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ Written by Ulrich Drepper.'
+@@ -50,9 +50,7 @@
+   esac
+ fi
+ 
+-segv_output=`basename "$prog"`.segv.$$
+-# Make sure this output file does not exist.
+-rm -f "$segv_output"
++segv_output=`mktemp ${TMPDIR:-/tmp}/segv_output.XXXXXX` || exit
+ 
+ # Redirect stderr to avoid termination message from shell.
+ (exec 3>&2 2>/dev/null
+@@ -65,7 +63,7 @@
+ # Check for output.  Even if the program terminated correctly it might
+ # be that a minor process (clone) failed.  Therefore we do not check the
+ # exit code.
+-if test -f "$segv_output"; then
++if test -s "$segv_output"; then
+   # The program caught a signal.  The output is in the file with the
+   # name we have in SEGFAULT_OUTPUT_NAME.  In the output the names of
+   # functions in shared objects are available, but names in the static
+@@ -102,7 +100,7 @@
+ 	    ;;
+      esac
+    done)
+-   rm -f "$segv_output"
+ fi
++rm -f "$segv_output"
+ 
+ exit $exval

Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec
===================================================================
--- tinysofa/releases/1.1/glibc/current/specs/glibc.spec	2004-10-27 16:56:33 UTC (rev 5034)
+++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec	2004-10-27 16:57:57 UTC (rev 5035)
@@ -20,6 +20,7 @@
 Patch2: %{name}-ppc-assume.patch
 Patch3: %{name}-execstack-disable.patch
 Patch4: %{name}-ia64-lib64.patch
+Patch10: glibc-catchsegv.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes:  linuxthreads, gencat, locale, ldconfig, locale-ja
@@ -265,6 +266,8 @@
 %endif
 %endif
 
+%patch10 -p1
+
 # Hack till glibc-kernheaders get updated, argh
 mkdir asm
 cat > asm/unistd.h <<EOF

Added: tinysofa/releases/1.1/groff/current/sources/groff-1.19-tempfile.patch
===================================================================
--- tinysofa/releases/1.1/groff/current/sources/groff-1.19-tempfile.patch	2004-10-27 16:56:33 UTC (rev 5034)
+++ tinysofa/releases/1.1/groff/current/sources/groff-1.19-tempfile.patch	2004-10-27 16:57:57 UTC (rev 5035)
@@ -0,0 +1,26 @@
+--- groff-1.19.1/contrib/groffer/groffer.sh.tempfile	2004-05-04 08:03:01.000000000 +0300
++++ groff-1.19.1/contrib/groffer/groffer.sh	2004-10-27 10:11:26.259624680 +0300
+@@ -3217,18 +3217,13 @@
+   do
+     if is_not_empty "$d"; then
+       if obj d is_dir && obj d is_writable; then
+-        _TMP_DIR="${d}/${_PROGRAM_NAME}${_PROCESS_ID}";
+-        if obj _TMP_DIR is_dir; then
+-	  rm -f "${_TMP_DIR}"/*;
++        _TMP_DIR="`mktemp -d ${d}/${_PROGRAM_NAME}.XXXXXX`";
++        if test $? = 0; then
+           break;
+         else
+-          mkdir "${_TMP_DIR}";
+-          if obj _TMP_DIR is_not_dir; then
+-            _TMP_DIR='';
+-	    continue;
+-          fi;
+-          break;
+-  	fi;
++          _TMP_DIR='';
++          continue;
++        fi
+       fi;
+       if obj _TMP_DIR is_not_writable; then
+ 	_TMP_DIR='';

Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec
===================================================================
--- tinysofa/releases/1.1/groff/current/specs/groff.spec	2004-10-27 16:56:33 UTC (rev 5034)
+++ tinysofa/releases/1.1/groff/current/specs/groff.spec	2004-10-27 16:57:57 UTC (rev 5035)
@@ -1,12 +1,13 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.19.1
-Release: 2ts
+Release: 3jh
 License: GPL
 Group: main
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 Source1: troff-to-ps.fpi
 Source2: nroff
+Patch0: groff-1.19-tempfile.patch
 Requires: mktemp libstdc++
 Requires: /usr/bin/iconv
 BuildRequires: byacc libstdc++-devel gcc-c++
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .tempfile
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.19.1-3jh
+- add tempfile patch
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.19.1-2ts
 - current (1.19.1-2jh) integrated as 1.19.1-2ts for release 1.1
 

Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec
===================================================================
--- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec	2004-10-27 16:56:33 UTC (rev 5034)
+++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec	2004-10-27 16:57:57 UTC (rev 5035)
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name: netatalk
 Version: 1.6.4
-Release: 6ts
+Release: 7ts
 License: GPL
 Group: extra
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
@@ -127,6 +127,7 @@
 %attr(755,root,root) %{_initrddir}/atalk
 %config(noreplace) %{_sysconfdir}/pam.d/netatalk
 %{_sbindir}/*
+%exclude %{_sbindir}/etc2ps.sh
 %{_bindir}/*
 %{_mandir}/man*/*
 %{_datadir}/netatalk
@@ -142,6 +143,9 @@
 
 
 %changelog
+* Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.6.4-7jh
+- exclude etc2ps.sh
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.6.4-6ts
 - current (1.6.4-6jh) integrated as 1.6.4-6ts for release 1.1
 


From svn at tinysofa.org  Wed Oct 27 16:58:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 12:58:48 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5036 - in tinysofa/releases/1.1/pam/current: sources specs
Message-ID: <20041027165848.B50AB34414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 12:58:48 -0400 (Wed, 27 Oct 2004)
New Revision: 5036

Added:
   tinysofa/releases/1.1/pam/current/sources/console.perms-sg.patch
Modified:
   tinysofa/releases/1.1/pam/current/specs/pam.spec
Log:
- update console.perms not to permit access to sg devices

Added: tinysofa/releases/1.1/pam/current/sources/console.perms-sg.patch
===================================================================
--- tinysofa/releases/1.1/pam/current/sources/console.perms-sg.patch	2004-10-27 16:57:57 UTC (rev 5035)
+++ tinysofa/releases/1.1/pam/current/sources/console.perms-sg.patch	2004-10-27 16:58:48 UTC (rev 5036)
@@ -0,0 +1,17 @@
+--- ./modules/pam_console/console.perms.orig
++++ ./modules/pam_console/console.perms
+@@ -25,12 +25,12 @@
+ 	/dev/mixer* /dev/sequencer \
+ 	/dev/sound/* /dev/beep \
+ 	/dev/snd/* 
+-<cdrom>=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom*
++<cdrom>=/dev/cdrom* /dev/cdroms/* /mnt/cdrom*
+ <pilot>=/dev/pilot
+ <jaz>=/mnt/jaz*
+ <zip>=/mnt/pocketzip* /mnt/zip*
+ <ls120>=/dev/ls120 /mnt/ls120*
+-<scanner>=/dev/scanner /dev/usb/scanner*
++<scanner>=/dev/usb/scanner*
+ <rio500>=/dev/usb/rio500
+ <camera>=/mnt/camera* /dev/usb/dc2xx* /dev/usb/mdc800*
+ <memstick>=/mnt/memstick*

Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec
===================================================================
--- tinysofa/releases/1.1/pam/current/specs/pam.spec	2004-10-27 16:57:57 UTC (rev 5035)
+++ tinysofa/releases/1.1/pam/current/specs/pam.spec	2004-10-27 16:58:48 UTC (rev 5036)
@@ -9,7 +9,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.77
-Release: 42ts
+Release: 43jh
 License: GPL or BSD
 Group: main
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -62,6 +62,8 @@
 Patch60: pam-selinux.patch
 Patch61: pam-pwdbselinux.patch
 
+Patch100: console.perms-sg.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts, glib, initscripts >= 3.94
 Obsoletes: pamconfig
@@ -145,6 +147,8 @@
 %patch61 -p1 -b .pwdbselinux 
 %endif
 
+%patch100 -p1
+
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
 done
@@ -408,6 +412,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.77-43jh
+- update console.perms not to permit access to sg devices
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 0.77-42ts
 - current (0.77-42jh) integrated as 0.77-42ts for release 1.1-U1
 


From svn at tinysofa.org  Wed Oct 27 17:44:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 13:44:55 -0400 (EDT)
Subject: [tinysofa-svn] r5037 - tinysofa/releases/1.1/fcron/current/specs
Message-ID: <20041027174455.74F7234414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 13:44:54 -0400 (Wed, 27 Oct 2004)
New Revision: 5037

Modified:
   tinysofa/releases/1.1/fcron/current/specs/fcron.spec
Log:
- allow root to use crontab as default

Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec
===================================================================
--- tinysofa/releases/1.1/fcron/current/specs/fcron.spec	2004-10-27 16:58:48 UTC (rev 5036)
+++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec	2004-10-27 17:44:54 UTC (rev 5037)
@@ -1,7 +1,7 @@
 Summary: The fcron daemon for executing specified programs at set times
 Name: fcron
 Version: 2.9.5
-Release: 1jh
+Release: 2jh
 License: GPL
 Group: main
 Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz
@@ -81,7 +81,7 @@
 
 install -m 644 %{SOURCE2} fcrontab-default
 
-sed -i '/^all$/d' %{buildroot}%{_sysconfdir}/fcron.allow
+sed -i 's/^all$/root/' %{buildroot}%{_sysconfdir}/fcron.allow
 
 
 %pre
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.5-2jh
+- allow root to use crontab as default
+
 * Tue Oct 26 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.5-1jh
 - 2.9.5
 - do not replace configuration files


From svn at tinysofa.org  Wed Oct 27 18:25:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 14:25:05 -0400 (EDT)
Subject: [tinysofa-svn] r5038 - in contrib/1.1/xpdf/current: sources specs
Message-ID: <20041027182505.6119B34414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 14:25:04 -0400 (Wed, 27 Oct 2004)
New Revision: 5038

Added:
   contrib/1.1/xpdf/current/sources/xpdf-3.00-PathScanner.patch
   contrib/1.1/xpdf/current/sources/xpdf-3.00-core.patch
   contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch
   contrib/1.1/xpdf/current/sources/xpdf-3.00-xfont.patch
Modified:
   contrib/1.1/xpdf/current/specs/xpdf.spec
Log:
- patch for can-2004-0888, can-2004-0889
- other patches


Added: contrib/1.1/xpdf/current/sources/xpdf-3.00-PathScanner.patch
===================================================================
--- contrib/1.1/xpdf/current/sources/xpdf-3.00-PathScanner.patch	2004-10-27 17:44:54 UTC (rev 5037)
+++ contrib/1.1/xpdf/current/sources/xpdf-3.00-PathScanner.patch	2004-10-27 18:25:04 UTC (rev 5038)
@@ -0,0 +1,125 @@
+--- xpdf-3.00/splash/Splash.cc.orig	2004-10-19 11:50:09.000000000 +0200
++++ xpdf-3.00/splash/Splash.cc	2004-10-19 11:50:46.000000000 +0200
+@@ -631,6 +631,9 @@
+   if (path->length == 0) {
+     return splashErrEmptyPath;
+   }
++  if (path->length == 1)
++    return splashErrBogusPath;
++
+   xPath = new SplashXPath(path, state->flatness, gTrue);
+   xPath->sort();
+   scanner = new SplashXPathScanner(xPath, eo);
+--- xpdf-3.00/splash/SplashXPathScanner.cc.orig	2004-10-21 16:36:41.170525604 +0200
++++ xpdf-3.00/splash/SplashXPathScanner.cc	2004-10-21 17:34:05.320376896 +0200
+@@ -39,54 +39,60 @@
+   xPath = xPathA;
+   eo = eoA;
+ 
++  xMin = 0;
++  xMax = 0;
++  yMin = 0;
++  yMax = 0;
++  interY = 0;
++  xPathIdx = 0;
++  inter = NULL;
++  interLen = interSize = 0;
++
+   // compute the bbox
+   seg = &xPath->segs[0];
+-  if (seg->x0 <= seg->x1) {
+-    xMinFP = seg->x0;
+-    xMaxFP = seg->x1;
+-  } else {
+-    xMinFP = seg->x1;
+-    xMaxFP = seg->x0;
+-  }
+-  if (seg->flags & splashXPathFlip) {
+-    yMinFP = seg->y1;
+-    yMaxFP = seg->y0;
+-  } else {
+-    yMinFP = seg->y0;
+-    yMaxFP = seg->y1;
+-  }
+-  for (i = 1; i < xPath->length; ++i) {
+-    seg = &xPath->segs[i];
+-    if (seg->x0 < xMinFP) {
++  if (seg) {
++    if (seg->x0 <= seg->x1) {
+       xMinFP = seg->x0;
+-    } else if (seg->x0 > xMaxFP) {
+-      xMaxFP = seg->x0;
+-    }
+-    if (seg->x1 < xMinFP) {
+-      xMinFP = seg->x1;
+-    } else if (seg->x1 > xMaxFP) {
+       xMaxFP = seg->x1;
++    } else {
++      xMinFP = seg->x1;
++      xMaxFP = seg->x0;
+     }
+     if (seg->flags & splashXPathFlip) {
+-      if (seg->y0 > yMaxFP) {
+-	yMaxFP = seg->y0;
+-      }
++      yMinFP = seg->y1;
++      yMaxFP = seg->y0;
+     } else {
+-      if (seg->y1 > yMaxFP) {
+-	yMaxFP = seg->y1;
++      yMinFP = seg->y0;
++      yMaxFP = seg->y1;
++    }
++    for (i = 1; i < xPath->length; ++i) {
++      seg = &xPath->segs[i];
++      if (seg->x0 < xMinFP) {
++        xMinFP = seg->x0;
++      } else if (seg->x0 > xMaxFP) {
++        xMaxFP = seg->x0;
++      }
++      if (seg->x1 < xMinFP) {
++        xMinFP = seg->x1;
++      } else if (seg->x1 > xMaxFP) {
++        xMaxFP = seg->x1;
++      }
++      if (seg->flags & splashXPathFlip) {
++        if (seg->y0 > yMaxFP) {
++          yMaxFP = seg->y0;
++        }
++      } else {
++        if (seg->y1 > yMaxFP) {
++          yMaxFP = seg->y1;
++        }
+       }
+     }
++    xMin = splashFloor(xMinFP);
++    xMax = splashFloor(xMaxFP);
++    yMin = splashFloor(yMinFP);
++    yMax = splashFloor(yMaxFP);
++    computeIntersections(yMin);
+   }
+-  xMin = splashFloor(xMinFP);
+-  xMax = splashFloor(xMaxFP);
+-  yMin = splashFloor(yMinFP);
+-  yMax = splashFloor(yMaxFP);
+-
+-  interY = 0;
+-  xPathIdx = 0;
+-  inter = NULL;
+-  interLen = interSize = 0;
+-  computeIntersections(yMin);
+ }
+ 
+ SplashXPathScanner::~SplashXPathScanner() {
+--- xpdf-3.00/splash/SplashFTFont.cc.orig	2004-10-19 11:50:55.000000000 +0200
++++ xpdf-3.00/splash/SplashFTFont.cc	2004-10-19 11:51:12.000000000 +0200
+@@ -225,6 +225,9 @@
+   if (FT_Get_Glyph(slot, &glyph)) {
+     return NULL;
+   }
++  if (glyph->format != FT_GLYPH_FORMAT_OUTLINE) {
++    return NULL;
++  }
+   path = new SplashPath();
+   FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline,
+ 		       &outlineFuncs, path);

Added: contrib/1.1/xpdf/current/sources/xpdf-3.00-core.patch
===================================================================
--- contrib/1.1/xpdf/current/sources/xpdf-3.00-core.patch	2004-10-27 17:44:54 UTC (rev 5037)
+++ contrib/1.1/xpdf/current/sources/xpdf-3.00-core.patch	2004-10-27 18:25:04 UTC (rev 5038)
@@ -0,0 +1,13 @@
+--- xpdf-3.00/xpdf/XPDFCore.cc.ud	2004-10-07 12:44:23.000000000 -0700
++++ xpdf-3.00/xpdf/XPDFCore.cc	2004-10-07 12:44:26.000000000 -0700
+@@ -1051,6 +1051,10 @@
+   GString *msg;
+   int i;
+ 
++  if (action == NULL)
++    // Nothing to do.
++    return;
++
+   switch (kind = action->getKind()) {
+ 
+   // GoTo / GoToR action

Added: contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch
===================================================================
--- contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch	2004-10-27 17:44:54 UTC (rev 5037)
+++ contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch	2004-10-27 18:25:04 UTC (rev 5038)
@@ -0,0 +1,296 @@
+--- xpdf-3.00/xpdf/Catalog.cc.orig	2004-10-18 16:51:35.824126848 +0200
++++ xpdf-3.00/xpdf/Catalog.cc	2004-10-18 16:53:06.634620045 +0200
+@@ -64,6 +64,15 @@
+   }
+   pagesSize = numPages0 = (int)obj.getNum();
+   obj.free();
++  // The gcc doesnt optimize this away, so this check is ok,
++  // even if it looks like a pagesSize != pagesSize check
++  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
++      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
++    error(-1, "Invalid 'pagesSize'");
++    ok = gFalse;
++    return;
++  }
++
+   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
+   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
+   for (i = 0; i < pagesSize; ++i) {
+@@ -191,6 +200,11 @@
+       }
+       if (start >= pagesSize) {
+ 	pagesSize += 32;
++        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
++            pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
++          error(-1, "Invalid 'pagesSize' parameter.");
++          goto err3;
++        }
+ 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
+ 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
+ 	for (j = pagesSize - 32; j < pagesSize; ++j) {
+--- xpdf-3.00/xpdf/XRef.cc.orig	2004-10-11 15:51:14.000000000 +0200
++++ xpdf-3.00/xpdf/XRef.cc	2004-10-11 15:56:48.000000000 +0200
+@@ -96,7 +96,7 @@
+   }
+   nObjects = obj1.getInt();
+   obj1.free();
+-  if (nObjects == 0) {
++  if (nObjects <= 0) {
+     goto err1;
+   }
+ 
+@@ -106,7 +106,15 @@
+   }
+   first = obj1.getInt();
+   obj1.free();
++  if (first < 0) {
++    goto err1;
++  }
+ 
++  if (nObjects*sizeof(int)/sizeof(int) != nObjects) {
++    error(-1, "Invalid 'nObjects'");
++    goto err1;
++  }
++ 
+   objs = new Object[nObjects];
+   objNums = (int *)gmalloc(nObjects * sizeof(int));
+   offsets = (int *)gmalloc(nObjects * sizeof(int));
+@@ -130,6 +138,12 @@
+     offsets[i] = obj2.getInt();
+     obj1.free();
+     obj2.free();
++    if (objNums[i] < 0 || offsets[i] < 0 ||
++	(i > 0 && offsets[i] < offsets[i-1])) {
++      delete parser;
++      gfree(offsets);
++      goto err1;
++    }
+   }
+   while (str->getChar() != EOF) ;
+   delete parser;
+@@ -369,10 +383,21 @@
+     }
+     n = obj.getInt();
+     obj.free();
++    if (first < 0 || n < 0 || first + n < 0) {
++      goto err1;
++    }
+     if (first + n > size) {
+       for (newSize = size ? 2 * size : 1024;
+-	   first + n > newSize;
++	   first + n > newSize && newSize > 0;
+ 	   newSize <<= 1) ;
++      if (newSize < 0) {
++	goto err1;
++      }
++      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
++        error(-1, "Invalid 'obj' parameters'");
++        goto err1;
++      }
++ 
+       entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
+       for (i = size; i < newSize; ++i) {
+ 	entries[i].offset = 0xffffffff;
+@@ -443,7 +468,7 @@
+ 
+   // check for an 'XRefStm' key
+   if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
+-    pos2 = obj2.getInt();
++    pos2 = (Guint)obj2.getInt();
+     readXRef(&pos2);
+     if (!ok) {
+       goto err1;
+@@ -474,7 +499,14 @@
+   }
+   newSize = obj.getInt();
+   obj.free();
++  if (newSize < 0) {
++    goto err1;
++  }
+   if (newSize > size) {
++    if (newSize * sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
++      error(-1, "Invalid 'size' parameter.");
++      return gFalse;
++    }
+     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
+     for (i = size; i < newSize; ++i) {
+       entries[i].offset = 0xffffffff;
+@@ -494,6 +526,9 @@
+     }
+     w[i] = obj2.getInt();
+     obj2.free();
++    if (w[i] < 0 || w[i] > 4) {
++      goto err1;
++    }
+   }
+   obj.free();
+ 
+@@ -513,13 +548,14 @@
+       }
+       n = obj.getInt();
+       obj.free();
+-      if (!readXRefStreamSection(xrefStr, w, first, n)) {
++      if (first < 0 || n < 0 ||
++	  !readXRefStreamSection(xrefStr, w, first, n)) {
+ 	idx.free();
+ 	goto err0;
+       }
+     }
+   } else {
+-    if (!readXRefStreamSection(xrefStr, w, 0, size)) {
++    if (!readXRefStreamSection(xrefStr, w, 0, newSize)) {
+       idx.free();
+       goto err0;
+     }
+@@ -551,10 +587,20 @@
+   Guint offset;
+   int type, gen, c, newSize, i, j;
+ 
++  if (first + n < 0) {
++    return gFalse;
++  }
+   if (first + n > size) {
+     for (newSize = size ? 2 * size : 1024;
+-	 first + n > newSize;
++	 first + n > newSize && newSize > 0;
+ 	 newSize <<= 1) ;
++    if (newSize < 0) {
++      return gFalse;
++    }
++    if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
++      error(-1, "Invalid 'size' inside xref table.");
++      return gFalse;
++    }
+     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
+     for (i = size; i < newSize; ++i) {
+       entries[i].offset = 0xffffffff;
+@@ -585,24 +631,26 @@
+       }
+       gen = (gen << 8) + c;
+     }
+-    switch (type) {
+-    case 0:
+-      entries[i].offset = offset;
+-      entries[i].gen = gen;
+-      entries[i].type = xrefEntryFree;
+-      break;
+-    case 1:
+-      entries[i].offset = offset;
+-      entries[i].gen = gen;
+-      entries[i].type = xrefEntryUncompressed;
+-      break;
+-    case 2:
+-      entries[i].offset = offset;
+-      entries[i].gen = gen;
+-      entries[i].type = xrefEntryCompressed;
+-      break;
+-    default:
+-      return gFalse;
++    if (entries[i].offset == 0xffffffff) {
++      switch (type) {
++      case 0:
++	entries[i].offset = offset;
++	entries[i].gen = gen;
++	entries[i].type = xrefEntryFree;
++	break;
++      case 1:
++	entries[i].offset = offset;
++	entries[i].gen = gen;
++	entries[i].type = xrefEntryUncompressed;
++	break;
++      case 2:
++	entries[i].offset = offset;
++	entries[i].gen = gen;
++	entries[i].type = xrefEntryCompressed;
++	break;
++      default:
++	return gFalse;
++      }
+     }
+   }
+ 
+@@ -664,38 +712,48 @@
+     // look for object
+     } else if (isdigit(*p)) {
+       num = atoi(p);
+-      do {
+-	++p;
+-      } while (*p && isdigit(*p));
+-      if (isspace(*p)) {
++      if (num > 0) {
+ 	do {
+ 	  ++p;
+-	} while (*p && isspace(*p));
+-	if (isdigit(*p)) {
+-	  gen = atoi(p);
++	} while (*p && isdigit(*p));
++	if (isspace(*p)) {
+ 	  do {
+ 	    ++p;
+-	  } while (*p && isdigit(*p));
+-	  if (isspace(*p)) {
++	  } while (*p && isspace(*p));
++	  if (isdigit(*p)) {
++	    gen = atoi(p);
+ 	    do {
+ 	      ++p;
+-	    } while (*p && isspace(*p));
+-	    if (!strncmp(p, "obj", 3)) {
+-	      if (num >= size) {
+-		newSize = (num + 1 + 255) & ~255;
+-		entries = (XRefEntry *)
+-		            grealloc(entries, newSize * sizeof(XRefEntry));
+-		for (i = size; i < newSize; ++i) {
+-		  entries[i].offset = 0xffffffff;
+-		  entries[i].type = xrefEntryFree;
++	    } while (*p && isdigit(*p));
++	    if (isspace(*p)) {
++	      do {
++		++p;
++	      } while (*p && isspace(*p));
++	      if (!strncmp(p, "obj", 3)) {
++		if (num >= size) {
++		  newSize = (num + 1 + 255) & ~255;
++		  if (newSize < 0) {
++		    error(-1, "Bad object number");
++		    return gFalse;
++		  }
++                  if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
++                    error(-1, "Invalid 'obj' parameters.");
++                    return gFalse;
++                  }
++		  entries = (XRefEntry *)
++		      grealloc(entries, newSize * sizeof(XRefEntry));
++		  for (i = size; i < newSize; ++i) {
++		    entries[i].offset = 0xffffffff;
++		    entries[i].type = xrefEntryFree;
++		  }
++		  size = newSize;
++		}
++		if (entries[num].type == xrefEntryFree ||
++		    gen >= entries[num].gen) {
++		  entries[num].offset = pos - start;
++		  entries[num].gen = gen;
++		  entries[num].type = xrefEntryUncompressed;
+ 		}
+-		size = newSize;
+-	      }
+-	      if (entries[num].type == xrefEntryFree ||
+-		  gen >= entries[num].gen) {
+-		entries[num].offset = pos - start;
+-		entries[num].gen = gen;
+-		entries[num].type = xrefEntryUncompressed;
+ 	      }
+ 	    }
+ 	  }
+@@ -705,6 +763,10 @@
+     } else if (!strncmp(p, "endstream", 9)) {
+       if (streamEndsLen == streamEndsSize) {
+ 	streamEndsSize += 64;
++        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
++          error(-1, "Invalid 'endstream' parameter.");
++          return gFalse;
++        }
+ 	streamEnds = (Guint *)grealloc(streamEnds,
+ 				       streamEndsSize * sizeof(int));
+       }

Added: contrib/1.1/xpdf/current/sources/xpdf-3.00-xfont.patch
===================================================================
--- contrib/1.1/xpdf/current/sources/xpdf-3.00-xfont.patch	2004-10-27 17:44:54 UTC (rev 5037)
+++ contrib/1.1/xpdf/current/sources/xpdf-3.00-xfont.patch	2004-10-27 18:25:04 UTC (rev 5038)
@@ -0,0 +1,11 @@
+--- xpdf-3.00/xpdf/XPDFViewer.cc.orig	2004-10-12 12:24:57.055068037 +0200
++++ xpdf-3.00/xpdf/XPDFViewer.cc	2004-10-12 12:24:47.707449614 +0200
+@@ -1742,7 +1742,7 @@
+   aboutBigFont =
+     createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
+   aboutVersionFont =
+-    createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1");
++    createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1");
+   aboutFixedFont =
+     createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
+ 

Modified: contrib/1.1/xpdf/current/specs/xpdf.spec
===================================================================
--- contrib/1.1/xpdf/current/specs/xpdf.spec	2004-10-27 17:44:54 UTC (rev 5037)
+++ contrib/1.1/xpdf/current/specs/xpdf.spec	2004-10-27 18:25:04 UTC (rev 5038)
@@ -7,7 +7,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.00
-Release: 2jh
+Release: 3jh
 License: GPL
 Epoch: 0
 Url: http://www.foolabs.com/xpdf/
@@ -30,7 +30,13 @@
 Patch3: xpdf-2.02-ext.patch
 Patch4: xpdf-3.00-freetype.patch
 Patch5: xpdf-3.0-cjk-font.patch
+Patch6: xpdf-3.00-core.patch
+Patch7: xpdf-3.00-xfont.patch
+Patch8: xpdf-3.00-PathScanner.patch
 
+# security fix
+Patch100: xpdf-3.00-overflow.patch
+
 # for ghostscript fonts
 Requires: ghostscript
 #Requires: urw-fonts
@@ -106,12 +112,18 @@
 
 %prep
 %setup -q -a 1 -a 3 -a 4 -a 5 -a 6
-%patch -p1 -b .r
-%patch1 -p1
+%patch -p1
 %patch3 -p1 -b .ext
 %patch4 -p1 -b .freetype217
 %patch5 -p1 -b .cjk
+%patch6 -p1 -b .core
+%patch7 -p1 -b .fonts
+%patch8 -p1 -b .path
 
+# securiy fix
+%patch100 -p1 -b .sec
+
+
 %build
 export PATH="$PATH:/usr/X11R6/bin"
 pushd t1lib-%{t1lib_version}
@@ -225,6 +237,10 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
+* Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.00-3jh
+- patch for can-2004-0888, can-2004-0889
+- other patches
+
 * Tue Oct 12 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.00-2jh
 - add icewm menu
 


From svn at tinysofa.org  Wed Oct 27 18:35:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 14:35:55 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5039 - in tinysofa/releases/1.1/module-init-tools/current: sources
	specs
Message-ID: <20041027183555.5884B34415F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 14:35:54 -0400 (Wed, 27 Oct 2004)
New Revision: 5039

Added:
   tinysofa/releases/1.1/module-init-tools/current/sources/modprobe.conf.dist
   tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch
Modified:
   tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec
Log:
- add modprobe.conf.dist
- spec cleanups


Added: tinysofa/releases/1.1/module-init-tools/current/sources/modprobe.conf.dist
===================================================================
--- tinysofa/releases/1.1/module-init-tools/current/sources/modprobe.conf.dist	2004-10-27 18:25:04 UTC (rev 5038)
+++ tinysofa/releases/1.1/module-init-tools/current/sources/modprobe.conf.dist	2004-10-27 18:35:54 UTC (rev 5039)
@@ -0,0 +1,165 @@
+# default modutils aliases
+alias binfmt-204 binfmt_aout
+alias binfmt-263 binfmt_aout
+alias binfmt-264 binfmt_aout
+alias binfmt-267 binfmt_aout
+alias binfmt-387 binfmt_aout
+alias block-major-1-* rd
+alias block-major-3-* ide-probe-mod
+alias block-major-8-* sd_mod
+alias block-major-9-* md
+alias block-major-11-* sr_mod
+alias block-major-13-* xd
+alias block-major-15-* cdu31a
+alias block-major-16-* gscd
+alias block-major-17-* optcd
+alias block-major-18-* sjcd
+alias block-major-20-* mcdx
+alias block-major-22-* ide-probe-mod
+alias block-major-23-* mcd
+alias block-major-24-* sonycd535
+alias block-major-25-* sbpcd
+alias block-major-26-* sbpcd
+alias block-major-27-* sbpcd
+alias block-major-29-* aztcd
+alias block-major-32-* cm206
+alias block-major-33-* ide-probe-mod
+alias block-major-34-* ide-probe-mod
+alias block-major-37-* ide-tape
+alias block-major-44-* ftl
+alias block-major-46-* pcd
+alias block-major-47-* pf
+alias block-major-56-* ide-probe-mod
+alias block-major-57-* ide-probe-mod
+alias block-major-88-* ide-probe-mod
+alias block-major-89-* ide-probe-mod
+alias block-major-90-* ide-probe-mod
+alias block-major-91-* ide-probe-mod
+alias block-major-93-* nftl
+alias block-major-113-* viocd
+alias char-major-4-* serial
+alias char-major-5-* serial
+alias char-major-9-* st
+alias char-major-10-2 msbusmouse
+alias char-major-10-3 atixlmouse
+alias char-major-10-135 rtc
+alias char-major-10-139 openprom
+alias char-major-10-157 applicom
+alias char-major-10-175 agpgart
+alias char-major-10-250 hci_vhci
+alias char-major-13-* input
+alias char-major-13-0 joydev
+alias char-major-13-32 mousedev
+alias char-major-19-* cyclades
+alias char-major-20-* cyclades
+alias char-major-22-* pcxx
+alias char-major-23-* pcxx
+alias char-major-27-* zftape
+alias char-major-34-* scc
+alias char-major-35-* tclmidi
+alias char-major-36-* netlink
+alias char-major-48-* riscom8
+alias char-major-49-* riscom8
+alias char-major-57-* esp
+alias char-major-58-* esp
+alias char-major-63-* kdebug
+alias char-major-90-* mtdchar
+alias char-major-96-* pt
+alias char-major-97-* pg
+alias char-major-107-* 3dfx
+alias char-major-109-* lvm-mod
+alias char-major-188-* usbserial
+alias char-major-200-* vxspec
+alias char-major-206-* osst
+alias char-major-216-* rfcomm
+alias dos msdos
+alias dummy0 dummy
+alias dummy1 dummy
+alias iso9660 isofs
+alias net-pf-1 unix
+alias net-pf-2 ipv4
+alias net-pf-17 af_packet
+alias netalias-2 ip_alias
+alias irlan0 irlan
+alias irda-dongle-0 tekram
+alias irda-dongle-1 esi
+alias irda-dongle-2 actisys
+alias irda-dongle-3 actisys
+alias irda-dongle-4 girbil
+alias irda-dongle-5 litelink
+alias irda-dongle-6 airport
+alias irda-dongle-7 old_belkin
+alias plip0 plip
+alias plip1 plip
+alias tunl0 ipip
+alias cipcb0 cipcb
+alias cipcb1 cipcb
+alias cipcb2 cipcb
+alias cipcb3 cipcb
+alias slip0 slip
+alias slip1 slip
+alias tty-ldisc-1 slip
+alias tty-ldisc-3 ppp_async
+alias tty-ldisc-11 irtty-sir
+alias tty-ldisc-14 ppp_synctty
+alias tty-ldisc-15 hci_uart
+alias ppp-compress-18 ppp_mppe
+install ppp-compress-21 /bin/true
+alias ppp-compress-24 ppp_deflate
+alias ppp-compress-26 ppp_deflate
+alias parport_lowlevel parport_pc
+alias usbdevfs usbcore
+alias xfrm-type-2-50 esp4
+alias xfrm-type-2-51 ah4
+alias xfrm-type-2-108 ipcomp
+alias xfrm-type-10-50 esp6
+alias xfrm-type-10-51 ah6
+alias xfrm-type-10-108 ipcomp6
+alias cipher_null crypto_null
+alias digest_null crypto_null
+alias compress_null crypto_null
+alias sha384 sha512
+install binfmt-0000 /bin/true
+install binfmt_misc /sbin/modprobe --first-time --ignore-install binfmt_misc && { /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; }
+install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; }
+install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; }
+install char-major-10 /bin/true
+install char-major-10-1 /bin/true
+install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
+install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
+install net-pf-19 /bin/true
+install net-pf-3 /bin/true
+install net-pf-6 /bin/true
+install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp
+install scsi_hostadapter /bin/true
+install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; }
+remove binfmt_misc { /bin/umount /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove binfmt_misc
+remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; }
+remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse
+remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc
+remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd
+
+
+alias usb-uhci uhci-hcd
+alias usb-ohci ohci-hcd
+alias uhci uhci-hcd
+
+alias char-major-116-* snd
+alias sound-service-*-0 snd-mixer-oss
+alias sound-service-*-1 snd-seq-oss
+alias sound-service-*-3 snd-pcm-oss
+alias sound-service-*-8 snd-seq-oss
+alias sound-service-*-12 snd-pcm-oss
+
+install sound-slot-* /sbin/modprobe snd-card-${MODPROBE_MODULE##sound[_-]slot[_-]}
+
+install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss
+install snd-pcm-device /sbin/modprobe --ignore_install snd-seq-device && /sbin/modprobe snd-seq-oss
+
+alias nfs4 nfs
+alias rpc_pipefs sunrpc
+alias rpc_svc_gss_pipefs sunrpc
+
+install eth1394 /bin/true
+
+install snd-emu10k1 /sbin/modprobe --ignore-install snd-emu10k1 && /sbin/modprobe snd-emu10k1-synth

Added: tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch
===================================================================
--- tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch	2004-10-27 18:25:04 UTC (rev 5038)
+++ tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch	2004-10-27 18:35:54 UTC (rev 5039)
@@ -0,0 +1,34 @@
+--- module-init-tools-3.1-pre5/modprobe.c.dist	2004-06-20 05:34:34.000000000 -0400
++++ module-init-tools-3.1-pre5/modprobe.c	2004-09-01 12:57:26.214587739 -0400
+@@ -59,6 +59,10 @@
+ #define MODULE_DIR "/lib/modules"
+ #endif
+ 
++#define DEFAULT_CONFIG "/etc/modprobe.conf"
++#define DIST_CONFIG "/etc/modprobe.conf.dist"
++#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
++
+ typedef void (*errfn_t)(const char *fmt, ...);
+ 
+ /* Do we use syslog or stderr for messages? */
+@@ -971,7 +975,12 @@
+ 	char *line;
+ 	unsigned int linenum = 0;
+ 	FILE *cfile;
++ 	char *result = NULL;
+ 
++	if (!strcmp(filename, DEFAULT_CONFIG))
++		result = read_config(DIST_CONFIG, name,
++				     dump_only, removing,
++				     options, commands, alias);
+ 	cfile = fopen(filename, "r");
+ 	if (!cfile)
+ 		return 0;
+@@ -1209,7 +1218,6 @@
+ 				   { "first-time", 0, NULL, 3 },
+ 				   { NULL, 0, NULL, 0 } };
+ 
+-#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
+ 
+ /* This is a horrible hack to allow devfsd, which calls modprobe with
+    -C /etc/modules.conf or /etc/modules.devfs, to work.  FIXME. */

Modified: tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec
===================================================================
--- tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec	2004-10-27 18:25:04 UTC (rev 5038)
+++ tinysofa/releases/1.1/module-init-tools/current/specs/module-init-tools.spec	2004-10-27 18:35:54 UTC (rev 5039)
@@ -1,12 +1,14 @@
-Summary: The kernel module init tools.
+Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.0
-Release: 7jh
+Release: 8jh
 License: GPL
 Group: main
 Source: http://kernel.us.themoes.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
+Source1: modprobe.conf.dist
 Source2: kmod.crond
-BuildRoot: %{_tmppath}/%{name}-root
+Patch0: module-init-tools-defconfig.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
 Requires: crond
 PreReq: modutils >= 2.4.26-2tr
@@ -19,9 +21,12 @@
 programs.  Examples of loaded and unloaded modules are device drivers and
 filesystems, as well as some other things.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .dist
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
 		--disable-combined \
@@ -31,18 +36,23 @@
 		--exec-prefix=/
 %make 
 
+
 %install
-mkdir -p $RPM_BUILD_ROOT/etc/cron.hourly
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly
 mkdir -p $RPM_BUILD_ROOT/{%{_mandir}/man{1,2,8},sbin}
 make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install-man
 mv $RPM_BUILD_ROOT/bin/lsmod $RPM_BUILD_ROOT/sbin/
 
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.conf.dist
+
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/kmod
 touch $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.conf
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
 # don't generate /etc/modprobe.conf here
 exit 0
@@ -62,12 +72,17 @@
 
 %files
 %defattr(-,root,root)
+%{_sysconfdir}/modprobe.conf.dist
 /sbin/*
 %{_mandir}/*/*
 %{_sysconfdir}/cron.hourly/kmod
 %ghost %{_sysconfdir}/modprobe.conf
 
 %changelog
+* Wed Oct 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0-7jh
+- add modprobe.conf.dist
+- spec cleanups
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 3.0-6ts
 - current (3.0-6jh) integrated as 3.0-6ts for release 1.1-U1
 


From svn at tinysofa.org  Wed Oct 27 18:39:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 27 Oct 2004 14:39:28 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5040 - tinysofa/releases/1.1/module-init-tools/current/sources
Message-ID: <20041027183928.A55A834414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-27 14:39:28 -0400 (Wed, 27 Oct 2004)
New Revision: 5040

Modified:
   tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch
Log:
- fix defconfig patch


Modified: tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch
===================================================================
--- tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch	2004-10-27 18:35:54 UTC (rev 5039)
+++ tinysofa/releases/1.1/module-init-tools/current/sources/module-init-tools-defconfig.patch	2004-10-27 18:39:28 UTC (rev 5040)
@@ -1,6 +1,6 @@
---- module-init-tools-3.1-pre5/modprobe.c.dist	2004-06-20 05:34:34.000000000 -0400
-+++ module-init-tools-3.1-pre5/modprobe.c	2004-09-01 12:57:26.214587739 -0400
-@@ -59,6 +59,10 @@
+--- module-init-tools-3.0-pre10/modprobe.c.orig	2004-02-12 01:56:34.000000000 -0500
++++ module-init-tools-3.0-pre10/modprobe.c	2004-02-24 00:11:15.097495564 -0500
+@@ -58,6 +61,10 @@
  #define MODULE_DIR "/lib/modules"
  #endif
  
@@ -11,23 +11,22 @@
  typedef void (*errfn_t)(const char *fmt, ...);
  
  /* Do we use syslog or stderr for messages? */
-@@ -971,7 +975,12 @@
- 	char *line;
+@@ -919,6 +927,10 @@
+ 	char *result = NULL;
  	unsigned int linenum = 0;
- 	FILE *cfile;
-+ 	char *result = NULL;
  
 +	if (!strcmp(filename, DEFAULT_CONFIG))
-+		result = read_config(DIST_CONFIG, name,
++		result = read_config(DIST_CONFIG, 1, name,
 +				     dump_only, removing,
-+				     options, commands, alias);
++				     options, commands);
  	cfile = fopen(filename, "r");
- 	if (!cfile)
- 		return 0;
-@@ -1209,7 +1218,6 @@
+ 	if (!cfile) {
+ 		if (mustload)
+@@ -1084,8 +1096,6 @@
  				   { "first-time", 0, NULL, 3 },
  				   { NULL, 0, NULL, 0 } };
  
+-#define DEFAULT_CONFIG "/etc/modprobe.conf"
 -#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs"
  
  /* This is a horrible hack to allow devfsd, which calls modprobe with


From svn at tinysofa.org  Thu Oct 28 16:41:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 28 Oct 2004 12:41:54 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5041 - in tinysofa/releases/1.1/libxml2/current: sources specs
Message-ID: <20041028164154.BDAC134414F@minbar.tinysofa.org>

Author: jh
Date: 2004-10-28 12:41:53 -0400 (Thu, 28 Oct 2004)
New Revision: 5041

Added:
   tinysofa/releases/1.1/libxml2/current/sources/libxml2-2.6.15.tar.gz
Removed:
   tinysofa/releases/1.1/libxml2/current/sources/libxml2-2.6.14.tar.gz
Modified:
   tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec
Log:
- update to 2.6.15, which fixes CAN-2004-0989 (Bug ID #12)

Deleted: tinysofa/releases/1.1/libxml2/current/sources/libxml2-2.6.14.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/libxml2/current/sources/libxml2-2.6.15.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/libxml2/current/sources/libxml2-2.6.15.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec
===================================================================
--- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec	2004-10-27 18:39:28 UTC (rev 5040)
+++ tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec	2004-10-28 16:41:53 UTC (rev 5041)
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.14
+Version: 2.6.15
 Release: 1jh
 License: MIT
 Group: main
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Thu Oct 28 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.6.15-1jh
+- update to 2.6.15, which fixes CAN-2004-0989 (Bug ID #12)
+
 * Thu Sep 30 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.6.14-1jh
 - 2.6.14
 - spec cleanup


From svn at tinysofa.org  Sat Oct 30 18:19:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 30 Oct 2004 14:19:30 -0400 (EDT)
Subject: [tinysofa-svn] 
	r5042 - in contrib/1.1/sylpheed/current: sources specs
Message-ID: <20041030181930.8F75B344185@minbar.tinysofa.org>

Author: gda
Date: 2004-10-30 14:19:29 -0400 (Sat, 30 Oct 2004)
New Revision: 5042

Added:
   contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta1.tar.bz2
Removed:
   contrib/1.1/sylpheed/current/sources/sylpheed-0.9.12.tar.bz2
Modified:
   contrib/1.1/sylpheed/current/specs/sylpheed.spec
Log:
new upstream

Deleted: contrib/1.1/sylpheed/current/sources/sylpheed-0.9.12.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta1.tar.bz2
===================================================================
(Binary files differ)


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

Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec
===================================================================
--- contrib/1.1/sylpheed/current/specs/sylpheed.spec	2004-10-28 16:41:53 UTC (rev 5041)
+++ contrib/1.1/sylpheed/current/specs/sylpheed.spec	2004-10-30 18:19:29 UTC (rev 5042)
@@ -1,7 +1,7 @@
 Summary: a GTK+ based, lightweight, and fast e-mail client
 Name: sylpheed
-Version: 0.9.12
-Release: 2jh
+Version: 1.0.0beta1
+Release: 1gd
 Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Copyright: GPL
 URL: http://sylpheed.good-day.net/
@@ -56,6 +56,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Oct 30 2004 Gerald Dachs <gda at tinysofa dot org> 1.0.0beta1-1gd
+- 1.0.0beta1
+
 * Wed Sep 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.9.12-2jh
 - own directories under %%{_datadir}
 


From svn at tinysofa.org  Sun Oct 31 14:25:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 09:25:46 -0500 (EST)
Subject: [tinysofa-svn] 
	r5043 - tinysofa/releases/1.1/filesystem/current/specs
Message-ID: <20041031142546.D245D344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 09:25:45 -0500 (Sun, 31 Oct 2004)
New Revision: 5043

Modified:
   tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec
Log:
- add support for multilib arches
- define /mnt/* as %%ghost to avoid upgrade problems


Modified: tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec
===================================================================
--- tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec	2004-10-30 18:19:29 UTC (rev 5042)
+++ tinysofa/releases/1.1/filesystem/current/specs/filesystem.spec	2004-10-31 14:25:45 UTC (rev 5043)
@@ -33,6 +33,8 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 mkdir -p $RPM_BUILD_ROOT/home
 mkdir -p $RPM_BUILD_ROOT/initrd
+mkdir -p $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT/%{_lib}/tls
 mkdir -p $RPM_BUILD_ROOT/lib
 mkdir -p $RPM_BUILD_ROOT/lib/modules
 mkdir -p $RPM_BUILD_ROOT/mnt
@@ -48,15 +50,18 @@
 mkdir -p $RPM_BUILD_ROOT/usr
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/include
+mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}
+mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/gcc-lib
+mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/tls
 mkdir -p $RPM_BUILD_ROOT/usr/lib
 mkdir -p $RPM_BUILD_ROOT/usr/libexec
-mkdir -p $RPM_BUILD_ROOT/usr/lib/gcc-lib
 mkdir -p $RPM_BUILD_ROOT/usr/local
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 mkdir -p $RPM_BUILD_ROOT/usr/local/doc
 mkdir -p $RPM_BUILD_ROOT/usr/local/etc
 mkdir -p $RPM_BUILD_ROOT/usr/local/games
 mkdir -p $RPM_BUILD_ROOT/usr/local/info
+mkdir -p $RPM_BUILD_ROOT/usr/local/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/usr/local/lib
 mkdir -p $RPM_BUILD_ROOT/usr/local/man
 mkdir -p $RPM_BUILD_ROOT/usr/local/man/man1
@@ -126,8 +131,8 @@
 %dir /lib
 %dir /lib/modules
 %dir /mnt
-%dir /mnt/cdrom
-%dir /mnt/floppy
+%ghost %config(missingok) %verify(not size md5 mode user link rdev group mtime)  %dir /mnt/cdrom
+%ghost %config(missingok) %verify(not size md5 mode user link rdev group mtime)  %dir /mnt/floppy
 %dir /opt
 %dir %attr(555,root,root) /proc
 %dir %attr(700,root,root) /root
@@ -140,25 +145,9 @@
 %dir /usr/include
 %dir /usr/lib
 %dir /usr/libexec
-%dir /usr/lib/gcc-lib
-%dir /usr/local
-%dir /usr/local/bin
-%dir /usr/local/doc
-%dir /usr/local/etc
-%dir /usr/local/games
-%dir /usr/local/info
-%dir /usr/local/lib
-%dir /usr/local/man
-%dir /usr/local/man/man1
-%dir /usr/local/man/man2
-%dir /usr/local/man/man3
-%dir /usr/local/man/man4
-%dir /usr/local/man/man5
-%dir /usr/local/man/man6
-%dir /usr/local/man/man7
-%dir /usr/local/man/man8
-%dir /usr/local/sbin
-%dir /usr/local/src
+%dir /usr/%{_lib}/gcc-lib
+%dir /usr/%{_lib}/tls
+/usr/local
 %dir /usr/sbin
 %dir /usr/share
 %dir /usr/share/doc
@@ -192,8 +181,17 @@
 %dir /var/state
 %dir /var/state/misc
 %dir %attr(1777,root,root) /var/tmp
+%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
+%dir /%{_lib}
+%dir /%{_lib}/tls
+%dir /usr/%{_lib}
+%endif
 
 %changelog
+* Sat Oct 30 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- add support for multilib arches
+- define /mnt/* as %%ghost to avoid upgrade problems
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 1.0-5ts
 - current (1.0-5gd) integrated as 1.0-5ts for release 1.1-U1
 


From svn at tinysofa.org  Sun Oct 31 14:30:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 09:30:45 -0500 (EST)
Subject: [tinysofa-svn] 
	r5044 - in tinysofa/releases/1.1/openssh/current: sources specs
Message-ID: <20041031143045.7C24A344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 09:30:44 -0500 (Sun, 31 Oct 2004)
New Revision: 5044

Added:
   tinysofa/releases/1.1/openssh/current/sources/openssh-3.8.1p1.tar.gz
Removed:
   tinysofa/releases/1.1/openssh/current/sources/openssh-3.8p1.tar.gz
Modified:
   tinysofa/releases/1.1/openssh/current/specs/openssh.spec
Log:
- 3.8.1p1
- fix a spec file error which caused it to compile without pie
- makes it also compile on x86_64


Added: tinysofa/releases/1.1/openssh/current/sources/openssh-3.8.1p1.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/openssh/current/sources/openssh-3.8.1p1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/openssh/current/sources/openssh-3.8p1.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec
===================================================================
--- tinysofa/releases/1.1/openssh/current/specs/openssh.spec	2004-10-31 14:25:45 UTC (rev 5043)
+++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec	2004-10-31 14:30:44 UTC (rev 5044)
@@ -3,8 +3,8 @@
 
 Summary: OpenSSH free Secure Shell (SSH) implementation
 Name: openssh
-Version: 3.8.0p1
-Release: 6ts
+Version: 3.8.1p1
+Release: 1jh
 License: BSD
 Group: main
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{realversion}.tar.gz
@@ -94,11 +94,11 @@
 %build
 %if %{with_selinux}
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DWITH_SELINUX"
+%endif
 
 LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
 LIBS="-lresolv"; export LIBS
 
-%endif
 CFLAGS="$RPM_OPT_FLAGS -fpie" \
     ./configure --prefix=/usr \
                 --sysconfdir=/etc/ssh \
@@ -201,6 +201,11 @@
 %attr(0644,root,root) %config(noreplace) /etc/ssh/sshd_config
 
 %changelog
+* Sat Oct 30 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.8.1p1-1jh
+- 3.8.1p1
+- fix a spec file error which caused it to compile without pie
+- makes it also compile on x86_64
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 3.8.0p1-6ts
 - current (3.8.0p1-6jh) integrated as 3.8.0p1-6ts for release 1.1
 


From svn at tinysofa.org  Sun Oct 31 17:25:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 12:25:16 -0500 (EST)
Subject: [tinysofa-svn] 
	r5045 - in tinysofa/releases/1.1/kerberos5/current: sources specs
Message-ID: <20041031172516.99B70344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 12:25:15 -0500 (Sun, 31 Oct 2004)
New Revision: 5045

Added:
   tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz
   tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz.asc
Removed:
   tinysofa/releases/1.1/kerberos5/current/sources/2004-002-dblfree_patch.txt
   tinysofa/releases/1.1/kerberos5/current/sources/2004-003-patch_1.3.4.txt
   tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.4.tar.gz
Modified:
   tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec
Log:
- 1.3.5
- large file support
- copile with -fPIC and links with -pie


Deleted: tinysofa/releases/1.1/kerberos5/current/sources/2004-002-dblfree_patch.txt
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/sources/2004-002-dblfree_patch.txt	2004-10-31 14:30:44 UTC (rev 5044)
+++ tinysofa/releases/1.1/kerberos5/current/sources/2004-002-dblfree_patch.txt	2004-10-31 17:25:15 UTC (rev 5045)
@@ -1,268 +0,0 @@
-Index: src/clients/klist/klist.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/clients/klist/klist.c,v
-retrieving revision 5.63
-diff -c -r5.63 klist.c
-*** src/clients/klist/klist.c	11 Apr 2002 03:21:46 -0000	5.63
---- src/clients/klist/klist.c	23 Aug 2004 03:37:26 -0000
-***************
-*** 614,619 ****
---- 614,622 ----
-  
-      if (show_etype) {
-  	retval = krb5_decode_ticket(&cred->ticket, &tkt);
-+ 	if (retval)
-+ 	    goto err_tkt;
-+ 
-  	if (!extra_field)
-  	    fputs("\t",stdout);
-  	else
-***************
-*** 622,629 ****
-  	       etype_string(cred->keyblock.enctype));
-  	printf("%s ",
-  	       etype_string(tkt->enc_part.enctype));
-- 	krb5_free_ticket(kcontext, tkt);
-  	extra_field++;
-      }
-  
-      /* if any additional info was printed, extra_field is non-zero */
---- 625,635 ----
-  	       etype_string(cred->keyblock.enctype));
-  	printf("%s ",
-  	       etype_string(tkt->enc_part.enctype));
-  	extra_field++;
-+ 
-+     err_tkt:
-+ 	if (tkt != NULL)
-+ 	    krb5_free_ticket(kcontext, tkt);
-      }
-  
-      /* if any additional info was printed, extra_field is non-zero */
-Index: src/krb524/krb524d.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/krb524/krb524d.c,v
-retrieving revision 1.55.2.3
-diff -c -r1.55.2.3 krb524d.c
-*** src/krb524/krb524d.c	28 May 2003 04:06:31 -0000	1.55.2.3
---- src/krb524/krb524d.c	23 Aug 2004 03:37:26 -0000
-***************
-*** 582,589 ****
-  	  printf("v4 credentials encoded\n");
-  
-   error:
-!      if (v5tkt->enc_part2)
-  	 krb5_free_enc_tkt_part(context, v5tkt->enc_part2);
-  
-       if(v5_service_key.contents)
-         krb5_free_keyblock_contents(context, &v5_service_key);
---- 582,591 ----
-  	  printf("v4 credentials encoded\n");
-  
-   error:
-!      if (v5tkt->enc_part2) {
-  	 krb5_free_enc_tkt_part(context, v5tkt->enc_part2);
-+ 	 v5tkt->enc_part2 = NULL;
-+      }
-  
-       if(v5_service_key.contents)
-         krb5_free_keyblock_contents(context, &v5_service_key);
-Index: src/lib/krb5/asn.1/asn1buf.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/asn1buf.c,v
-retrieving revision 5.24
-diff -c -r5.24 asn1buf.c
-*** src/lib/krb5/asn.1/asn1buf.c	12 Mar 2003 04:33:30 -0000	5.24
---- src/lib/krb5/asn.1/asn1buf.c	23 Aug 2004 03:37:27 -0000
-***************
-*** 255,260 ****
---- 255,261 ----
-    (*code)->data = (char*)malloc((((*code)->length)+1)*sizeof(char));
-    if ((*code)->data == NULL) {
-      free(*code);
-+     *code = NULL;
-      return ENOMEM;
-    }
-    for(i=0; i < (*code)->length; i++)
-Index: src/lib/krb5/asn.1/krb5_decode.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/krb5_decode.c,v
-retrieving revision 5.40.2.5
-diff -c -r5.40.2.5 krb5_decode.c
-*** src/lib/krb5/asn.1/krb5_decode.c	10 Oct 2003 23:57:38 -0000	5.40.2.5
---- src/lib/krb5/asn.1/krb5_decode.c	23 Aug 2004 03:37:27 -0000
-***************
-*** 183,190 ****
-  #define cleanup(cleanup_routine)\
-     return 0; \
-  error_out: \
-!    if (rep && *rep) \
-  	cleanup_routine(*rep); \
-     return retval;
-  
-  #define cleanup_none()\
---- 183,192 ----
-  #define cleanup(cleanup_routine)\
-     return 0; \
-  error_out: \
-!    if (rep && *rep) { \
-  	cleanup_routine(*rep); \
-+ 	*rep = NULL; \
-+    } \
-     return retval;
-  
-  #define cleanup_none()\
-***************
-*** 233,238 ****
---- 235,241 ----
-        free_field(*rep,checksum);
-        free_field(*rep,client);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 254,260 ****
-    { begin_structure();
-      { krb5_kvno kvno;
-        get_field(kvno,0,asn1_decode_kvno);
-!       if(kvno != KVNO) return KRB5KDC_ERR_BAD_PVNO;
-      }
-      alloc_field((*rep)->server,krb5_principal_data);
-      get_field((*rep)->server,1,asn1_decode_realm);
---- 257,263 ----
-    { begin_structure();
-      { krb5_kvno kvno;
-        get_field(kvno,0,asn1_decode_kvno);
-!       if(kvno != KVNO) clean_return(KRB5KDC_ERR_BAD_PVNO);
-      }
-      alloc_field((*rep)->server,krb5_principal_data);
-      get_field((*rep)->server,1,asn1_decode_realm);
-***************
-*** 268,273 ****
---- 271,277 ----
-    if (rep && *rep) {
-        free_field(*rep,server);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 320,325 ****
---- 324,330 ----
-        free_field(*rep,session);
-        free_field(*rep,client);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 403,408 ****
---- 408,414 ----
-    if (rep && *rep) {
-        free_field(*rep,ticket);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 451,456 ****
---- 457,463 ----
-    if (rep && *rep) {
-        free_field(*rep,subkey);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 556,561 ****
---- 563,569 ----
-    if (rep && *rep) {
-        free_field(*rep,checksum);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 614,619 ****
---- 622,628 ----
-        free_field(*rep,r_address);
-        free_field(*rep,s_address);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 668,673 ****
---- 677,683 ----
-        free_field(*rep,r_address);
-        free_field(*rep,s_address);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-***************
-*** 713,718 ****
---- 723,729 ----
-        free_field(*rep,server);
-        free_field(*rep,client);
-        free(*rep);
-+       *rep = NULL;
-    }
-    return retval;
-  }
-Index: src/lib/krb5/krb/rd_rep.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/rd_rep.c,v
-retrieving revision 5.33.2.2
-diff -c -r5.33.2.2 rd_rep.c
-*** src/lib/krb5/krb/rd_rep.c	14 Jun 2003 00:09:47 -0000	5.33.2.2
---- src/lib/krb5/krb/rd_rep.c	23 Aug 2004 03:37:27 -0000
-***************
-*** 71,76 ****
---- 71,78 ----
-  
-      /* now decode the decrypted stuff */
-      retval = decode_krb5_ap_rep_enc_part(&scratch, repl);
-+     if (retval)
-+ 	goto clean_scratch;
-  
-      /* Check reply fields */
-      if (((*repl)->ctime != auth_context->authentp->ctime) ||
-Index: src/lib/krb5/krb/send_tgs.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/send_tgs.c,v
-retrieving revision 5.55.2.1
-diff -c -r5.55.2.1 send_tgs.c
-*** src/lib/krb5/krb/send_tgs.c	13 May 2004 19:27:59 -0000	5.55.2.1
---- src/lib/krb5/krb/send_tgs.c	23 Aug 2004 03:37:27 -0000
-***************
-*** 269,274 ****
---- 269,276 ----
-  	    if (!tcp_only) {
-  		krb5_error *err_reply;
-  		retval = decode_krb5_error(&rep->response, &err_reply);
-+ 		if (retval)
-+ 		    goto send_tgs_error_3;
-  		if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) {
-  		    tcp_only = 1;
-  		    krb5_free_error(context, err_reply);
-***************
-*** 277,282 ****
---- 279,286 ----
-  		    goto send_again;
-  		}
-  		krb5_free_error(context, err_reply);
-+ 	    send_tgs_error_3:
-+ 		;
-  	    }
-  	    rep->message_type = KRB5_ERROR;
-  	} else if (krb5_is_tgs_rep(&rep->response))

Deleted: tinysofa/releases/1.1/kerberos5/current/sources/2004-003-patch_1.3.4.txt
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/sources/2004-003-patch_1.3.4.txt	2004-10-31 14:30:44 UTC (rev 5044)
+++ tinysofa/releases/1.1/kerberos5/current/sources/2004-003-patch_1.3.4.txt	2004-10-31 17:25:15 UTC (rev 5045)
@@ -1,17 +0,0 @@
-Index: src/lib/krb5/asn.1/asn1buf.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/asn1buf.c,v
-retrieving revision 5.24
-*** src/lib/krb5/asn.1/asn1buf.c	12 Mar 2003 04:33:30 -0000	5.24
---- src/lib/krb5/asn.1/asn1buf.c	23 Aug 2004 03:43:47 -0000
-***************
-*** 122,127 ****
---- 122,129 ----
-        return ASN1_OVERRUN;
-    }
-    while (nestlevel > 0) {
-+     if (buf->bound - buf->next + 1 <= 0)
-+       return ASN1_OVERRUN;
-      retval = asn1_get_tag_2(buf, &t);
-      if (retval) return retval;
-      if (!t.indef) {

Deleted: tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.4.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz.asc
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz.asc	2004-10-31 14:30:44 UTC (rev 5044)
+++ tinysofa/releases/1.1/kerberos5/current/sources/krb5-1.3.5.tar.gz.asc	2004-10-31 17:25:15 UTC (rev 5045)
@@ -0,0 +1,9 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (SunOS)
+
+iQCVAwUAQUISYKbDgE/zdoE9AQEq3QP+LF6rwRM9AUVi00ZmUl3BUvZrlZKHLxHx
+sl6hYdS+yCqhvHSIpCkVa8BgHCtgpP138le1DyLmQBOSQ2a8SpG1RV1mORTa8Lf5
+tfFlN3LhXWreuGVurgR8rXy+6fmC2AviLWpn8s4h7Oo6OhMakMFB58g4IcKhgjEy
+Uh+0Sza8Rm4=
+=o8Ec
+-----END PGP SIGNATURE-----

Modified: tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-10-31 14:30:44 UTC (rev 5044)
+++ tinysofa/releases/1.1/kerberos5/current/specs/kerberos5.spec	2004-10-31 17:25:15 UTC (rev 5045)
@@ -1,16 +1,14 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
-Version: 1.3.4
-Release: 2ts
+Version: 1.3.5
+Release: 1jh
 Group: main
 Source0: krb5-%{version}.tar.gz
-Patch0: http://web.mit.edu/kerberos/advisories/2004-002-dblfree_patch.txt
-Patch1: http://web.mit.edu/kerberos/advisories/2004-003-patch_1.3.4.txt
 URL: http://web.mit.edu/kerberos
 License: Distributable
 Requires: libcom_err libtermcap ncurses
 BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 (MIT) Kerberos is a network authentication protocol. It is designed to provide
@@ -39,14 +37,16 @@
 
 %prep
 %setup -q -n krb5-%{version}
-%patch0 -p0 -b .dblfree-2004-002
-%patch1 -p0 -b .asn1buf-2004-003
 
 
 %build
 pushd src
-export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et"
+export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC"
 export CFLAGS="$CFLAGS -DKRB5_DNS_LOOKUP=1"
+%ifarch %{ix86} s390 ppc sparc
+export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+%endif
+export LDFLAGS="$LDFLAGS -pie"
 %configure \
 	--enable-shared \
 	--program-prefix=krb5 \
@@ -88,6 +88,11 @@
 
 
 %changelog
+* Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.5-1jh
+- 1.3.5
+- large file support
+- copile with -fPIC and links with -pie
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 1.3.4-2ts
 - current (1.3.4-2jh) integrated as 1.3.4-2ts for release 1.1-U1
 


From svn at tinysofa.org  Sun Oct 31 17:26:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 12:26:07 -0500 (EST)
Subject: [tinysofa-svn] 
	r5046 - in tinysofa/releases/1.1: openssl/current/specs
	tcp_wrappers/current/specs
Message-ID: <20041031172607.0676C344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 12:26:06 -0500 (Sun, 31 Oct 2004)
New Revision: 5046

Modified:
   tinysofa/releases/1.1/openssl/current/specs/openssl.spec
   tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec
Log:
- x86_64 fixes


Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec
===================================================================
--- tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-10-31 17:25:15 UTC (rev 5045)
+++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec	2004-10-31 17:26:06 UTC (rev 5046)
@@ -136,13 +136,14 @@
 
 
 %install
+# /usr/lib is correct here!
 %{__mkdir_p} \
 	$RPM_BUILD_ROOT/%{_mandir} \
 	$RPM_BUILD_ROOT/%{_sysconfdir}/ssl \
 	$RPM_BUILD_ROOT/%{_bindir} \
 	$RPM_BUILD_ROOT/%{_includedir}/openssl \
-	$RPM_BUILD_ROOT/%{_libdir} \
-	$RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+	$RPM_BUILD_ROOT/usr/lib \
+	$RPM_BUILD_ROOT/usr/lib/pkgconfig
 
 make INSTALL_PREFIX=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/ssl/misc/* $RPM_BUILD_ROOT/%{_bindir}

Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec
===================================================================
--- tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec	2004-10-31 17:25:15 UTC (rev 5045)
+++ tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec	2004-10-31 17:26:06 UTC (rev 5046)
@@ -9,7 +9,7 @@
 Patch1: tcpw7.2-setenv.patch
 Patch2: tcpw7.6-netgroup.patch
 Patch3: tcp_wrappers-7.6-strerror.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The tcp_wrappers package provides small daemon programs which can
@@ -34,14 +34,14 @@
 %make LDFLAGS="-pie" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" linux
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/{include,lib,share/man/man3,share/man/man5,share/man/man8,sbin}
+mkdir -p $RPM_BUILD_ROOT/usr/{include,%{_lib},share/man/man3,share/man/man5,share/man/man8,sbin}
 
 cp hosts_access.3 $RPM_BUILD_ROOT/usr/share/man/man3
 cp hosts_access.5 hosts_options.5 $RPM_BUILD_ROOT/usr/share/man/man5
 cp tcpd.8 tcpdchk.8 tcpdmatch.8 $RPM_BUILD_ROOT/usr/share/man/man8
 ln -sf hosts_access.5 $RPM_BUILD_ROOT/usr/share/man/man5/hosts.allow.5
 ln -sf hosts_access.5 $RPM_BUILD_ROOT/usr/share/man/man5/hosts.deny.5
-cp libwrap.a $RPM_BUILD_ROOT/%{_libdir}
+cp libwrap.a $RPM_BUILD_ROOT/usr/%{_lib}
 cp tcpd.h $RPM_BUILD_ROOT/usr/include
 install -m755 safe_finger $RPM_BUILD_ROOT/usr/sbin
 install -m755 tcpd $RPM_BUILD_ROOT/usr/sbin


From svn at tinysofa.org  Sun Oct 31 17:26:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 12:26:53 -0500 (EST)
Subject: [tinysofa-svn] r5047 - tinysofa/releases/1.1/httpd/current/specs
Message-ID: <20041031172653.B2FEA344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 12:26:53 -0500 (Sun, 31 Oct 2004)
New Revision: 5047

Modified:
   tinysofa/releases/1.1/httpd/current/specs/httpd.spec
Log:
- fix buildroot


Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec
===================================================================
--- tinysofa/releases/1.1/httpd/current/specs/httpd.spec	2004-10-31 17:26:06 UTC (rev 5046)
+++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec	2004-10-31 17:26:53 UTC (rev 5047)
@@ -79,7 +79,7 @@
 
 License: Apache Software License
 Group: main
-BuildRoot: %{_tmppath}/%{name}-%{version-}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: db4-devel, expat-devel, findutils, perl, pkgconfig, ed
 BuildRequires: apr-devel >= 0.9.4-15, apr-util-devel, pcre-devel, automake, autoconf, libtool
 BuildRequires: zlib-devel cyrus-sasl-devel


From svn at tinysofa.org  Sun Oct 31 18:02:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 13:02:59 -0500 (EST)
Subject: [tinysofa-svn] r5048 - tinysofa/releases/1.1/openssh/current/specs
Message-ID: <20041031180259.A3290344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 13:02:59 -0500 (Sun, 31 Oct 2004)
New Revision: 5048

Modified:
   tinysofa/releases/1.1/openssh/current/specs/openssh.spec
Log:
- correct source name


Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec
===================================================================
--- tinysofa/releases/1.1/openssh/current/specs/openssh.spec	2004-10-31 17:26:53 UTC (rev 5047)
+++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec	2004-10-31 18:02:59 UTC (rev 5048)
@@ -1,5 +1,5 @@
 %define _noVersionedDependencies 1
-%define realversion 3.8p1
+%define realversion 3.8.1p1
 
 Summary: OpenSSH free Secure Shell (SSH) implementation
 Name: openssh


From svn at tinysofa.org  Sun Oct 31 18:48:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 13:48:47 -0500 (EST)
Subject: [tinysofa-svn] 
	r5049 - in tinysofa/releases/1.1/busybox/current: sources specs
Message-ID: <20041031184847.D6F7F344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 13:48:47 -0500 (Sun, 31 Oct 2004)
New Revision: 5049

Removed:
   tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.pre10.tar.bz2
   tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch
Modified:
   tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.config
   tinysofa/releases/1.1/busybox/current/specs/busybox.spec
Log:
- 1.0 final


Modified: tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.config
===================================================================
--- tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.config	2004-10-31 18:02:59 UTC (rev 5048)
+++ tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.config	2004-10-31 18:48:47 UTC (rev 5049)
@@ -138,6 +138,7 @@
 #
 # test (forced enabled for use with shell)
 #
+CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
 CONFIG_TR=y
 CONFIG_TRUE=y
@@ -242,7 +243,6 @@
 # CONFIG_HALT is not set
 # CONFIG_POWEROFF is not set
 # CONFIG_REBOOT is not set
-# CONFIG_MINIT is not set
 # CONFIG_MESG is not set
 
 #
@@ -254,6 +254,7 @@
 # CONFIG_ADDUSER is not set
 # CONFIG_DELUSER is not set
 # CONFIG_GETTY is not set
+CONFIG_FEATURE_U_W_TMP=y
 # CONFIG_LOGIN is not set
 # CONFIG_PASSWD is not set
 # CONFIG_SU is not set
@@ -287,7 +288,6 @@
 # Linux Module Utilities
 #
 CONFIG_INSMOD=y
-# CONFIG_FEATURE_2_2_MODULES is not set
 CONFIG_FEATURE_2_4_MODULES=y
 CONFIG_FEATURE_2_6_MODULES=y
 CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
@@ -295,7 +295,6 @@
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 CONFIG_LSMOD=y
-CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
 CONFIG_MODPROBE=y
 CONFIG_RMMOD=y
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
@@ -402,6 +401,7 @@
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 # CONFIG_ASH_MAIL is not set
@@ -416,7 +416,6 @@
 #
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 CONFIG_FEATURE_SH_STANDALONE_SHELL=y
-CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN=y
 CONFIG_FEATURE_COMMAND_EDITING=y
 CONFIG_FEATURE_COMMAND_HISTORY=15
 CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
@@ -438,6 +437,7 @@
 CONFIG_FDFLUSH=y
 CONFIG_FDFORMAT=y
 CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
 CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set

Deleted: tinysofa/releases/1.1/busybox/current/sources/busybox-1.00.pre10.tar.bz2
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch
===================================================================
--- tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch	2004-10-31 18:02:59 UTC (rev 5048)
+++ tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch	2004-10-31 18:48:47 UTC (rev 5049)
@@ -1,40 +0,0 @@
---- busybox-1.00-pre10/miscutils/hdparm.c.orig	2004-04-05 16:08:08.000000000 +0300
-+++ busybox-1.00-pre10/miscutils/hdparm.c	2004-07-05 22:51:25.000000000 +0300
-@@ -1226,7 +1226,7 @@
- static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
- static int do_ctimings, do_timings = 0;
- 
--static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;
-+static unsigned long set_readahead= 0, get_readahead= 0, hdreadahead= 0;
- static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
- static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;
- static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;
-@@ -1936,8 +1936,8 @@
- 
- 	if (set_readahead)
- 	{
--		if_printf(get_readahead," setting fs readahead to %ld\n", readahead);
--		bb_ioctl(fd, BLKRASET,(int *)readahead,"BLKRASET");
-+		if_printf(get_readahead," setting fs readahead to %ld\n", hdreadahead);
-+		bb_ioctl(fd, BLKRASET,(int *)hdreadahead,"BLKRASET");
- 	}
- #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
- 	if (unregister_hwif)
-@@ -2310,7 +2310,7 @@
- 	if ((verbose && !is_scsi_hd) || get_readahead)
- 	{
- 		bb_ioctl_on_off (fd, BLKRAGET, (unsigned long *) parm,
--							" BLKRAGET"," readahead    = %2ld");
-+							" BLKRAGET"," hdreadahead    = %2ld");
- 	}
- 	if (verbose || get_geom)
- 	{
-@@ -2829,7 +2829,7 @@
- 						noisy = 1;
- 						if (!*p && argc && isalnum(**argv))
- 							p = *argv++, --argc;
--						p=GET_NUMBER(p,&set_readahead,&readahead);
-+						p=GET_NUMBER(p,&set_readahead,&hdreadahead);
- 						break;
- 					case 'B':
- 						get_apmmode = noisy;

Modified: tinysofa/releases/1.1/busybox/current/specs/busybox.spec
===================================================================
--- tinysofa/releases/1.1/busybox/current/specs/busybox.spec	2004-10-31 18:02:59 UTC (rev 5048)
+++ tinysofa/releases/1.1/busybox/current/specs/busybox.spec	2004-10-31 18:48:47 UTC (rev 5049)
@@ -1,16 +1,15 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.00.pre10
-Release: 2ts
+Version: 1.00
+Release: 1jh
 License: GPL
 Group: extra
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
 Source1: busybox-1.00.config
 Patch: busybox-static.patch
 Patch1: busybox-anaconda.patch
-Patch2: busybox-hdparm.patch
 URL: http://www.busybox.net/
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %package anaconda
 Group: extra
@@ -30,8 +29,7 @@
 normal use.
 
 %prep
-%setup -q -n %{name}-1.00-pre10
-%patch2 -p1
+%setup -q -n %{name}-%{version}
 
 %build
 cp %{SOURCE1} .config
@@ -54,7 +52,7 @@
 install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 %files
 %defattr(-,root,root,0755)
@@ -67,6 +65,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.0-1jh
+- 1.0
+
 * Thu Aug 05 2004 tsintegrate <release at tinysofa dot org> 1.00.pre10-2ts
 - current (1.00.pre10-2jh) integrated as 1.00.pre10-2ts for release 1.1
 


From svn at tinysofa.org  Sun Oct 31 18:51:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 13:51:33 -0500 (EST)
Subject: [tinysofa-svn] 
	r5050 - tinysofa/releases/1.1/cyrus-imapd/current/specs
Message-ID: <20041031185133.6E062344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 13:51:32 -0500 (Sun, 31 Oct 2004)
New Revision: 5050

Modified:
   tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- BR: autoconf


Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-10-31 18:48:47 UTC (rev 5049)
+++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-10-31 18:51:32 UTC (rev 5050)
@@ -26,7 +26,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cyrus-sasl, db4, imapd-pam, libcom_err
 BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers
-BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel 
+BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel, autoconf
 Prereq: shadow-utils, glibc
 %service_requires
 Provides: imapd


From svn at tinysofa.org  Sun Oct 31 20:15:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 15:15:09 -0500 (EST)
Subject: [tinysofa-svn] 
	r5051 - tinysofa/releases/1.1/foomatic-filters/current/specs
Message-ID: <20041031201509.00960344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 15:15:09 -0500 (Sun, 31 Oct 2004)
New Revision: 5051

Modified:
   tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
Log:
- x86_64 fix

Modified: tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec
===================================================================
--- tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-10-31 18:51:32 UTC (rev 5050)
+++ tinysofa/releases/1.1/foomatic-filters/current/specs/foomatic-filters.spec	2004-10-31 20:15:09 UTC (rev 5051)
@@ -7,7 +7,7 @@
 Group: extra
 Source: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: cups ghostscript-cups
+BuildRequires: cups ghostscript-cups sed
 Requires: cups
 Requires: ghostscript-cups
 
@@ -21,6 +21,10 @@
 %prep
 %setup -q
 
+rm -fr CVS
+%ifarch x86_64
+sed -i 's/\/usr\/lib\/cups/\/usr\/lib64\/cups/g' *
+%endif
 
 %build
 %configure


From svn at tinysofa.org  Sun Oct 31 22:02:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 17:02:46 -0500 (EST)
Subject: [tinysofa-svn] 
	r5052 - in tinysofa/releases/1.1/libpng/current: sources specs
Message-ID: <20041031220246.92260344185@minbar.tinysofa.org>

Author: gda
Date: 2004-10-31 17:02:46 -0500 (Sun, 31 Oct 2004)
New Revision: 5052

Added:
   tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7-lz.patch
Modified:
   tinysofa/releases/1.1/libpng/current/specs/libpng.spec
Log:
unresolved externals in libpng.so

Added: tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7-lz.patch
===================================================================
--- tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7-lz.patch	2004-10-31 20:15:09 UTC (rev 5051)
+++ tinysofa/releases/1.1/libpng/current/sources/libpng-1.2.7-lz.patch	2004-10-31 22:02:46 UTC (rev 5052)
@@ -0,0 +1,17 @@
+--- scripts/makefile.linux.orig	2003-01-24 00:17:05.000000000 -0500
++++ scripts/makefile.linux	2003-01-24 00:22:41.000000000 -0500
+@@ -97,12 +97,12 @@
+ 	ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
+ 
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+-	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
++	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \
+ 	-o $(LIBNAME).so.$(PNGVER) \
+ 	$(OBJSDLL)
+ 
+ libpng.so.3.$(PNGMIN): $(OBJSDLL)
+-	$(CC) -shared -Wl,-soname,libpng.so.3 \
++	$(CC) -shared -Wl,-soname,libpng.so.3 -lz -lm \
+ 	-o libpng.so.3.$(PNGMIN) \
+ 	$(OBJSDLL)
+ 

Modified: tinysofa/releases/1.1/libpng/current/specs/libpng.spec
===================================================================
--- tinysofa/releases/1.1/libpng/current/specs/libpng.spec	2004-10-31 20:15:09 UTC (rev 5051)
+++ tinysofa/releases/1.1/libpng/current/specs/libpng.spec	2004-10-31 22:02:46 UTC (rev 5052)
@@ -1,10 +1,11 @@
 Summary: libpng, library for working with PNG files
 Name: libpng
 Version: 1.2.7
-Release: 1jh
+Release: 2gd
 License: OSI
 Group: extra
 Source: http://www.libpng.org/pub/png/src/%{name}-%{version}.tar.bz2
+Patch: libpng-1.2.7-lz.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng12
@@ -46,6 +47,7 @@
 
 %prep
 %setup -q -n libpng-%{version}
+%patch -p0 
 ln -s scripts/makefile.linux Makefile
 
 %build
@@ -116,6 +118,9 @@
 
 
 %changelog
+* Sun Oct 31 2004 Gerald Dachs <gda at tinysofa dot org> 1.2.7-2gd
+- added libz patch
+
 * Fri Oct 22 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.7-1jh
 - 1.2.7, which fixes security vulnerabilites
 


From svn at tinysofa.org  Sun Oct 31 22:08:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 31 Oct 2004 17:08:52 -0500 (EST)
Subject: [tinysofa-svn] 
	r5053 - in tinysofa/releases/1.1/cyrus-imapd/current: sources specs
Message-ID: <20041031220852.052A6344185@minbar.tinysofa.org>

Author: jh
Date: 2004-10-31 17:08:51 -0500 (Sun, 31 Oct 2004)
New Revision: 5053

Added:
   tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.8.tar.gz
Removed:
   tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.0.5-mandir.patch
   tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.3.tar.gz
Modified:
   tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- 2.2.8
- link with -pie
- run autoconf
- make it compile on x86_64


Deleted: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.0.5-mandir.patch
===================================================================
--- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.0.5-mandir.patch	2004-10-31 22:02:46 UTC (rev 5052)
+++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.0.5-mandir.patch	2004-10-31 22:08:51 UTC (rev 5053)
@@ -1,59 +0,0 @@
---- cyrus-imapd-2.0.5/man/Makefile.in	Sat Jun 17 18:49:10 2000
-+++ cyrus-imapd-2.0.5/man/Makefile.in	Sat Jun 17 18:49:48 2000
-@@ -60,6 +60,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- cyrus_prefix = @cyrus_prefix@
-+mandir=@prefix@/man
- 
- MAN1 = $(srcdir)/cyradm.1 $(srcdir)/imtest.1 $(srcdir)/installsieve.1
- MAN3 = $(srcdir)/imclient.3
-@@ -75,19 +76,19 @@
- install:
- 	for file in $(MAN1); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man1 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man1 || exit 1; \
- 	done
- 	for file in $(MAN3); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man3 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man3 || exit 1; \
- 	done
- 	for file in $(MAN5); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man5 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man5 || exit 1; \
- 	done
- 	for file in $(MAN8); \
- 	do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
-+		$(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
- 	done
- 
- .c.o:
---- cyrus-imapd-2.0.5/Makefile.in	Sat Jun 17 18:50:20 2000
-+++ cyrus-imapd-2.0.5/Makefile.in	Sat Jun 17 18:50:46 2000
-@@ -56,6 +56,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- cyrus_prefix = @cyrus_prefix@
-+mandir = @prefix@/man
- 
- all:: checkdepend
- 	@for d in  $(SUBDIRS); \
-@@ -68,10 +69,10 @@
- 	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
- 	$(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
- 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
--	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
-+	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
-+	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
-+	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
-+	$(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
- 	@for d in  $(SUBDIRS); \
- 	do \
- 		(cd $$d; echo "### Making" install "in" `pwd`;	\

Deleted: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.3.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-10-31 22:02:46 UTC (rev 5052)
+++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec	2004-10-31 22:08:51 UTC (rev 5053)
@@ -1,7 +1,7 @@
 Summary: A high-performance mail store with IMAP and POP3 support.
 Name: cyrus-imapd
-Version: 2.2.3
-Release: 6ts
+Version: 2.2.8
+Release: 1jh
 License: BSD
 Group: extra
 URL: http://asg.web.cmu.edu/cyrus/imapd/
@@ -16,7 +16,6 @@
 Source14: cyrus-imapd-rc
 
 Patch1: cyrus-imapd-2.0.5-pollute.patch
-Patch2: cyrus-imapd-2.0.5-mandir.patch
 
 # Not applied:
 Patch6: mysql+ldapauxprop.patch
@@ -26,7 +25,8 @@
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cyrus-sasl, db4, imapd-pam, libcom_err
 BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers
-BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel, autoconf
+BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel
+BuildRequires: autoconf, byacc, bison, flex
 Prereq: shadow-utils, glibc
 %service_requires
 Provides: imapd
@@ -58,19 +58,19 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 %patch7 -p1
 
 find doc -name CVS -type d | xargs -r rm -fr
 find . -type f -print0 | xargs -0 perl -pi -e 's|/etc/imapd.conf|/etc/cyrus-imapd/imapd.conf|g'
 
+rm -fr autom4te.cache
+
 %build
-CPPFLAGS="-I/usr/include/et"; export CPPFLAGS
-# perl/sieve/lib doesn't honour CFLAGS
-# this isn't quite clean - fixme
-CC="gcc -fPIC"; export CC
+export CPPFLAGS="-I/usr/include/et"
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export LDFLAGS="-pie"
 
-#autoconf
+autoconf
 %configure \
 	--enable-netscapehack \
 	--enable-annotatemore \
@@ -84,8 +84,7 @@
 	--with-cyrus-prefix=%{_libdir}/%{name} \
 	--sysconfdir=%{_sysconfdir}/%{name}
 
-%make \
-	IMAP_COM_ERR_LIBS=%{_libdir}/libcom_err.a
+%make
 
 gcc $RPM_OPT_FLAGS -o deliver-wrapper $RPM_SOURCE_DIR/cyrus-deliver-wrapper.c
 
@@ -166,11 +165,6 @@
 done
 popd
 
-# ouch
-if [ "/usr/lib" != "%{_libdir}" ]; then
-	%{__mv} %{buildroot}/usr/lib/*.a %{buildroot}%{_libdir}
-fi
-
 find %{buildroot} -name "perllocal.pod" -exec %{__rm} -f {} \;
 
 %clean
@@ -235,6 +229,12 @@
 %{_includedir}/cyrus
 
 %changelog
+* Sun Oct 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.2.8-1jh
+- 2.2.8
+- link with -pie
+- run autoconf
+- make it compile on x86_64
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 2.2.3-6ts
 - current (2.2.3-6jh) integrated as 2.2.3-6ts for release 1.1-U1