From svn at tinysofa.org  Fri Apr  1 12:51:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  1 Apr 2005 07:51:53 -0500 (EST)
Subject: [tinysofa-svn] r6211 - in
	tinysofa/releases/classic/1.1/php4/current: sources specs
Message-ID: <20050401125153.0B4FC344807@minbar.tinysofa.org>

Author: jh
Date: 2005-04-01 07:50:12 -0500 (Fri, 01 Apr 2005)
New Revision: 6211

Added:
   tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.11.tar.bz2
Removed:
   tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.10.tar.bz2
Modified:
   tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.1-dlopen.patch
   tinysofa/releases/classic/1.1/php4/current/specs/php4.spec
Log:
- 4.3.11, fixes CAN-2005-0524 and CAN-2005-0525

Modified: tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.1-dlopen.patch
===================================================================
--- tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.1-dlopen.patch	2005-03-31 19:58:59 UTC (rev 6210)
+++ tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.1-dlopen.patch	2005-04-01 12:50:12 UTC (rev 6211)
@@ -1,24 +1,16 @@
-
-1. Don't open extension modules with RTLD_LAZY: better to fail obviously at
-load-time rather than obscurely at run-time if they have undefined
-symbols.
-
-2. Don't open extension modules with RTLD_GLOBAL; keep loaded symbols
-private to help mitigate clashes between unrelated libraries.
-
-Adapted for >= PHP 4.3.5-rc4 by Robert Scheck
-
---- php-4.3.5/Zend/zend.h		2004-03-16 18:36:17.000000000 +0100
-+++ php-4.3.5/Zend/zend.h.dlopen	2004-03-20 16:48:26.000000000 +0100
-@@ -90,9 +90,9 @@
+--- ./Zend/zend.h.dlopen	2005-01-25 15:08:41.000000000 +0200
++++ ./Zend/zend.h	2005-04-01 15:47:13.000000000 +0300
+@@ -101,11 +101,11 @@
  # endif
  
  # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 +#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
+ # elif defined(RTLD_DEEPBIND)
+ #  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
  # else
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
 +#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW)
  # endif
  # define DL_UNLOAD					dlclose
- # if DLSYM_NEEDS_UNDERSCORE
+ # if defined(DLSYM_NEEDS_UNDERSCORE)

Deleted: tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.10.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.11.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/1.1/php4/current/sources/php-4.3.11.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/classic/1.1/php4/current/specs/php4.spec
===================================================================
--- tinysofa/releases/classic/1.1/php4/current/specs/php4.spec	2005-03-31 19:58:59 UTC (rev 6210)
+++ tinysofa/releases/classic/1.1/php4/current/specs/php4.spec	2005-04-01 12:50:12 UTC (rev 6211)
@@ -6,8 +6,8 @@
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php4
-Version: 4.3.10
-Release: 1ts
+Version: 4.3.11
+Release: 1jh
 License: The PHP License
 Group: main
 URL: http://www.php.net/
@@ -17,7 +17,6 @@
 Source50: php.conf
 
 Patch2: php-4.3.4-config.patch
-Patch3: php-4.2.2-lib64.patch
 Patch4: php-4.2.2-cxx.patch
 Patch5: php-4.3.3-install.patch
 Patch6: php-4.3.1-tests.patch
@@ -327,7 +326,6 @@
 %prep
 %setup -q -n php-%{version}
 %patch2 -p1 -b .config
-%patch3 -p1 -b .lib64
 %patch4 -p1 -b .cxx
 %patch5 -p1 -b .install
 %patch6 -p1 -b .tests
@@ -610,6 +608,9 @@
 %endif
 
 %changelog
+* Fri Apr  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.3.11-1jh
+- 4.3.11, fixes CAN-2005-0524 and CAN-2005-0525
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 4.3.10-1ts
 - current (4.3.10-1jh) integrated as 4.3.10-1ts for release 1.1-U3
 



From svn at tinysofa.org  Fri Apr  1 18:27:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  1 Apr 2005 13:27:49 -0500 (EST)
Subject: [tinysofa-svn] r6213 - in
	tinysofa/releases/classic/2.0/sharutils/current: sources specs
Message-ID: <20050401182749.7CFA73441AF@minbar.tinysofa.org>

Author: jh
Date: 2005-04-01 13:27:34 -0500 (Fri, 01 Apr 2005)
New Revision: 6213

Added:
   tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-sec.patch
   tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-opto.dif
Modified:
   tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec
Log:
- security fixes

Added: tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-sec.patch
===================================================================
--- tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-sec.patch	2005-04-01 13:05:58 UTC (rev 6212)
+++ tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-sec.patch	2005-04-01 18:27:34 UTC (rev 6213)
@@ -0,0 +1,61 @@
+diff -Naur ./sharutils-4.2.1/src/shar.c ./sharutils-4.2.1_new/src/shar.c
+--- sharutils-4.2.1.old/src/shar.c	1999-09-10 21:20:41.000000000 +0200
++++ sharutils-4.2.1/src/shar.c	2004-09-29 15:09:40.790061000 +0200
+@@ -1571,7 +1571,7 @@
+ 	  sprintf (command, "%s '%s'", CHARACTER_COUNT_COMMAND, local_name);
+ 	  if (pfp = popen (command, "r"), pfp)
+ 	    {
+-	      char wc[BUFSIZ];
++		char wc[BUFSIZ], tempform[50];      
+ 	      const char *prefix = "";
+ 
+ 	      if (did_md5)
+@@ -1579,8 +1579,8 @@
+ 		  fputs ("  else\n", output);
+ 		  prefix = "  ";
+ 		}
+-
+-	      fscanf (pfp, "%s", wc);
++	sprintf (tempform, "%%%ds", BUFSIZ - 1);
++	fscanf (pfp, tempform, wc);
+ 	      fprintf (output, "\
+ %s  shar_count=\"`%s '%s'`\"\n\
+ %s  test %s -eq \"$shar_count\" ||\n\
+diff -Naur ./sharutils-4.2.1/src/unshar.c ./sharutils-4.2.1_new/src/unshar.c
+--- sharutils-4.2.1.old/src/unshar.c	1995-11-21 17:22:14.000000000 +0100
++++ sharutils-4.2.1/src/unshar.c	2004-09-29 15:09:44.682469264 +0200
+@@ -346,8 +346,8 @@
+ {
+   size_t size_read;
+   FILE *file;
+-  char name_buffer[NAME_BUFFER_SIZE];
+-  char copy_buffer[NAME_BUFFER_SIZE];
++  char name_buffer[NAME_BUFFER_SIZE] = {'\0'};
++  char copy_buffer[NAME_BUFFER_SIZE] = {'\0'};
+   int optchar;
+ 
+   program_name = argv[0];
+@@ -409,14 +409,14 @@
+   if (optind < argc)
+     for (; optind < argc; optind++)
+       {
+-	if (argv[optind][0] == '/')
+-	  stpcpy (name_buffer, argv[optind]);
+-	else
+-	  {
+-	    char *cp = stpcpy (name_buffer, current_directory);
+-	    *cp++ = '/';
+-	    stpcpy (cp, argv[optind]);
+-	  }
++	if (argv[optind][0] == '/') {
++		strncpy (name_buffer, argv[optind], sizeof(name_buffer));
++		name_buffer[sizeof(name_buffer)-1] = '\0';
++	}
++	else {
++		snprintf(name_buffer, sizeof(name_buffer),"%s/%s", current_directory, argv[optind]);
++		name_buffer[sizeof(name_buffer)-1] = '\0';
++	}
+ 	if (file = fopen (name_buffer, "r"), !file)
+ 	  error (EXIT_FAILURE, errno, name_buffer);
+ 	unarchive_shar_file (name_buffer, file);
+

Added: tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-opto.dif
===================================================================
--- tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-opto.dif	2005-04-01 13:05:58 UTC (rev 6212)
+++ tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-opto.dif	2005-04-01 18:27:34 UTC (rev 6213)
@@ -0,0 +1,93 @@
+--- ./src/shar.c.orig	2004-04-28 09:33:52.941273149 +0000
++++ ./src/shar.c	2004-04-28 10:24:16.042020998 +0000
+@@ -211,11 +211,11 @@
+ /* Position for first file in the shar file.  */
+ static long first_file_position;
+ 
+-/* Base for output filename.  FIXME: No fix limit in GNU... */
+-static char output_base_name[50];
++/* Base for output filename.  */
++static char *output_base_name;
+ 
+-/* Actual output filename.  FIXME: No fix limit in GNU... */
+-static char output_filename[50];
++/* Actual output filename.  */
++static char *output_filename;
+ 
+ static char *submitter_address = NULL;
+ 
+@@ -1651,7 +1651,12 @@
+ static void
+ open_output ()
+ {
+-  sprintf (output_filename, output_base_name, ++part_number);
++  size_t l;
++  l = strlen(output_base_name) + 128;
++  if (output_filename)
++    free(output_filename);
++  output_filename = xmalloc(l);
++  snprintf(output_filename, l, output_base_name, ++part_number);
+   output = fopen (output_filename, "w");
+   if (!output)
+     error (EXIT_FAILURE, errno, _("Opening `%s'"), output_filename);
+@@ -1789,6 +1794,42 @@
+   { NULL, 0, NULL, 0 },
+ };
+ 
++
++char *parse_output_base_name(char *arg)
++{
++  int c;
++  int hadarg = 0;
++  char *fmt, *p;
++
++  for (p = arg ; (c = *p++) != 0; )
++    {
++      if (c != '%')
++	continue;
++      c = *p++;
++      if (c == '%')
++	continue;
++      if (hadarg)
++	return 0;
++      while (c != 0 && strchr("#0+- 'I", c) != 0)
++	c = *p++;
++      while (c != 0 && c >= '0' && c <= '9')
++	c = *p++;
++      if (c == '.')
++	c = *p++;
++      while (c != 0 && c >= '0' && c <= '9')
++	c = *p++;
++      if (c == 0 || strchr("diouxX", c) == 0)
++	return 0;
++      hadarg = 1;
++    }
++  fmt = xmalloc(strlen(arg) + (hadarg ? 1 : 6));
++  strcpy(fmt, arg);
++  if (!hadarg)
++    strcat(fmt, ".%02d");
++  return fmt;
++}
++
++
+ /*---.
+ | ?  |
+ `---*/
+@@ -1923,9 +1964,14 @@
+ 	break;
+ 
+       case 'o':
+-	strcpy (output_base_name, optarg);
+-	if (!strchr (output_base_name, '%'))
+-	  strcat (output_base_name, ".%02d");
++	if (output_base_name)
++	  free (output_base_name);
++        output_base_name = parse_output_base_name(optarg);
++        if (!output_base_name)
++	  {
++	    fprintf (stderr, _("illegal output prefix\n"));
++	    exit (EXIT_FAILURE);
++	  }
+ 	part_number = 0;
+ 	open_output ();
+ 	break;

Modified: tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec
===================================================================
--- tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec	2005-04-01 13:05:58 UTC (rev 6212)
+++ tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec	2005-04-01 18:27:34 UTC (rev 6213)
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives.
 Name: sharutils
 Version: 4.2.1
-Release: 23jh
+Release: 24jh
 License: GPL
 Group: extra
 Source: ftp://prep.ai.mit.edu/pub/gnu/sharutils/sharutils-%{version}.tar.gz
@@ -12,6 +12,8 @@
 Patch5: sharutils-4.2-uudecode.patch
 Patch6: sharutils-4.2.1-mktemp.patch
 Patch7: sharutils-4.2.1-uudecode.patch
+Patch8: sharutils-opto.dif
+Patch9: sharutils-4.2.1-sec.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext
 
@@ -41,6 +43,8 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p0 -b .ooption
+%patch9 -p1
 
 
 %build
@@ -71,6 +75,9 @@
 
 
 %changelog
+* Fri Apr  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.2.1-24jh
+- security fixes
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 4.2.1-22ts
 - current (4.2.1-22jh) integrated as 4.2.1-22ts for release 1.1-U1
 



From svn at tinysofa.org  Sat Apr  2 06:45:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Apr 2005 01:45:57 -0500 (EST)
Subject: [tinysofa-svn] r6214 - in
	tinysofa/releases/classic/2.0/php/current: sources specs
Message-ID: <20050402064557.38A4B34419E@minbar.tinysofa.org>

Author: omar
Date: 2005-04-02 01:45:56 -0500 (Sat, 02 Apr 2005)
New Revision: 6214

Added:
   tinysofa/releases/classic/2.0/php/current/sources/pear-RunTest.php
Modified:
   tinysofa/releases/classic/2.0/php/current/specs/php.spec
Log:
- Fix php package build.


Added: tinysofa/releases/classic/2.0/php/current/sources/pear-RunTest.php
===================================================================
--- tinysofa/releases/classic/2.0/php/current/sources/pear-RunTest.php	2005-04-01 18:27:34 UTC (rev 6213)
+++ tinysofa/releases/classic/2.0/php/current/sources/pear-RunTest.php	2005-04-02 06:45:56 UTC (rev 6214)
@@ -0,0 +1,363 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license at php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Tomas V.V.Cox <cox at idecnet.com>                             |
+// |          Greg Beaver <cellog at php.net>                                |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: RunTest.php,v 1.1.4.2 2005/04/01 22:02:16 cellog Exp $
+//
+
+/**
+ * Simplified version of PHP's test suite
+ * -- EXPERIMENTAL --
+
+ Try it with:
+
+ $ php -r 'include "../PEAR/RunTest.php"; $t=new PEAR_RunTest; $o=$t->run("./pear_system.phpt");print_r($o);'
+
+
+TODO:
+
+Actually finish the development and testing
+
+ */
+
+require_once 'PEAR.php';
+require_once 'PEAR/Config.php';
+
+define('DETAILED', 1);
+putenv("PHP_PEAR_RUNTESTS=1");
+
+class PEAR_RunTest
+{
+    var $_logger;
+
+    /**
+     * An object that supports the PEAR_Common->log() signature, or null
+     * @param PEAR_Common|null
+     */
+    function PEAR_RunTest($logger = null)
+    {
+        $this->_logger = $logger;
+    }
+
+    //
+    //  Run an individual test case.
+    //
+
+    function run($file, $ini_settings = '')
+    {
+        $cwd = getcwd();
+        $conf = &PEAR_Config::singleton();
+        $php = $conf->get('php_bin');
+        //var_dump($php);exit;
+        global $log_format, $info_params, $ini_overwrites;
+
+        $info_params = '';
+        $log_format = 'LEOD';
+
+        // Load the sections of the test file.
+        $section_text = array(
+            'TEST'    => '(unnamed test)',
+            'SKIPIF'  => '',
+            'GET'     => '',
+            'ARGS'    => '',
+        );
+
+        if (!is_file($file) || !$fp = fopen($file, "r")) {
+            return PEAR::raiseError("Cannot open test file: $file");
+        }
+
+        $section = '';
+        while (!feof($fp)) {
+            $line = fgets($fp);
+
+            // Match the beginning of a section.
+            if (ereg('^--([A-Z]+)--',$line,$r)) {
+                $section = $r[1];
+                $section_text[$section] = '';
+                continue;
+            }
+
+            // Add to the section text.
+            $section_text[$section] .= $line;
+        }
+        fclose($fp);
+
+        $shortname = str_replace($cwd.'/', '', $file);
+        $tested = trim($section_text['TEST'])." [$shortname]";
+
+        $tmp = realpath(dirname($file));
+        $tmp_skipif = $tmp . uniqid('/phpt.');
+        $tmp_file   = ereg_replace('\.phpt$','.php',$file);
+        $tmp_post   = $tmp . uniqid('/phpt.');
+
+        @unlink($tmp_skipif);
+        @unlink($tmp_file);
+        @unlink($tmp_post);
+
+        // unlink old test results
+        @unlink(ereg_replace('\.phpt$','.diff',$file));
+        @unlink(ereg_replace('\.phpt$','.log',$file));
+        @unlink(ereg_replace('\.phpt$','.exp',$file));
+        @unlink(ereg_replace('\.phpt$','.out',$file));
+
+        // Check if test should be skipped.
+        $info = '';
+        $warn = false;
+        if (array_key_exists('SKIPIF', $section_text)) {
+            if (trim($section_text['SKIPIF'])) {
+                $this->save_text($tmp_skipif, $section_text['SKIPIF']);
+                //$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
+                //    "unset REQUEST_METHOD;": "";
+
+                //$output = `$extra $php $info_params -f $tmp_skipif`;
+                $output = `$php $info_params -f $tmp_skipif`;
+                unlink($tmp_skipif);
+                if (eregi("^skip", trim($output))) {
+                    $skipreason = "SKIP $tested";
+                    $reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $skipreason .= " (reason: $reason)";
+                    }
+                    $this->_logger->log(0, $skipreason);
+                    if (isset($old_php)) {
+                        $php = $old_php;
+                    }
+                    return 'SKIPPED';
+                }
+                if (eregi("^info", trim($output))) {
+                    $reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $info = " (info: $reason)";
+                    }
+                }
+                if (eregi("^warn", trim($output))) {
+                    $reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $warn = true; /* only if there is a reason */
+                        $info = " (warn: $reason)";
+                    }
+                }
+            }
+        }
+
+        // We've satisfied the preconditions - run the test!
+        $this->save_text($tmp_file,$section_text['FILE']);
+
+        $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
+
+        $cmd = "$php$ini_settings -f $tmp_file$args 2>&1";
+        if (isset($this->_logger)) {
+            $this->_logger->log(2, 'Running command "' . $cmd . '"');
+        }
+
+        $savedir = getcwd(); // in case the test moves us around
+        if (isset($section_text['RETURNS'])) {
+            ob_start();
+            system($cmd, $return_value);
+            $out = ob_get_contents();
+            ob_end_clean();
+            @unlink($tmp_post);
+            $section_text['RETURNS'] = (int) trim($section_text['RETURNS']);
+            $returnfail = ($return_value != $section_text['RETURNS']);
+        } else {
+            $out = `$cmd`;
+            $returnfail = false;
+        }
+        chdir($savedir);
+        // Does the output match what is expected?
+        $output = trim($out);
+        $output = preg_replace('/\r\n/', "\n", $output);
+
+        if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
+            if (isset($section_text['EXPECTF'])) {
+                $wanted = trim($section_text['EXPECTF']);
+            } else {
+                $wanted = trim($section_text['EXPECTREGEX']);
+            }
+            $wanted_re = preg_replace('/\r\n/',"\n",$wanted);
+            if (isset($section_text['EXPECTF'])) {
+                $wanted_re = preg_quote($wanted_re, '/');
+                // Stick to basics
+                $wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
+                $wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
+                $wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
+                $wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
+                $wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
+                $wanted_re = str_replace("%c", ".", $wanted_re);
+                // %f allows two points "-.0.0" but that is the best *simple* expression
+            }
+    /* DEBUG YOUR REGEX HERE
+            var_dump($wanted_re);
+            print(str_repeat('=', 80) . "\n");
+            var_dump($output);
+    */
+            if (!$returnfail && preg_match("/^$wanted_re\$/s", $output)) {
+                @unlink($tmp_file);
+                $this->_logger->log(0, "PASS $tested$info");
+                if (isset($old_php)) {
+                    $php = $old_php;
+                }
+                return 'PASSED';
+            }
+
+        } else {
+            $wanted = trim($section_text['EXPECT']);
+            $wanted = preg_replace('/\r\n/',"\n",$wanted);
+        // compare and leave on success
+            $ok = (0 == strcmp($output,$wanted));
+            if (!$returnfail && $ok) {
+                @unlink($tmp_file);
+                $this->_logger->log(0, "PASS $tested$info");
+                if (isset($old_php)) {
+                    $php = $old_php;
+                }
+                return 'PASSED';
+            }
+        }
+
+        // Test failed so we need to report details.
+        if ($warn) {
+            $this->_logger->log(0, "WARN $tested$info");
+        } else {
+            $this->_logger->log(0, "FAIL $tested$info");
+        }
+
+        if (isset($section_text['RETURNS'])) {
+            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
+                            'name' => $file,
+                            'test_name' => $tested,
+                            'output' => ereg_replace('\.phpt$','.log', $file),
+                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
+                            'info'   => $info,
+                            'return' => $return_value
+                            );
+        } else {
+            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
+                            'name' => $file,
+                            'test_name' => $tested,
+                            'output' => ereg_replace('\.phpt$','.log', $file),
+                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
+                            'info'   => $info,
+                            );
+        }
+
+        // write .exp
+        if (strpos($log_format,'E') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.exp',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,$wanted);
+            fclose($log);
+        }
+
+        // write .out
+        if (strpos($log_format,'O') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.out',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,$output);
+            fclose($log);
+        }
+
+        // write .diff
+        if (strpos($log_format,'D') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.diff',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log, $this->generate_diff($wanted, $output,
+                isset($section_text['RETURNS']) ? array(trim($section_text['RETURNS']),
+                    $return_value) : null));
+            fclose($log);
+        }
+
+        // write .log
+        if (strpos($log_format,'L') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.log',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,"
+---- EXPECTED OUTPUT
+$wanted
+---- ACTUAL OUTPUT
+$output
+---- FAILED
+");
+            if ($returnfail) {
+                fwrite($log,"
+---- EXPECTED RETURN
+$section_text[RETURNS]
+---- ACTUAL RETURN
+$return_value
+");
+            }
+            fclose($log);
+            //error_report($file,$logname,$tested);
+        }
+
+        if (isset($old_php)) {
+            $php = $old_php;
+        }
+
+        return $warn ? 'WARNED' : 'FAILED';
+    }
+
+    function generate_diff($wanted, $output, $return_value)
+    {
+        $w = explode("\n", $wanted);
+        $o = explode("\n", $output);
+        $w1 = array_diff_assoc($w,$o);
+        $o1 = array_diff_assoc($o,$w);
+        $w2 = array();
+        $o2 = array();
+        foreach($w1 as $idx => $val) $w2[sprintf("%03d<",$idx)] = sprintf("%03d- ", $idx+1).$val;
+        foreach($o1 as $idx => $val) $o2[sprintf("%03d>",$idx)] = sprintf("%03d+ ", $idx+1).$val;
+        $diff = array_merge($w2, $o2);
+        ksort($diff);
+        if ($return_value) {
+            $extra = "##EXPECTED: $return_value[0]\r\n##RETURNED: $return_value[1]";
+        } else {
+            $extra = '';
+        }
+        return implode("\r\n", $diff) . $extra;
+    }
+
+    //
+    //  Write the given text to a temporary file, and return the filename.
+    //
+
+    function save_text($filename, $text)
+    {
+        if (!$fp = fopen($filename, 'w')) {
+            return PEAR::raiseError("Cannot open file '" . $filename . "' (save_text)");
+        }
+        fwrite($fp,$text);
+        fclose($fp);
+    if (1 < DETAILED) echo "
+FILE $filename {{{
+$text
+}}}
+";
+    }
+
+}
+?>
\ No newline at end of file

Modified: tinysofa/releases/classic/2.0/php/current/specs/php.spec
===================================================================
--- tinysofa/releases/classic/2.0/php/current/specs/php.spec	2005-04-01 18:27:34 UTC (rev 6213)
+++ tinysofa/releases/classic/2.0/php/current/specs/php.spec	2005-04-02 06:45:56 UTC (rev 6214)
@@ -15,6 +15,8 @@
 
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 
+Source10: pear-RunTest.php
+
 Source50: php.conf
 
 Patch2: php-5.0.1-config.patch
@@ -353,6 +355,9 @@
 rm -f ext/standard/tests/file/bug22414.phpt \
       ext/iconv/tests/bug16069.phpt
 
+# Missing file in 5.0.4 PEAR bundle:
+cp %{SOURCE10} pear/PEAR/RunTest.php
+
 : Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} ibase=%{with_ibase}
 
 %build
@@ -365,7 +370,7 @@
 # pull latest ltmain.sh, AC_PROG_LIBTOOL
 libtoolize --force --copy
 # force aclocal run during buildconf
-touch acinclude.m4
+cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4
 
 # Regenerate configure scripts (patches change config.m4's)
 ./buildconf --force



From svn at tinysofa.org  Sat Apr  2 07:01:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  2 Apr 2005 02:01:47 -0500 (EST)
Subject: [tinysofa-svn] r6215 - in
	tinysofa/releases/classic/1.1/php4/current: sources specs
Message-ID: <20050402070147.06CC0344188@minbar.tinysofa.org>

Author: jh
Date: 2005-04-02 02:01:37 -0500 (Sat, 02 Apr 2005)
New Revision: 6215

Added:
   tinysofa/releases/classic/1.1/php4/current/sources/pear-RunTest.php
Modified:
   tinysofa/releases/classic/1.1/php4/current/specs/php4.spec
Log:
- fix build


Added: tinysofa/releases/classic/1.1/php4/current/sources/pear-RunTest.php
===================================================================
--- tinysofa/releases/classic/1.1/php4/current/sources/pear-RunTest.php	2005-04-02 06:45:56 UTC (rev 6214)
+++ tinysofa/releases/classic/1.1/php4/current/sources/pear-RunTest.php	2005-04-02 07:01:37 UTC (rev 6215)
@@ -0,0 +1,363 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 5                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license at php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Tomas V.V.Cox <cox at idecnet.com>                             |
+// |          Greg Beaver <cellog at php.net>                                |
+// |                                                                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: RunTest.php,v 1.1.4.2 2005/04/01 22:02:16 cellog Exp $
+//
+
+/**
+ * Simplified version of PHP's test suite
+ * -- EXPERIMENTAL --
+
+ Try it with:
+
+ $ php -r 'include "../PEAR/RunTest.php"; $t=new PEAR_RunTest; $o=$t->run("./pear_system.phpt");print_r($o);'
+
+
+TODO:
+
+Actually finish the development and testing
+
+ */
+
+require_once 'PEAR.php';
+require_once 'PEAR/Config.php';
+
+define('DETAILED', 1);
+putenv("PHP_PEAR_RUNTESTS=1");
+
+class PEAR_RunTest
+{
+    var $_logger;
+
+    /**
+     * An object that supports the PEAR_Common->log() signature, or null
+     * @param PEAR_Common|null
+     */
+    function PEAR_RunTest($logger = null)
+    {
+        $this->_logger = $logger;
+    }
+
+    //
+    //  Run an individual test case.
+    //
+
+    function run($file, $ini_settings = '')
+    {
+        $cwd = getcwd();
+        $conf = &PEAR_Config::singleton();
+        $php = $conf->get('php_bin');
+        //var_dump($php);exit;
+        global $log_format, $info_params, $ini_overwrites;
+
+        $info_params = '';
+        $log_format = 'LEOD';
+
+        // Load the sections of the test file.
+        $section_text = array(
+            'TEST'    => '(unnamed test)',
+            'SKIPIF'  => '',
+            'GET'     => '',
+            'ARGS'    => '',
+        );
+
+        if (!is_file($file) || !$fp = fopen($file, "r")) {
+            return PEAR::raiseError("Cannot open test file: $file");
+        }
+
+        $section = '';
+        while (!feof($fp)) {
+            $line = fgets($fp);
+
+            // Match the beginning of a section.
+            if (ereg('^--([A-Z]+)--',$line,$r)) {
+                $section = $r[1];
+                $section_text[$section] = '';
+                continue;
+            }
+
+            // Add to the section text.
+            $section_text[$section] .= $line;
+        }
+        fclose($fp);
+
+        $shortname = str_replace($cwd.'/', '', $file);
+        $tested = trim($section_text['TEST'])." [$shortname]";
+
+        $tmp = realpath(dirname($file));
+        $tmp_skipif = $tmp . uniqid('/phpt.');
+        $tmp_file   = ereg_replace('\.phpt$','.php',$file);
+        $tmp_post   = $tmp . uniqid('/phpt.');
+
+        @unlink($tmp_skipif);
+        @unlink($tmp_file);
+        @unlink($tmp_post);
+
+        // unlink old test results
+        @unlink(ereg_replace('\.phpt$','.diff',$file));
+        @unlink(ereg_replace('\.phpt$','.log',$file));
+        @unlink(ereg_replace('\.phpt$','.exp',$file));
+        @unlink(ereg_replace('\.phpt$','.out',$file));
+
+        // Check if test should be skipped.
+        $info = '';
+        $warn = false;
+        if (array_key_exists('SKIPIF', $section_text)) {
+            if (trim($section_text['SKIPIF'])) {
+                $this->save_text($tmp_skipif, $section_text['SKIPIF']);
+                //$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
+                //    "unset REQUEST_METHOD;": "";
+
+                //$output = `$extra $php $info_params -f $tmp_skipif`;
+                $output = `$php $info_params -f $tmp_skipif`;
+                unlink($tmp_skipif);
+                if (eregi("^skip", trim($output))) {
+                    $skipreason = "SKIP $tested";
+                    $reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $skipreason .= " (reason: $reason)";
+                    }
+                    $this->_logger->log(0, $skipreason);
+                    if (isset($old_php)) {
+                        $php = $old_php;
+                    }
+                    return 'SKIPPED';
+                }
+                if (eregi("^info", trim($output))) {
+                    $reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $info = " (info: $reason)";
+                    }
+                }
+                if (eregi("^warn", trim($output))) {
+                    $reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
+                    if ($reason) {
+                        $warn = true; /* only if there is a reason */
+                        $info = " (warn: $reason)";
+                    }
+                }
+            }
+        }
+
+        // We've satisfied the preconditions - run the test!
+        $this->save_text($tmp_file,$section_text['FILE']);
+
+        $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
+
+        $cmd = "$php$ini_settings -f $tmp_file$args 2>&1";
+        if (isset($this->_logger)) {
+            $this->_logger->log(2, 'Running command "' . $cmd . '"');
+        }
+
+        $savedir = getcwd(); // in case the test moves us around
+        if (isset($section_text['RETURNS'])) {
+            ob_start();
+            system($cmd, $return_value);
+            $out = ob_get_contents();
+            ob_end_clean();
+            @unlink($tmp_post);
+            $section_text['RETURNS'] = (int) trim($section_text['RETURNS']);
+            $returnfail = ($return_value != $section_text['RETURNS']);
+        } else {
+            $out = `$cmd`;
+            $returnfail = false;
+        }
+        chdir($savedir);
+        // Does the output match what is expected?
+        $output = trim($out);
+        $output = preg_replace('/\r\n/', "\n", $output);
+
+        if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
+            if (isset($section_text['EXPECTF'])) {
+                $wanted = trim($section_text['EXPECTF']);
+            } else {
+                $wanted = trim($section_text['EXPECTREGEX']);
+            }
+            $wanted_re = preg_replace('/\r\n/',"\n",$wanted);
+            if (isset($section_text['EXPECTF'])) {
+                $wanted_re = preg_quote($wanted_re, '/');
+                // Stick to basics
+                $wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
+                $wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
+                $wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
+                $wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
+                $wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
+                $wanted_re = str_replace("%c", ".", $wanted_re);
+                // %f allows two points "-.0.0" but that is the best *simple* expression
+            }
+    /* DEBUG YOUR REGEX HERE
+            var_dump($wanted_re);
+            print(str_repeat('=', 80) . "\n");
+            var_dump($output);
+    */
+            if (!$returnfail && preg_match("/^$wanted_re\$/s", $output)) {
+                @unlink($tmp_file);
+                $this->_logger->log(0, "PASS $tested$info");
+                if (isset($old_php)) {
+                    $php = $old_php;
+                }
+                return 'PASSED';
+            }
+
+        } else {
+            $wanted = trim($section_text['EXPECT']);
+            $wanted = preg_replace('/\r\n/',"\n",$wanted);
+        // compare and leave on success
+            $ok = (0 == strcmp($output,$wanted));
+            if (!$returnfail && $ok) {
+                @unlink($tmp_file);
+                $this->_logger->log(0, "PASS $tested$info");
+                if (isset($old_php)) {
+                    $php = $old_php;
+                }
+                return 'PASSED';
+            }
+        }
+
+        // Test failed so we need to report details.
+        if ($warn) {
+            $this->_logger->log(0, "WARN $tested$info");
+        } else {
+            $this->_logger->log(0, "FAIL $tested$info");
+        }
+
+        if (isset($section_text['RETURNS'])) {
+            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
+                            'name' => $file,
+                            'test_name' => $tested,
+                            'output' => ereg_replace('\.phpt$','.log', $file),
+                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
+                            'info'   => $info,
+                            'return' => $return_value
+                            );
+        } else {
+            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
+                            'name' => $file,
+                            'test_name' => $tested,
+                            'output' => ereg_replace('\.phpt$','.log', $file),
+                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
+                            'info'   => $info,
+                            );
+        }
+
+        // write .exp
+        if (strpos($log_format,'E') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.exp',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,$wanted);
+            fclose($log);
+        }
+
+        // write .out
+        if (strpos($log_format,'O') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.out',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,$output);
+            fclose($log);
+        }
+
+        // write .diff
+        if (strpos($log_format,'D') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.diff',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log, $this->generate_diff($wanted, $output,
+                isset($section_text['RETURNS']) ? array(trim($section_text['RETURNS']),
+                    $return_value) : null));
+            fclose($log);
+        }
+
+        // write .log
+        if (strpos($log_format,'L') !== FALSE) {
+            $logname = ereg_replace('\.phpt$','.log',$file);
+            if (!$log = fopen($logname,'w')) {
+                return PEAR::raiseError("Cannot create test log - $logname");
+            }
+            fwrite($log,"
+---- EXPECTED OUTPUT
+$wanted
+---- ACTUAL OUTPUT
+$output
+---- FAILED
+");
+            if ($returnfail) {
+                fwrite($log,"
+---- EXPECTED RETURN
+$section_text[RETURNS]
+---- ACTUAL RETURN
+$return_value
+");
+            }
+            fclose($log);
+            //error_report($file,$logname,$tested);
+        }
+
+        if (isset($old_php)) {
+            $php = $old_php;
+        }
+
+        return $warn ? 'WARNED' : 'FAILED';
+    }
+
+    function generate_diff($wanted, $output, $return_value)
+    {
+        $w = explode("\n", $wanted);
+        $o = explode("\n", $output);
+        $w1 = array_diff_assoc($w,$o);
+        $o1 = array_diff_assoc($o,$w);
+        $w2 = array();
+        $o2 = array();
+        foreach($w1 as $idx => $val) $w2[sprintf("%03d<",$idx)] = sprintf("%03d- ", $idx+1).$val;
+        foreach($o1 as $idx => $val) $o2[sprintf("%03d>",$idx)] = sprintf("%03d+ ", $idx+1).$val;
+        $diff = array_merge($w2, $o2);
+        ksort($diff);
+        if ($return_value) {
+            $extra = "##EXPECTED: $return_value[0]\r\n##RETURNED: $return_value[1]";
+        } else {
+            $extra = '';
+        }
+        return implode("\r\n", $diff) . $extra;
+    }
+
+    //
+    //  Write the given text to a temporary file, and return the filename.
+    //
+
+    function save_text($filename, $text)
+    {
+        if (!$fp = fopen($filename, 'w')) {
+            return PEAR::raiseError("Cannot open file '" . $filename . "' (save_text)");
+        }
+        fwrite($fp,$text);
+        fclose($fp);
+    if (1 < DETAILED) echo "
+FILE $filename {{{
+$text
+}}}
+";
+    }
+
+}
+?>
\ No newline at end of file

Modified: tinysofa/releases/classic/1.1/php4/current/specs/php4.spec
===================================================================
--- tinysofa/releases/classic/1.1/php4/current/specs/php4.spec	2005-04-02 06:45:56 UTC (rev 6214)
+++ tinysofa/releases/classic/1.1/php4/current/specs/php4.spec	2005-04-02 07:01:37 UTC (rev 6215)
@@ -14,6 +14,8 @@
 
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 
+Source10: pear-RunTest.php
+
 Source50: php.conf
 
 Patch2: php-4.3.4-config.patch
@@ -369,6 +371,9 @@
       ext/standard/tests/math/abs.phpt \
       ext/iconv/tests/bug16069.phpt
 
+# Missing file in PEAR bundle:
+cp %{SOURCE10} pear/PEAR/RunTest.php
+
 : Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash}
 
 %build
@@ -381,7 +386,7 @@
 # pull latest ltmain.sh, AC_PROG_LIBTOOL
 libtoolize --force --copy
 # force aclocal run during buildconf
-touch acinclude.m4
+cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4
 
 # Regenerate configure scripts (patches change config.m4's)
 ./buildconf --force



From svn at tinysofa.org  Sun Apr  3 14:31:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  3 Apr 2005 10:31:14 -0400 (EDT)
Subject: [tinysofa-svn] r6216 - in contrib/1.2/gdk-pixbuf/current: sources
	specs
Message-ID: <20050403143114.F2BF3344192@minbar.tinysofa.org>

Author: jh
Date: 2005-04-03 10:31:05 -0400 (Sun, 03 Apr 2005)
New Revision: 6216

Added:
   contrib/1.2/gdk-pixbuf/current/sources/gdk-pixbuf-0.22.0-bmpcrash.patch
Modified:
   contrib/1.2/gdk-pixbuf/current/specs/gdk-pixbuf.spec
Log:
- fix CAN-2005-0891

Added: contrib/1.2/gdk-pixbuf/current/sources/gdk-pixbuf-0.22.0-bmpcrash.patch
===================================================================
--- contrib/1.2/gdk-pixbuf/current/sources/gdk-pixbuf-0.22.0-bmpcrash.patch	2005-04-02 07:01:37 UTC (rev 6215)
+++ contrib/1.2/gdk-pixbuf/current/sources/gdk-pixbuf-0.22.0-bmpcrash.patch	2005-04-03 14:31:05 UTC (rev 6216)
@@ -0,0 +1,18 @@
+--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c.bmpcrash	2005-03-28 09:44:20.295820000 -0500
++++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2005-03-28 09:55:05.145324000 -0500
+@@ -246,7 +246,14 @@
+ static gboolean
+ grow_buffer (struct bmp_progressive_state *State)
+ {
+-  guchar *tmp = realloc (State->buff, State->BufferSize);
++  guchar *tmp; 
++
++  if (State->BufferSize == 0) {
++    State->read_state = READ_STATE_ERROR;
++    return FALSE;
++  }
++
++  tmp = realloc (State->buff, State->BufferSize);
+   if (!tmp) {
+     State->read_state = READ_STATE_ERROR;
+     return FALSE;

Modified: contrib/1.2/gdk-pixbuf/current/specs/gdk-pixbuf.spec
===================================================================
--- contrib/1.2/gdk-pixbuf/current/specs/gdk-pixbuf.spec	2005-04-02 07:01:37 UTC (rev 6215)
+++ contrib/1.2/gdk-pixbuf/current/specs/gdk-pixbuf.spec	2005-04-03 14:31:05 UTC (rev 6216)
@@ -1,7 +1,7 @@
 Name: gdk-pixbuf
 Summary: The GdkPixBuf image handling library
 Version: 0.22.0
-Release: 2jh
+Release: 3jh
 Copyright: LGPL
 Group: contrib
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -9,6 +9,7 @@
 Patch1: gdk-pixbuf-0.22.0-bmploop.patch
 Patch2: gdk-pixbuf-0.22.0-ico-width.patch
 Patch3: gdk-pixbuf-0.22.0-loaders.patch
+Patch4: gdk-pixbuf-0.22.0-bmpcrash.patch
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: gtk12+, glib12
@@ -44,6 +45,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export LDFLAGS="-L${PWD}/gdk-pixbuf/.libs"
@@ -83,6 +85,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Sun Apr  3 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.22.0-3jh
+- fix CAN-2005-0891
+
 * Thu Sep 16 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.22.0-2jh
 - add gdk-pixbuf-0.22.0-bmp-colormap.patch, gdk-pixbuf-0.22.0-bmploop.patch,
   gdk-pixbuf-0.22.0-ico-width.patch, gdk-pixbuf-0.22.0-loaders.patch



From svn at tinysofa.org  Mon Apr  4 08:29:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Apr 2005 04:29:15 -0400 (EDT)
Subject: [tinysofa-svn] r6217 - contrib/1.2/perl-net-dns/current/specs
Message-ID: <20050404082915.890593441FE@minbar.tinysofa.org>

Author: jh
Date: 2005-04-04 04:29:09 -0400 (Mon, 04 Apr 2005)
New Revision: 6217

Modified:
   contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec
Log:
- add -f's to avoid hang


Modified: contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec
===================================================================
--- contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec	2005-04-03 14:31:05 UTC (rev 6216)
+++ contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec	2005-04-04 08:29:09 UTC (rev 6217)
@@ -40,8 +40,8 @@
 %{__sed} "s|%{buildroot}||g" |\
 %{__sed} "/Win32/d" >>%{name}-%{version}-filelist
 
-%{__rm} %{buildroot}%{_mandir}/man3/Net::DNS::Resolver::Win32.3.gz
-%{__rm} %{buildroot}%{perl_vendorarch}/Net/DNS/Resolver/Win32.pm
+%{__rm} -f %{buildroot}%{_mandir}/man3/Net::DNS::Resolver::Win32.3.gz
+%{__rm} -f %{buildroot}%{perl_vendorarch}/Net/DNS/Resolver/Win32.pm
 
 %clean
 #%clean_buildroot



From svn at tinysofa.org  Mon Apr  4 18:54:10 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  4 Apr 2005 14:54:10 -0400 (EDT)
Subject: [tinysofa-svn] r6218 -
	tinysofa/releases/classic/2.0/apt/current/specs
Message-ID: <20050404185410.D9B853447D8@minbar.tinysofa.org>

Author: jh
Date: 2005-04-04 14:54:04 -0400 (Mon, 04 Apr 2005)
New Revision: 6218

Modified:
   tinysofa/releases/classic/2.0/apt/current/specs/apt.spec
Log:
- change tsrel to 2.0


Modified: tinysofa/releases/classic/2.0/apt/current/specs/apt.spec
===================================================================
--- tinysofa/releases/classic/2.0/apt/current/specs/apt.spec	2005-04-04 08:29:09 UTC (rev 6217)
+++ tinysofa/releases/classic/2.0/apt/current/specs/apt.spec	2005-04-04 18:54:04 UTC (rev 6218)
@@ -1,5 +1,5 @@
 # for mirror-select.conf
-%define tsrel 1.2
+%define tsrel 2.0
 
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt



From svn at tinysofa.org  Tue Apr  5 09:30:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:30:42 -0400 (EDT)
Subject: [tinysofa-svn] r6219 - contrib/1.2
Message-ID: <20050405093042.2B7F83443E7@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:30:32 -0400 (Tue, 05 Apr 2005)
New Revision: 6219

Added:
   contrib/1.2/dnsmasq/
Log:
- copy dnsmasq from 1.1


Copied: contrib/1.2/dnsmasq (from rev 6218, contrib/1.1/dnsmasq)



From svn at tinysofa.org  Tue Apr  5 09:33:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:33:35 -0400 (EDT)
Subject: [tinysofa-svn] r6220 - in contrib/1.2/dnsmasq/current: sources specs
Message-ID: <20050405093335.03D503443F2@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:33:22 -0400 (Tue, 05 Apr 2005)
New Revision: 6220

Added:
   contrib/1.2/dnsmasq/current/sources/dnsmasq-2.22.tar.gz
Removed:
   contrib/1.2/dnsmasq/current/sources/dnsmasq-2.20.tar.gz
Modified:
   contrib/1.2/dnsmasq/current/specs/dnsmasq.spec
Log:
- 2.22-1gd (gda)

Deleted: contrib/1.2/dnsmasq/current/sources/dnsmasq-2.20.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.2/dnsmasq/current/sources/dnsmasq-2.22.tar.gz
===================================================================
(Binary files differ)


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

Modified: contrib/1.2/dnsmasq/current/specs/dnsmasq.spec
===================================================================
--- contrib/1.2/dnsmasq/current/specs/dnsmasq.spec	2005-04-05 09:30:32 UTC (rev 6219)
+++ contrib/1.2/dnsmasq/current/specs/dnsmasq.spec	2005-04-05 09:33:22 UTC (rev 6220)
@@ -1,6 +1,6 @@
 Summary:  A lightweight caching nameserver
 Name:     dnsmasq
-Version:  2.20
+Version:  2.22
 Release:  1gd
 Group: contrib
 Source:   http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Mon Apr  4 2005 Gerald Dachs <gda at tinysofa dot org> 2.22-1gd
+- new upstream version
+
 * Thu Jan 27 2005 Gerald Dachs <gda at tinysofa dot org> 2.20-1gd
 - new upstream version
 



From svn at tinysofa.org  Tue Apr  5 09:35:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:35:32 -0400 (EDT)
Subject: [tinysofa-svn] r6221 - contrib/1.2
Message-ID: <20050405093532.DD248344307@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:35:23 -0400 (Tue, 05 Apr 2005)
New Revision: 6221

Added:
   contrib/1.2/task-desktop/
Log:
- copy task-desktop from 1.1


Copied: contrib/1.2/task-desktop (from rev 6220, contrib/1.1/task-desktop)



From svn at tinysofa.org  Tue Apr  5 09:39:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:39:28 -0400 (EDT)
Subject: [tinysofa-svn] r6222 - contrib/1.2
Message-ID: <20050405093928.277C834451F@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:39:18 -0400 (Tue, 05 Apr 2005)
New Revision: 6222

Added:
   contrib/1.2/xmms/
Log:
- copy xmms from 1.1


Copied: contrib/1.2/xmms (from rev 6221, contrib/1.1/xmms)



From svn at tinysofa.org  Tue Apr  5 09:42:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:42:22 -0400 (EDT)
Subject: [tinysofa-svn] r6223 - contrib/1.2
Message-ID: <20050405094222.77FF63443E7@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:42:13 -0400 (Tue, 05 Apr 2005)
New Revision: 6223

Added:
   contrib/1.2/arc/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/arc (from rev 6222, contrib/1.1/arc)



From svn at tinysofa.org  Tue Apr  5 09:42:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:42:43 -0400 (EDT)
Subject: [tinysofa-svn] r6224 - contrib/1.2
Message-ID: <20050405094243.93E5634455B@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:42:34 -0400 (Tue, 05 Apr 2005)
New Revision: 6224

Added:
   contrib/1.2/freeze/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/freeze (from rev 6223, contrib/1.1/freeze)



From svn at tinysofa.org  Tue Apr  5 09:43:04 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:43:04 -0400 (EDT)
Subject: [tinysofa-svn] r6225 - contrib/1.2
Message-ID: <20050405094304.065BE3441E9@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:42:55 -0400 (Tue, 05 Apr 2005)
New Revision: 6225

Added:
   contrib/1.2/lzo/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/lzo (from rev 6224, contrib/1.1/lzo)



From svn at tinysofa.org  Tue Apr  5 09:43:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:43:23 -0400 (EDT)
Subject: [tinysofa-svn] r6226 - contrib/1.2
Message-ID: <20050405094323.1B7C5344414@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:43:16 -0400 (Tue, 05 Apr 2005)
New Revision: 6226

Added:
   contrib/1.2/pax/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/pax (from rev 6225, contrib/1.1/pax)



From svn at tinysofa.org  Tue Apr  5 09:43:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:43:39 -0400 (EDT)
Subject: [tinysofa-svn] r6227 - contrib/1.2
Message-ID: <20050405094339.CB3893443D5@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:43:32 -0400 (Tue, 05 Apr 2005)
New Revision: 6227

Added:
   contrib/1.2/cabextract/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/cabextract (from rev 6226, contrib/1.1/cabextract)



From svn at tinysofa.org  Tue Apr  5 09:43:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:43:56 -0400 (EDT)
Subject: [tinysofa-svn] r6228 - contrib/1.2
Message-ID: <20050405094356.0F337344513@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:43:49 -0400 (Tue, 05 Apr 2005)
New Revision: 6228

Added:
   contrib/1.2/lha/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/lha (from rev 6227, contrib/1.1/lha)



From svn at tinysofa.org  Tue Apr  5 09:44:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  5 Apr 2005 05:44:12 -0400 (EDT)
Subject: [tinysofa-svn] r6229 - contrib/1.2
Message-ID: <20050405094412.49F28344513@minbar.tinysofa.org>

Author: jh
Date: 2005-04-05 05:44:05 -0400 (Tue, 05 Apr 2005)
New Revision: 6229

Added:
   contrib/1.2/lzop/
Log:
- copy from 1.1 contrib

Copied: contrib/1.2/lzop (from rev 6228, contrib/1.1/lzop)



From svn at tinysofa.org  Wed Apr  6 07:45:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  6 Apr 2005 03:45:53 -0400 (EDT)
Subject: [tinysofa-svn] r6230 -
	tinysofa/releases/classic/2.0/cyrus-imapd/current/specs
Message-ID: <20050406074553.4B0EB3443FA@minbar.tinysofa.org>

Author: jh
Date: 2005-04-06 03:45:47 -0400 (Wed, 06 Apr 2005)
New Revision: 6230

Modified:
   tinysofa/releases/classic/2.0/cyrus-imapd/current/specs/cyrus-imapd.spec
Log:
- don't force syncronous updates


Modified: tinysofa/releases/classic/2.0/cyrus-imapd/current/specs/cyrus-imapd.spec
===================================================================
--- tinysofa/releases/classic/2.0/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-04-05 09:44:05 UTC (rev 6229)
+++ tinysofa/releases/classic/2.0/cyrus-imapd/current/specs/cyrus-imapd.spec	2005-04-06 07:45:47 UTC (rev 6230)
@@ -1,7 +1,7 @@
 Summary: A high-performance mail store with IMAP and POP3 support.
 Name: cyrus-imapd
 Version: 2.2.12
-Release: 4gd
+Release: 5jh
 License: BSD
 Group: main
 URL: http://asg.web.cmu.edu/cyrus/imapd/
@@ -225,11 +225,6 @@
 fi
 
 %post
-if [ $1 -le 1 ]; then
-	# force synchronous updates on fresh installs
-	# Note: This will slow down user creation for 10.000+ users!
-	chattr -R +S /var/spool/cyrus-imap 2>/dev/null
-fi
 %service_post cyrus
 
 # Create SSL certificates



From svn at tinysofa.org  Wed Apr  6 08:37:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  6 Apr 2005 04:37:53 -0400 (EDT)
Subject: [tinysofa-svn] r6231 -
	tinysofa/releases/classic/2.0/kernel/current/sources
Message-ID: <20050406083753.B80923443CB@minbar.tinysofa.org>

Author: jh
Date: 2005-04-06 04:37:47 -0400 (Wed, 06 Apr 2005)
New Revision: 6231

Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch
Log:
- x86_64 compile fixes


Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch	2005-04-06 07:45:47 UTC (rev 6230)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch	2005-04-06 08:37:47 UTC (rev 6231)
@@ -1,5 +1,5 @@
---- linux-2.6.11/fs/proc/base.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/fs/proc/base.c	2005-03-22 21:22:54.000000000 +0200
+--- linux-2.6.11/fs/proc/base.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/fs/proc/base.c	2005-04-06 07:11:06.000000000 +0300
 @@ -132,7 +132,7 @@
  	E(PROC_TGID_CMDLINE,   "cmdline", S_IFREG|S_IRUGO),
  	E(PROC_TGID_STAT,      "stat",    S_IFREG|S_IRUGO),
@@ -18,8 +18,8 @@
  	E(PROC_TID_MEM,        "mem",     S_IFREG|S_IRUSR|S_IWUSR),
  	E(PROC_TID_CWD,        "cwd",     S_IFLNK|S_IRWXUGO),
  	E(PROC_TID_ROOT,       "root",    S_IFLNK|S_IRWXUGO),
---- linux-2.6.11/fs/proc/array.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/fs/proc/array.c	2005-03-22 21:26:21.000000000 +0200
+--- linux-2.6.11/fs/proc/array.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/fs/proc/array.c	2005-04-06 07:11:06.000000000 +0300
 @@ -281,22 +281,6 @@
  			    cap_t(p->cap_effective));
  }
@@ -86,8 +86,8 @@
  		esp,
  		eip,
  		/* The signal information here is obsolete.
---- linux-2.6.11/fs/binfmt_elf.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/fs/binfmt_elf.c	2005-03-22 21:13:49.000000000 +0200
+--- linux-2.6.11/fs/binfmt_elf.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/fs/binfmt_elf.c	2005-04-06 07:11:06.000000000 +0300
 @@ -44,15 +44,11 @@
  #include <asm/param.h>
  #include <asm/page.h>
@@ -897,8 +897,8 @@
  
  	return 1;
  }
---- linux-2.6.11/fs/exec.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/fs/exec.c	2005-03-22 21:46:05.000000000 +0200
+--- linux-2.6.11/fs/exec.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/fs/exec.c	2005-04-06 07:11:06.000000000 +0300
 @@ -64,20 +64,6 @@
  static struct linux_binfmt *formats;
  static DEFINE_RWLOCK(binfmt_lock);
@@ -1203,8 +1203,8 @@
  static void zap_threads (struct mm_struct *mm)
  {
  	struct task_struct *g, *p;
---- linux-2.6.11/mm/mprotect.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/mm/mprotect.c	2005-03-23 20:09:23.000000000 +0200
+--- linux-2.6.11/mm/mprotect.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/mm/mprotect.c	2005-04-06 07:11:06.000000000 +0300
 @@ -21,13 +21,10 @@
  #include <linux/syscalls.h>
  #include <linux/grsecurity.h>
@@ -1480,8 +1480,8 @@
  out:
  	up_write(&current->mm->mmap_sem);
  	return error;
---- linux-2.6.11/mm/mremap.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/mm/mremap.c	2005-03-22 21:42:11.000000000 +0200
+--- linux-2.6.11/mm/mremap.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/mm/mremap.c	2005-04-06 07:11:06.000000000 +0300
 @@ -150,12 +150,6 @@
  			if (dst) {
  				pte_t pte;
@@ -1580,8 +1580,8 @@
  	}
  out:
  	if (ret & ~PAGE_MASK)
---- linux-2.6.11/mm/memory.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/mm/memory.c	2005-03-23 10:35:08.000000000 +0200
+--- linux-2.6.11/mm/memory.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/mm/memory.c	2005-04-06 07:11:06.000000000 +0300
 @@ -874,7 +874,7 @@
  	do {
  		struct vm_area_struct *	vma;
@@ -1804,8 +1804,8 @@
  	pud = pud_alloc(mm, pgd, address);
  	if (!pud)
  		goto oom;
---- linux-2.6.11/mm/mmap.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/mm/mmap.c	2005-03-23 10:40:35.000000000 +0200
+--- linux-2.6.11/mm/mmap.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/mm/mmap.c	2005-04-06 07:11:06.000000000 +0300
 @@ -25,6 +25,7 @@
  #include <linux/mount.h>
  #include <linux/mempolicy.h>
@@ -2719,8 +2719,8 @@
  
  	spin_unlock(&mm->page_table_lock);
  
---- linux-2.6.11/arch/i386/mm/fault.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/mm/fault.c	2005-03-23 10:30:45.000000000 +0200
+--- linux-2.6.11/arch/i386/mm/fault.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/mm/fault.c	2005-04-06 07:11:06.000000000 +0300
 @@ -21,9 +21,6 @@
  #include <linux/vt_kern.h>		/* For unblank_screen() */
  #include <linux/highmem.h>
@@ -3305,8 +3305,8 @@
 -	printk("\n");
 -}
 -#endif
---- linux-2.6.11/arch/i386/mm/mmap.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/mm/mmap.c	2005-03-23 08:53:02.000000000 +0200
+--- linux-2.6.11/arch/i386/mm/mmap.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/mm/mmap.c	2005-04-06 07:11:06.000000000 +0300
 @@ -26,6 +26,7 @@
  
  #include <linux/personality.h>
@@ -3371,8 +3371,8 @@
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
  }
---- linux-2.6.11/arch/i386/mm/init.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/mm/init.c	2005-03-23 08:54:58.000000000 +0200
+--- linux-2.6.11/arch/i386/mm/init.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/mm/init.c	2005-04-06 07:11:06.000000000 +0300
 @@ -39,7 +39,6 @@
  #include <asm/tlb.h>
  #include <asm/tlbflush.h>
@@ -3601,8 +3601,8 @@
  	addr = (unsigned long)(&__init_begin);
  	for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
  		ClearPageReserved(virt_to_page(addr));
---- linux-2.6.11/arch/i386/power/cpu.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/power/cpu.c	2005-03-23 10:50:26.000000000 +0200
+--- linux-2.6.11/arch/i386/power/cpu.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/power/cpu.c	2005-04-06 07:11:06.000000000 +0300
 @@ -83,9 +83,10 @@
  static void fix_processor_context(void)
  {
@@ -3615,8 +3615,8 @@
  
  	load_TR_desc();				/* This does ltr */
  	load_LDT(&current->active_mm->context);	/* This does lldt */
---- linux-2.6.11/arch/i386/kernel/cpu/common.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/cpu/common.c	2005-03-23 09:06:07.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/cpu/common.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/cpu/common.c	2005-04-06 07:11:06.000000000 +0300
 @@ -3,6 +3,7 @@
  #include <linux/delay.h>
  #include <linux/smp.h>
@@ -3701,8 +3701,8 @@
  
  	/* Set up doublefault TSS pointer in the GDT */
  	__set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
---- linux-2.6.11/arch/i386/kernel/asm-offsets.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/asm-offsets.c	2005-03-23 08:58:11.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/asm-offsets.c.exec-shield~	2005-03-02 09:38:00.000000000 +0200
++++ linux-2.6.11/arch/i386/kernel/asm-offsets.c	2005-04-06 07:11:06.000000000 +0300
 @@ -52,6 +52,7 @@
  	OFFSET(TI_preempt_count, thread_info, preempt_count);
  	OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -3711,8 +3711,8 @@
  	BLANK();
  
  	OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
---- linux-2.6.11/arch/i386/kernel/apm.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/apm.c	2005-03-23 10:25:11.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/apm.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/apm.c	2005-04-06 07:11:06.000000000 +0300
 @@ -598,39 +598,19 @@
  	int			cpu;
  	struct desc_struct	save_desc_40;
@@ -3848,8 +3848,8 @@
                          	printk(KERN_NOTICE "apm: we set the granularity of dseg.\n");
          	        }
  		}
---- linux-2.6.11/arch/i386/kernel/sysenter.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/sysenter.c	2005-03-23 09:22:48.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/sysenter.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/sysenter.c	2005-04-06 07:11:06.000000000 +0300
 @@ -13,6 +13,7 @@
  #include <linux/gfp.h>
  #include <linux/string.h>
@@ -3937,8 +3937,8 @@
 +}
 +__setup("vdso=", vdso_setup);
 +
---- linux-2.6.11/arch/i386/kernel/ioport.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/ioport.c	2005-03-23 10:16:34.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/ioport.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/ioport.c	2005-04-06 07:11:06.000000000 +0300
 @@ -95,7 +95,7 @@
  	 * because the ->io_bitmap_max value must match the bitmap
  	 * contents:
@@ -3948,8 +3948,8 @@
  
  	set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
  
---- linux-2.6.11/arch/i386/kernel/vsyscall.lds.S.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/vsyscall.lds.S	2005-03-23 08:56:55.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/vsyscall.lds.S.exec-shield~	2005-03-02 09:38:07.000000000 +0200
++++ linux-2.6.11/arch/i386/kernel/vsyscall.lds.S	2005-04-06 07:11:06.000000000 +0300
 @@ -7,7 +7,7 @@
  
  SECTIONS
@@ -3968,8 +3968,8 @@
  
    .text           : { *(.text) }		:text =0x90909090
  
---- linux-2.6.11/arch/i386/kernel/sys_i386.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/sys_i386.c	2005-03-23 19:52:41.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/sys_i386.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/sys_i386.c	2005-04-06 07:11:06.000000000 +0300
 @@ -49,11 +49,6 @@
  	int error = -EBADF;
  	struct file * file = NULL;
@@ -4165,8 +4165,8 @@
  
  struct sel_arg_struct {
  	unsigned long n;
---- linux-2.6.11/arch/i386/kernel/traps.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/traps.c	2005-03-23 09:16:47.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/traps.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/traps.c	2005-04-06 07:11:06.000000000 +0300
 @@ -27,7 +27,6 @@
  #include <linux/ptrace.h>
  #include <linux/utsname.h>
@@ -4344,8 +4344,8 @@
  }
  #endif
  
---- linux-2.6.11/arch/i386/kernel/vmlinux.lds.S.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/vmlinux.lds.S	2005-03-23 18:31:08.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/vmlinux.lds.S.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/vmlinux.lds.S	2005-04-06 07:11:06.000000000 +0300
 @@ -2,12 +2,9 @@
   * Written by Martin Mares <mj at atrey.karlin.mff.cuni.cz>;
   */
@@ -4544,8 +4544,8 @@
    . = ALIGN(4);
    __bss_stop = .; 
  
---- linux-2.6.11/arch/i386/kernel/signal.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/signal.c	2005-03-23 09:05:33.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/signal.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/signal.c	2005-04-06 07:11:06.000000000 +0300
 @@ -380,17 +380,7 @@
  			goto give_sigsegv;
  	}
@@ -4588,8 +4588,8 @@
  	err |= __put_user(restorer, &frame->pretcode);
  	 
  	/*
---- linux-2.6.11/arch/i386/kernel/smp.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/smp.c	2005-03-23 09:18:30.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/smp.c.exec-shield~	2005-03-02 09:37:48.000000000 +0200
++++ linux-2.6.11/arch/i386/kernel/smp.c	2005-04-06 07:11:06.000000000 +0300
 @@ -22,6 +22,7 @@
  
  #include <asm/mtrr.h>
@@ -4607,8 +4607,8 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.11/arch/i386/kernel/process.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/process.c	2005-03-23 09:12:59.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/process.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/process.c	2005-04-06 07:11:06.000000000 +0300
 @@ -36,6 +36,8 @@
  #include <linux/module.h>
  #include <linux/kallsyms.h>
@@ -4810,8 +4810,8 @@
 +		current->mm->brk = new_brk;
 +}
 +
---- linux-2.6.11/arch/i386/kernel/vm86.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/vm86.c	2005-03-23 10:11:48.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/vm86.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/vm86.c	2005-04-06 07:11:06.000000000 +0300
 @@ -121,7 +121,7 @@
  		do_exit(SIGSEGV);
  	}
@@ -4830,8 +4830,8 @@
  	tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
  	if (cpu_has_sep)
  		tsk->thread.sysenter_cs = 0;
---- linux-2.6.11/arch/i386/kernel/init_task.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/init_task.c	2005-03-23 19:19:21.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/init_task.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/init_task.c	2005-04-06 07:11:06.000000000 +0300
 @@ -42,4 +42,5 @@
   * per-CPU TSS segments. Threads are completely 'soft' on Linux,
   * no more per-task TSS's.
@@ -4839,8 +4839,8 @@
 -struct tss_struct init_tss[NR_CPUS] ____cacheline_maxaligned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_maxaligned_in_smp = INIT_TSS;
 +
---- linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S	2005-03-23 09:21:12.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S.exec-shield~	2005-03-02 09:38:07.000000000 +0200
++++ linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S	2005-04-06 07:11:06.000000000 +0300
 @@ -24,11 +24,11 @@
  	/* 7: align return point with nop's to make disassembly easier */
  	.space 7,0x90
@@ -4856,8 +4856,8 @@
  	pop %ebp
  .Lpop_ebp:
  	pop %edx
---- linux-2.6.11/arch/i386/kernel/entry.S.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/entry.S	2005-03-23 09:08:37.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/entry.S.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/entry.S	2005-04-06 07:11:06.000000000 +0300
 @@ -201,8 +201,12 @@
  	pushl %ebp
  	pushfl
@@ -4910,8 +4910,8 @@
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
---- linux-2.6.11/arch/i386/kernel/head.S.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/head.S	2005-03-23 11:23:41.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/head.S.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/head.S	2005-04-06 07:11:06.000000000 +0300
 @@ -48,12 +48,6 @@
  
  
@@ -5217,8 +5217,8 @@
 -#ifdef CONFIG_SMP
 -	.fill (NR_CPUS-1)*GDT_ENTRIES,8,0 /* other CPU's GDT */
 -#endif
---- linux-2.6.11/arch/i386/kernel/setup.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/i386/kernel/setup.c	2005-03-23 20:12:44.000000000 +0200
+--- linux-2.6.11/arch/i386/kernel/setup.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/i386/kernel/setup.c	2005-04-06 07:11:06.000000000 +0300
 @@ -73,11 +73,7 @@
  /* common cpu data for all cpus */
  struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
@@ -5256,8 +5256,8 @@
  #include "setup_arch_post.h"
  /*
   * Local Variables:
---- linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c	2005-03-22 22:09:16.000000000 +0200
+--- linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c	2005-04-06 07:11:06.000000000 +0300
 @@ -43,17 +43,6 @@
  
  #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
@@ -5285,8 +5285,8 @@
  {
  	unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
  
---- linux-2.6.11/arch/x86_64/mm/Makefile.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/arch/x86_64/mm/Makefile	2005-03-22 22:07:21.000000000 +0200
+--- linux-2.6.11/arch/x86_64/mm/Makefile.exec-shield~	2005-03-02 09:38:17.000000000 +0200
++++ linux-2.6.11/arch/x86_64/mm/Makefile	2005-04-06 07:11:06.000000000 +0300
 @@ -2,7 +2,7 @@
  # Makefile for the linux x86_64-specific parts of the memory manager.
  #
@@ -5296,8 +5296,124 @@
  obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
  obj-$(CONFIG_DISCONTIGMEM) += numa.o
  obj-$(CONFIG_K8_NUMA) += k8topology.o
---- linux-2.6.11/arch/x86_64/mm/mmap.c.exec-shield~	2005-03-23 20:20:33.000000000 +0200
-+++ linux-2.6.11/arch/x86_64/mm/mmap.c	2005-03-22 22:07:15.000000000 +0200
+--- linux-2.6.11/arch/x86_64/mm/fault.c.exec-shield~	2005-04-06 07:13:40.000000000 +0300
++++ linux-2.6.11/arch/x86_64/mm/fault.c	2005-04-06 07:14:05.000000000 +0300
+@@ -24,7 +24,6 @@
+ #include <linux/compiler.h>
+ #include <linux/module.h>
+ #include <linux/kprobes.h>
+-#include <linux/binfmts.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+@@ -281,63 +280,6 @@
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_PAX_PAGEEXEC
+-/*
+- * PaX: decide what to do with offenders (regs->rip = fault address)
+- *
+- * returns 1 when task should be killed
+- *         2 when legitimate ET_EXEC was detected
+- */
+-static int pax_handle_fetch_fault(struct pt_regs *regs)
+-{
+-
+-#ifdef CONFIG_PAX_RANDEXEC
+-	int err;
+-
+-	if (current->mm->flags & MF_PAX_RANDEXEC) {
+-		if (regs->rip >= current->mm->start_code &&
+-		    regs->rip < current->mm->end_code)
+-		{
+-			if (test_thread_flag(TIF_IA32)) {
+-				unsigned int esp_4;
+-
+-				err = get_user(esp_4, (unsigned int*)(regs->rsp-4UL));
+-				if (err || esp_4 == regs->rip)
+-					return 1;
+-			} else {
+-				unsigned long esp_8;
+-
+-				err = get_user(esp_8, (unsigned long*)(regs->rsp-8UL));
+-				if (err || esp_8 == regs->rip)
+-					return 1;
+-			}
+-
+-			regs->rip += current->mm->delta_exec;
+-			return 2;
+-		}
+-	}
+-#endif
+-
+-	return 1;
+-}
+-
+-void pax_report_insns(void *pc, void *sp)
+-{
+-	unsigned long i;
+-
+-	printk(KERN_ERR "PAX: bytes at PC: ");
+-	for (i = 0; i < 20; i++) {
+-		unsigned int c;
+-		if (get_user(c, (unsigned char*)pc+i)) {
+-			printk("<invalid address>.");
+-			break;
+-		}
+-		printk("%08x ", c);
+-	}
+-	printk("\n");
+-}
+-#endif
+-
+ int page_fault_trace = 0;
+ int exception_trace = 1;
+ 
+@@ -463,7 +405,7 @@
+ 		if (address + 128 < regs->rsp)
+ 			goto bad_area;
+ 	}
+-	if (expand_stack(tsk, vma, address))
++	if (expand_stack(vma, address))
+ 		goto bad_area;
+ /*
+  * Ok, we have a good vm_area for this memory access, so
+@@ -472,8 +414,6 @@
+ good_area:
+ 	info.si_code = SEGV_ACCERR;
+ 	write = 0;
+-	if ((error_code & 16) && !(vma->vm_flags & VM_EXEC))
+-		goto bad_area;
+ 	switch (error_code & 3) {
+ 		default:	/* 3: write, present */
+ 			/* fall through */
+@@ -551,22 +491,7 @@
+ 					tsk->comm, tsk->pid, address, regs->rip,
+ 					regs->rsp, error_code);
+ 		}
+-
+-#ifdef CONFIG_PAX_PAGEEXEC
+-		if (mm && (mm->flags & MF_PAX_PAGEEXEC) && (error_code & 16)) {
+-			switch(pax_handle_fetch_fault(regs)) {
+-
+-#ifdef CONFIG_PAX_RANDEXEC
+-			case 2:
+-				return;
+-#endif
+-
+-			}
+-			pax_report_fault(regs, (void*)regs->rip, (void*)regs->rsp);
+-			do_exit(SIGKILL);
+-		}
+-#endif
+-
++       
+ 		tsk->thread.cr2 = address;
+ 		/* Kernel addresses are always protection faults */
+ 		tsk->thread.error_code = error_code | (address >= TASK_SIZE);
+--- /dev/null	2004-08-31 12:30:25.000000000 +0300
++++ linux-2.6.11/arch/x86_64/mm/mmap.c	2005-04-06 07:11:06.000000000 +0300
 @@ -0,0 +1,95 @@
 +/*
 + *  linux/arch/x86-64/mm/mmap.c
@@ -5394,8 +5510,37 @@
 +	return sp & ~0xf;
 +}
 +
---- linux-2.6.11/drivers/pnp/pnpbios/bioscalls.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/drivers/pnp/pnpbios/bioscalls.c	2005-03-23 18:35:44.000000000 +0200
+--- linux-2.6.11/arch/x86_64/ia32/ia32_binfmt.c.exec-shield~	2005-04-06 11:05:19.000000000 +0300
++++ linux-2.6.11/arch/x86_64/ia32/ia32_binfmt.c	2005-04-06 11:05:37.000000000 +0300
+@@ -186,17 +186,6 @@
+ //#include <asm/ia32.h>
+ #include <linux/elf.h>
+ 
+-#ifdef CONFIG_PAX_ASLR
+-#define PAX_ELF_ET_DYN_BASE(tsk)	(test_thread_flag(TIF_IA32) ? 0x08048000UL : 0x400000UL)
+-
+-#define PAX_DELTA_MMAP_LSB(tsk)		PAGE_SHIFT
+-#define PAX_DELTA_MMAP_LEN(tsk)		(test_thread_flag(TIF_IA32) ? 16 : 24)
+-#define PAX_DELTA_EXEC_LSB(tsk)		PAGE_SHIFT
+-#define PAX_DELTA_EXEC_LEN(tsk)		(test_thread_flag(TIF_IA32) ? 16 : 24)
+-#define PAX_DELTA_STACK_LSB(tsk)	PAGE_SHIFT
+-#define PAX_DELTA_STACK_LEN(tsk)	(test_thread_flag(TIF_IA32) ? 16 : 24)
+-#endif
+-
+ typedef struct user_i387_ia32_struct elf_fpregset_t;
+ typedef struct user32_fxsr_struct elf_fpxregset_t;
+ 
+@@ -406,7 +395,7 @@
+ }
+ 
+ static unsigned long
+-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
++elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
+ {
+ 	unsigned long map_addr;
+ 	struct task_struct *me = current; 
+--- linux-2.6.11/drivers/pnp/pnpbios/bioscalls.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/drivers/pnp/pnpbios/bioscalls.c	2005-04-06 07:11:06.000000000 +0300
 @@ -69,17 +69,17 @@
  
  #define Q_SET_SEL(cpu, selname, address, size) \
@@ -5467,8 +5612,8 @@
  	put_cpu();
  
  	/* If we get here and this is set then the PnP BIOS faulted on us. */
---- linux-2.6.11/drivers/char/random.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/drivers/char/random.c	2005-03-23 09:30:07.000000000 +0200
+--- linux-2.6.11/drivers/char/random.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/drivers/char/random.c	2005-04-06 07:11:06.000000000 +0300
 @@ -1971,7 +1971,7 @@
   *
   ********************************************************************/
@@ -5518,8 +5663,8 @@
  #if defined(CONFIG_PAX_ASLR) || defined(CONFIG_GRKERNSEC)
  unsigned long pax_get_random_long(void)
  {
---- linux-2.6.11/kernel/futex.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/kernel/futex.c	2005-03-23 10:32:41.000000000 +0200
+--- linux-2.6.11/kernel/futex.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/kernel/futex.c	2005-04-06 07:11:06.000000000 +0300
 @@ -146,11 +146,6 @@
  	struct page *page;
  	int err;
@@ -5541,8 +5686,8 @@
  	if (unlikely(!vma))
  		return -EFAULT;
  
---- linux-2.6.11/kernel/sysctl.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/kernel/sysctl.c	2005-03-22 22:04:21.000000000 +0200
+--- linux-2.6.11/kernel/sysctl.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/kernel/sysctl.c	2005-04-06 07:11:06.000000000 +0300
 @@ -80,6 +80,29 @@
  				  void __user *, size_t *, loff_t *);
  #endif
@@ -5661,8 +5806,8 @@
  	{ .ctl_name = 0 }
  };
  
---- linux-2.6.11/kernel/signal.c.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/kernel/signal.c	2005-03-23 20:06:03.000000000 +0200
+--- linux-2.6.11/kernel/signal.c.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/kernel/signal.c	2005-04-06 07:11:06.000000000 +0300
 @@ -1185,6 +1185,37 @@
  	return error;
  }
@@ -5722,8 +5867,8 @@
  		if (sig_kernel_coredump(signr)) {
  			/*
  			 * If it was able to dump core, this kills all
---- linux-2.6.11/include/linux/sched.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/linux/sched.h	2005-03-23 09:47:21.000000000 +0200
+--- linux-2.6.11/include/linux/sched.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/linux/sched.h	2005-04-06 07:11:06.000000000 +0300
 @@ -34,7 +34,9 @@
  #include <linux/topology.h>
  
@@ -5803,8 +5948,8 @@
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
---- linux-2.6.11/include/linux/random.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/linux/random.h	2005-03-23 09:39:47.000000000 +0200
+--- linux-2.6.11/include/linux/random.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/linux/random.h	2005-04-06 07:11:06.000000000 +0300
 @@ -72,6 +72,9 @@
  extern struct file_operations random_fops, urandom_fops;
  #endif
@@ -5815,8 +5960,8 @@
  #endif /* __KERNEL___ */
  
  #endif /* _LINUX_RANDOM_H */
---- linux-2.6.11/include/linux/resource.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/linux/resource.h	2005-03-23 09:41:50.000000000 +0200
+--- linux-2.6.11/include/linux/resource.h.exec-shield~	2005-03-02 09:37:48.000000000 +0200
++++ linux-2.6.11/include/linux/resource.h	2005-04-06 07:11:06.000000000 +0300
 @@ -52,8 +52,11 @@
  /*
   * Limit the stack by to some sane default: root can always
@@ -5830,8 +5975,8 @@
  
  /*
   * GPG wants 32kB of mlocked memory, to make sure pass phrases
---- linux-2.6.11/include/linux/mm.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/linux/mm.h	2005-03-23 09:48:45.000000000 +0200
+--- linux-2.6.11/include/linux/mm.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/linux/mm.h	2005-04-06 07:11:06.000000000 +0300
 @@ -114,49 +114,8 @@
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
@@ -5953,8 +6098,8 @@
 -
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
---- linux-2.6.11/include/linux/sysctl.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/linux/sysctl.h	2005-03-23 09:43:37.000000000 +0200
+--- linux-2.6.11/include/linux/sysctl.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/linux/sysctl.h	2005-04-06 07:11:06.000000000 +0300
 @@ -84,6 +84,10 @@
  
  	KERN_CAP_BSET=14,	/* int: capability bounding set */
@@ -5986,8 +6131,8 @@
  
  /* CTL_VM names: */
  enum
---- linux-2.6.11/include/asm-x86_64/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-x86_64/pgalloc.h	2005-03-23 10:01:30.000000000 +0200
+--- linux-2.6.11/include/asm-x86_64/pgalloc.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-x86_64/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -7,8 +7,15 @@
  #include <linux/threads.h>
  #include <linux/mm.h>
@@ -6005,14 +6150,15 @@
  #define pud_populate(mm, pud, pmd) \
  		set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)))
  #define pgd_populate(mm, pgd, pud) \
---- linux-2.6.11/include/asm-x86_64/processor.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-x86_64/processor.h	2005-03-23 10:01:22.000000000 +0200
-@@ -164,6 +164,15 @@
+--- linux-2.6.11/include/asm-x86_64/processor.h.exec-shield~	2005-03-02 09:38:32.000000000 +0200
++++ linux-2.6.11/include/asm-x86_64/processor.h	2005-04-06 07:12:54.000000000 +0300
+@@ -162,8 +162,15 @@
+ /*
+  * User space process size. 47bits.
   */
- #define TASK_SIZE	(0x800000000000UL)
+-#define TASK_SIZE	(0x800000000000UL)
++#define TASK_SIZE_64	(0x800000000000)
  
-+#define TASK_SIZE_64	(0x800000000000)
-+
 +#define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
 +
 +#define __HAVE_ARCH_ALIGN_STACK
@@ -6023,8 +6169,8 @@
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */
---- linux-2.6.11/include/asm-ppc64/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-ppc64/pgalloc.h	2005-03-23 09:59:37.000000000 +0200
+--- linux-2.6.11/include/asm-ppc64/pgalloc.h.exec-shield~	2005-03-02 09:37:47.000000000 +0200
++++ linux-2.6.11/include/asm-ppc64/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -11,6 +11,11 @@
  
  extern kmem_cache_t *zero_cache;
@@ -6037,8 +6183,8 @@
  /*
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
---- linux-2.6.11/include/asm-sparc/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-sparc/pgalloc.h	2005-03-23 09:36:38.000000000 +0200
+--- linux-2.6.11/include/asm-sparc/pgalloc.h.exec-shield~	2005-03-02 09:37:48.000000000 +0200
++++ linux-2.6.11/include/asm-sparc/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -66,4 +66,8 @@
  #define pte_free(pte)		BTFIXUP_CALL(pte_free)(pte)
  #define __pte_free_tlb(tlb, pte)	pte_free(pte)
@@ -6048,8 +6194,8 @@
 +#define arch_remove_exec_range(mm, limit)	do { ; } while (0)
 +
  #endif /* _SPARC_PGALLOC_H */
---- linux-2.6.11/include/asm-i386/elf.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/elf.h	2005-03-23 09:58:49.000000000 +0200
+--- linux-2.6.11/include/asm-i386/elf.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/elf.h	2005-04-06 07:11:06.000000000 +0300
 @@ -9,6 +9,7 @@
  #include <asm/user.h>
  #include <asm/processor.h>
@@ -6171,8 +6317,8 @@
 +extern void map_vsyscall(void);
  
  #endif
---- linux-2.6.11/include/asm-i386/desc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/desc.h	2005-03-23 09:54:37.000000000 +0200
+--- linux-2.6.11/include/asm-i386/desc.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/desc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -8,70 +8,12 @@
  
  #include <linux/preempt.h>
@@ -6356,8 +6502,8 @@
  #endif /* !__ASSEMBLY__ */
  
  #endif
---- linux-2.6.11/include/asm-i386/mmu.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/mmu.h	2005-03-23 09:50:24.000000000 +0200
+--- linux-2.6.11/include/asm-i386/mmu.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/mmu.h	2005-04-06 07:11:06.000000000 +0300
 @@ -7,22 +7,17 @@
   * we put the segment information here.
   *
@@ -6387,8 +6533,8 @@
  } mm_context_t;
  
  #endif
---- linux-2.6.11/include/asm-i386/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/pgalloc.h	2005-03-23 09:57:31.000000000 +0200
+--- linux-2.6.11/include/asm-i386/pgalloc.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -4,11 +4,12 @@
  #include <linux/config.h>
  #include <asm/processor.h>
@@ -6403,8 +6549,8 @@
  
  #define pmd_populate(mm, pmd, pte) 				\
  	set_pmd(pmd, __pmd(_PAGE_TABLE +			\
---- linux-2.6.11/include/asm-i386/a.out.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/a.out.h	2005-03-23 19:24:04.000000000 +0200
+--- linux-2.6.11/include/asm-i386/a.out.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/a.out.h	2005-04-06 07:11:06.000000000 +0300
 @@ -19,11 +19,7 @@
  
  #ifdef __KERNEL__
@@ -6418,8 +6564,8 @@
  
  #endif
  
---- linux-2.6.11/include/asm-i386/system.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/system.h	2005-03-23 19:30:51.000000000 +0200
+--- linux-2.6.11/include/asm-i386/system.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/system.h	2005-04-06 07:11:06.000000000 +0300
 @@ -5,7 +5,6 @@
  #include <linux/kernel.h>
  #include <asm/segment.h>
@@ -6464,8 +6610,8 @@
  
  /*
   * Force strict CPU ordering.
---- linux-2.6.11/include/asm-i386/mmu_context.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/mmu_context.h	2005-03-23 10:22:16.000000000 +0200
+--- linux-2.6.11/include/asm-i386/mmu_context.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/mmu_context.h	2005-04-06 07:11:06.000000000 +0300
 @@ -46,13 +46,6 @@
  		 */
  		if (unlikely(prev->context.ldt != next->context.ldt))
@@ -6493,8 +6639,8 @@
  		}
  	}
  #endif
---- linux-2.6.11/include/asm-i386/processor.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/processor.h	2005-03-23 09:52:25.000000000 +0200
+--- linux-2.6.11/include/asm-i386/processor.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/processor.h	2005-04-06 07:11:06.000000000 +0300
 @@ -19,6 +19,7 @@
  #include <linux/cache.h>
  #include <linux/config.h>
@@ -6597,8 +6743,8 @@
  			  X86_FEATURE_3DNOW,
  			  "r" (x));
  }
---- linux-2.6.11/include/asm-i386/mach-default/apm.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/mach-default/apm.h	2005-03-23 19:25:24.000000000 +0200
+--- linux-2.6.11/include/asm-i386/mach-default/apm.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/mach-default/apm.h	2005-04-06 07:11:06.000000000 +0300
 @@ -36,7 +36,7 @@
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -6617,8 +6763,8 @@
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
---- linux-2.6.11/include/asm-i386/thread_info.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/thread_info.h	2005-03-23 09:56:20.000000000 +0200
+--- linux-2.6.11/include/asm-i386/thread_info.h.exec-shield~	2005-03-02 09:37:48.000000000 +0200
++++ linux-2.6.11/include/asm-i386/thread_info.h	2005-04-06 07:11:06.000000000 +0300
 @@ -38,6 +38,7 @@
  					 	   0-0xBFFFFFFF for user-thead
  						   0-0xFFFFFFFF for kernel-thread
@@ -6627,8 +6773,8 @@
  	struct restart_block    restart_block;
  
  	unsigned long           previous_esp;   /* ESP of the previous stack in case
---- linux-2.6.11/include/asm-i386/pgtable.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-i386/pgtable.h	2005-03-23 19:29:31.000000000 +0200
+--- linux-2.6.11/include/asm-i386/pgtable.h.exec-shield~	2005-04-06 07:11:06.000000000 +0300
++++ linux-2.6.11/include/asm-i386/pgtable.h	2005-04-06 07:11:06.000000000 +0300
 @@ -31,6 +31,7 @@
   */
  #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
@@ -6735,8 +6881,8 @@
  #ifndef CONFIG_DISCONTIGMEM
  #define kern_addr_valid(addr)	(1)
  #endif /* !CONFIG_DISCONTIGMEM */
---- linux-2.6.11/include/asm-ia64/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-ia64/pgalloc.h	2005-03-23 09:36:23.000000000 +0200
+--- linux-2.6.11/include/asm-ia64/pgalloc.h.exec-shield~	2005-03-02 09:37:31.000000000 +0200
++++ linux-2.6.11/include/asm-ia64/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -23,6 +23,10 @@
  #include <asm/mmu_context.h>
  #include <asm/processor.h>
@@ -6748,8 +6894,8 @@
  /*
   * Very stupidly, we used to get new pgd's and pmd's, init their contents
   * to point to the NULL versions of the next level page table, later on
---- linux-2.6.11/include/asm-s390/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-s390/pgalloc.h	2005-03-23 09:37:22.000000000 +0200
+--- linux-2.6.11/include/asm-s390/pgalloc.h.exec-shield~	2005-03-02 09:38:12.000000000 +0200
++++ linux-2.6.11/include/asm-s390/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -19,6 +19,10 @@
  #include <linux/gfp.h>
  #include <linux/mm.h>
@@ -6761,8 +6907,8 @@
  #define check_pgt_cache()	do {} while (0)
  
  extern void diag10(unsigned long addr);
---- linux-2.6.11/include/asm-ppc/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-ppc/pgalloc.h	2005-03-23 09:37:39.000000000 +0200
+--- linux-2.6.11/include/asm-ppc/pgalloc.h.exec-shield~	2005-03-02 09:38:34.000000000 +0200
++++ linux-2.6.11/include/asm-ppc/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -40,5 +40,10 @@
  
  #define check_pgt_cache()	do { } while (0)
@@ -6774,8 +6920,8 @@
 +
  #endif /* _PPC_PGALLOC_H */
  #endif /* __KERNEL__ */
---- linux-2.6.11/include/asm-sparc64/pgalloc.h.exec-shield~	2005-03-23 20:20:05.000000000 +0200
-+++ linux-2.6.11/include/asm-sparc64/pgalloc.h	2005-03-23 10:00:42.000000000 +0200
+--- linux-2.6.11/include/asm-sparc64/pgalloc.h.exec-shield~	2005-03-02 09:38:26.000000000 +0200
++++ linux-2.6.11/include/asm-sparc64/pgalloc.h	2005-04-06 07:11:06.000000000 +0300
 @@ -260,4 +260,8 @@
  #define pgd_free(pgd)		free_pgd_fast(pgd)
  #define pgd_alloc(mm)		get_pgd_fast()



From svn at tinysofa.org  Wed Apr  6 17:32:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  6 Apr 2005 13:32:08 -0400 (EDT)
Subject: [tinysofa-svn] r6232 - in contrib/1.2/swig/current: sources specs
Message-ID: <20050406173208.9E6EB34440D@minbar.tinysofa.org>

Author: jh
Date: 2005-04-06 13:30:49 -0400 (Wed, 06 Apr 2005)
New Revision: 6232

Added:
   contrib/1.2/swig/current/sources/swig-1.3.23-pylib.patch
   contrib/1.2/swig/current/sources/swig-1.3.24.tar.gz
Removed:
   contrib/1.2/swig/current/sources/swig-1.3.21-destdir.patch
   contrib/1.2/swig/current/sources/swig-1.3.21.tar.gz
Modified:
   contrib/1.2/swig/current/specs/swig.spec
Log:
- 1.3.24
- major package cleanup


Deleted: contrib/1.2/swig/current/sources/swig-1.3.21-destdir.patch
===================================================================
--- contrib/1.2/swig/current/sources/swig-1.3.21-destdir.patch	2005-04-06 08:37:47 UTC (rev 6231)
+++ contrib/1.2/swig/current/sources/swig-1.3.21-destdir.patch	2005-04-06 17:30:49 UTC (rev 6232)
@@ -1,23 +0,0 @@
---- SWIG-1.3.21/Makefile.in.destdir	2004-05-04 15:03:07.651571157 +0200
-+++ SWIG-1.3.21/Makefile.in	2004-05-04 15:03:58.278335334 +0200
-@@ -365,9 +365,9 @@
- 
- install-m4:
- 	@echo "Installing M4 macros"
--	@$(MKINSTDIRS) $(M4_INSTALL_DIR)
-+	@$(MKINSTDIRS) $(DESTDIR)$(M4_INSTALL_DIR)
- 	@echo "Installing $(M4_INSTALL_DIR)/swig.m4"
--	@$(INSTALL_DATA) $(M4_SOURCE_DIR)/swig.m4 $(M4_INSTALL_DIR)/swig.m4
-+	@$(INSTALL_DATA) $(M4_SOURCE_DIR)/swig.m4 $(DESTDIR)$(M4_INSTALL_DIR)/swig.m4
- 
- 
- #####################################################################
-@@ -390,7 +390,7 @@
- 
- uninstall-m4:
- 	@echo "Uninstalling $(M4_INSTALL_DIR)/swig.m4"
--	rm -f $(M4_INSTALL_DIR)/swig.m4;
-+	rm -f $(DESTDIR)$(M4_INSTALL_DIR)/swig.m4;
- 
- ############################################################################
- # DIST and other maintenance

Deleted: contrib/1.2/swig/current/sources/swig-1.3.21.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.2/swig/current/sources/swig-1.3.23-pylib.patch
===================================================================
--- contrib/1.2/swig/current/sources/swig-1.3.23-pylib.patch	2005-04-06 08:37:47 UTC (rev 6231)
+++ contrib/1.2/swig/current/sources/swig-1.3.23-pylib.patch	2005-04-06 17:30:49 UTC (rev 6232)
@@ -0,0 +1,29 @@
+--- SWIG-1.3.23/configure.in.pylib	2004-11-02 00:45:57.000000000 +0100
++++ SWIG-1.3.23/configure.in	2004-11-23 12:20:12.552926982 +0100
+@@ -574,9 +574,11 @@
+     
+     # Set the include directory
+ 
++    PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"`
++
+     AC_MSG_CHECKING(for Python header files)
+     if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+-        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
++        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config"
+     fi
+     if test -z "$PYINCLUDE"; then
+         if test -r $PYPREFIX/include/Py/Python.h; then
+@@ -587,13 +589,6 @@
+ 
+     # Set the library directory blindly.   This probably won't work with older versions
+     AC_MSG_CHECKING(for Python library)
+-    dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR"
+-    for i in $dirs; do
+-        if test -d $PYEPREFIX/$PYLIBDIR/$i; then
+-           PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
+-           break
+-        fi
+-    done
+     if test -z "$PYLIB"; then
+         AC_MSG_RESULT(Not found)
+     else

Added: contrib/1.2/swig/current/sources/swig-1.3.24.tar.gz
===================================================================
(Binary files differ)


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

Modified: contrib/1.2/swig/current/specs/swig.spec
===================================================================
--- contrib/1.2/swig/current/specs/swig.spec	2005-04-06 08:37:47 UTC (rev 6231)
+++ contrib/1.2/swig/current/specs/swig.spec	2005-04-06 17:30:49 UTC (rev 6232)
@@ -1,10 +1,10 @@
 Summary: Simplified Wrapper and Interface Generator
 Name:    swig
-Version: 1.3.21
-Release: 6gd
+Version: 1.3.24
+Release: 1jh
 URL:     http://swig.sourceforge.net
 Source0: http://belnet.dl.sourceforge.net/sourceforge/swig/%{name}-%{version}.tar.gz
-Patch0: swig-1.3.21-destdir.patch
+Patch0: swig-1.3.23-pylib.patch
 License: BSD
 Group: contrib
 # BuildRequires: autoconf
@@ -21,230 +21,37 @@
 C/C++ header files and using them to generate the glue code (wrappers)
 that scripting languages need to access the underlying C/C++ code
 
-
-
-# %package tcl
-# Summary:  SWIG library: tcl
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description tcl
-# SWIG library: tcl.
-
-
-%package perl
-Summary:  SWIG library: perl
-Requires: %{name} = %{version}-%{release}
-Group: contrib
-
-%description perl
-SWIG library: perl.
-
-
-%package python
-Summary:  SWIG library: python
-Requires: %{name} = %{version}-%{release}
-Group: contrib
-
-%description python
-SWIG library: python.
-
-
-# %package guil
-# Summary:  SWIG library: guil
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description guil
-# SWIG library: guil.
-
-
-# %package java
-# Summary:  SWIG library: java
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description java
-# SWIG library: java.
-
-
-# %package mzscheme
-# Summary:  SWIG library: mzscheme
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description mzscheme
-# SWIG library: mzscheme.
-
-
-# %package ruby
-# Summary:  SWIG library: ruby
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description ruby
-# SWIG library: ruby.
-
-
-#%package php4
-#Summary:  SWIG library: php4
-#Requires: %{name} = %{version}-%{release}
-#Group: contrib
-
-#%description php4
-#SWIG library: php4.
-
-
-# %package ocaml
-# Summary:  SWIG library: ocaml
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description ocaml
-# SWIG library: ocaml.
-
-
-# %package pike
-# Summary:  SWIG library: pike
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description pike
-# SWIG library: pike.
-
-
-# %package chicken
-# Summary:  SWIG library: chicken
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description chicken
-# SWIG library: chicken.
-
-
-# %package csharp
-# Summary:  SWIG library: csharp
-# Requires: %{name} = %{version}-%{release}
-# Group:    tinysofa contrib
-# 
-# %description csharp
-# SWIG library: csharp.
-
-
 %prep
 %setup -q -n SWIG-%{version}
+%patch0 -p1 -b .pylib
 
-%patch0 -p1 -b .destdir
-
 %build
+./autogen.sh
 %configure
 make
-make runtime
 # test what we did
 # make -k check
 
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=${RPM_BUILD_ROOT}
-make install-runtime DESTDIR=${RPM_BUILD_ROOT}
-# cleanup the stuff we dont pack
-rm -r %{buildroot}/%{_libdir}/swig1.3/tcl      || :
-rm    %{buildroot}/%{_libdir}/libswigtcl*      || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/guile    || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/java     || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/mzscheme || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/ruby     || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/ocaml    || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/pike     || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/chicken  || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/csharp   || :
-rm -r %{buildroot}/%{_libdir}/swig1.3/php4     || :
 
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 
-%post perl
-/sbin/ldconfig
-
-
-%postun perl
-/sbin/ldconfig
-
-
-%post python
-/sbin/ldconfig
-
-
-%postun python
-/sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,0755)
 %{_bindir}/swig
-%dir %{_libdir}/swig1.3/
-%{_libdir}/swig1.3/*.i
-%{_libdir}/swig1.3/*.swg
-%{_datadir}/aclocal/swig.m4
+%{_datadir}/swig
 
-# %files tcl
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/tcl
 
-%files perl
-%defattr(-,root,root)
-%{_libdir}/swig1.3/perl5
-%{_libdir}/libswigpl.so*
-%{_libdir}/libswigpl.la
-
-%files python
-%defattr(-,root,root)
-%{_libdir}/swig1.3/python
-%{_libdir}/libswigpy.so*
-%{_libdir}/libswigpy.la
-
-
-# %files guil
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/guile
-
-# %files java
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/java
-
-# %files mzscheme
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/mzscheme
-
-# %files ruby
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/ruby
-
-#%files php4
-#%defattr(-,root,root)
-#%{_libdir}/swig1.3/php4
-
-# %files ocaml
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/ocaml
-
-# %files pike
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/pike
-
-# %files chicken
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/chicken
-
-# %files csharp
-# %defattr(-,root,root)
-# %{_libdir}/swig1.3/csharp
-
-
 %changelog
+* Wed Apr  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.3.24-1jh
+- 1.3.24
+- major package cleanup
+
 * Thu Feb 19 2005 Gerald Dachs <gda at tinysofa dot org> 1.3.21-6gd
 - disabled build of php package
 



From svn at tinysofa.org  Wed Apr  6 17:53:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  6 Apr 2005 13:53:05 -0400 (EDT)
Subject: [tinysofa-svn] r6233 - in contrib/1.2/subversion/current: sources
	specs
Message-ID: <20050406175305.6DAA1344553@minbar.tinysofa.org>

Author: jh
Date: 2005-04-06 13:50:16 -0400 (Wed, 06 Apr 2005)
New Revision: 6233

Added:
   contrib/1.2/subversion/current/sources/subversion-1.1.4.tar.gz
Removed:
   contrib/1.2/subversion/current/sources/subversion-1.1.1.tar.gz
Modified:
   contrib/1.2/subversion/current/specs/subversion.spec
Log:
- 1.1.4

Deleted: contrib/1.2/subversion/current/sources/subversion-1.1.1.tar.gz
===================================================================
(Binary files differ)

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


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

Modified: contrib/1.2/subversion/current/specs/subversion.spec
===================================================================
--- contrib/1.2/subversion/current/specs/subversion.spec	2005-04-06 17:30:49 UTC (rev 6232)
+++ contrib/1.2/subversion/current/specs/subversion.spec	2005-04-06 17:50:16 UTC (rev 6233)
@@ -3,8 +3,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.1.1
-Release: 2gd
+Version: 1.1.4
+Release: 1jh
 License: BSD
 Group: contrib
 URL: http://subversion.tigris.org/
@@ -17,7 +17,7 @@
 Patch3: subversion-0.31.0-rpath.patch
 Patch6: subversion-1.0.3-pie.patch
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo, gettext
-BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, swig-python, swig-perl
+BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
 BuildPreReq: openssl-devel, expat-devel, gdbm-devel, httpd-devel, zlib-devel
 BuildPreReq: perl-devel, cyrus-sasl-devel ,gcc-c++
@@ -89,9 +89,9 @@
 export CC=gcc CXX=g++ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcre"
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
-        --with-apxs=%{_sbindir}/apxs --disable-mod-activation
-%make all swig-py %{swigdirs} 
-make swig-pl
+        --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
+	--enable-swig-bindings=perl,python
+%make all swig-pl swig-py %{swigdirs} 
 
 %install
 make install install-swig-py install-swig-pl-lib \
@@ -189,6 +189,9 @@
 %{_mandir}/man*/*::*
 
 %changelog
+* Wed Apr  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.4-1jh
+- 1.1.4
+
 * Fri Mar 18 2005 Gerald Dachs <gda at tinysofa dot org> 1.1.1-2gd
 - let subversion find the pcre headers
 



From svn at tinysofa.org  Wed Apr  6 19:26:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  6 Apr 2005 15:26:48 -0400 (EDT)
Subject: [tinysofa-svn] r6234 - contrib/1.2
Message-ID: <20050406192648.90BAA3445E1@minbar.tinysofa.org>

Author: jh
Date: 2005-04-06 15:26:39 -0400 (Wed, 06 Apr 2005)
New Revision: 6234

Added:
   contrib/1.2/expect/
Log:
- copy expect from 1.1


Copied: contrib/1.2/expect (from rev 6233, contrib/1.1/expect)



From svn at tinysofa.org  Thu Apr  7 06:42:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Apr 2005 02:42:21 -0400 (EDT)
Subject: [tinysofa-svn] r6235 - contrib/1.2/xorg-x11/current/specs
Message-ID: <20050407064221.34C0A3445C6@minbar.tinysofa.org>

Author: jh
Date: 2005-04-07 02:42:12 -0400 (Thu, 07 Apr 2005)
New Revision: 6235

Modified:
   contrib/1.2/xorg-x11/current/specs/xorg-x11.spec
Log:
- define xorgarch for other arches too


Modified: contrib/1.2/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/1.2/xorg-x11/current/specs/xorg-x11.spec	2005-04-06 19:26:39 UTC (rev 6234)
+++ contrib/1.2/xorg-x11/current/specs/xorg-x11.spec	2005-04-07 06:42:12 UTC (rev 6235)
@@ -56,6 +56,8 @@
 
 %ifarch %{ix86}
 %define _xorgarch			i386
+%else
+%define _xorgarch			%{_arch}
 %endif
 
 %define with_archexec		1



From svn at tinysofa.org  Thu Apr  7 08:12:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Apr 2005 04:12:50 -0400 (EDT)
Subject: [tinysofa-svn] r6236 - contrib/1.2/swig/current/specs
Message-ID: <20050407081250.CA948344839@minbar.tinysofa.org>

Author: jh
Date: 2005-04-07 04:12:44 -0400 (Thu, 07 Apr 2005)
New Revision: 6236

Modified:
   contrib/1.2/swig/current/specs/swig.spec
Log:
- BR: autoconf automake


Modified: contrib/1.2/swig/current/specs/swig.spec
===================================================================
--- contrib/1.2/swig/current/specs/swig.spec	2005-04-07 06:42:12 UTC (rev 6235)
+++ contrib/1.2/swig/current/specs/swig.spec	2005-04-07 08:12:44 UTC (rev 6236)
@@ -7,7 +7,7 @@
 Patch0: swig-1.3.23-pylib.patch
 License: BSD
 Group: contrib
-# BuildRequires: autoconf
+BuildRequires: autoconf automake
 BuildRequires: gcc-c++
 BuildRequires: python-devel
 BuildRequires: perl-devel



From svn at tinysofa.org  Thu Apr  7 08:18:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Apr 2005 04:18:57 -0400 (EDT)
Subject: [tinysofa-svn] r6237 - contrib/1.2/xorg-x11/current/specs
Message-ID: <20050407081857.860E734484C@minbar.tinysofa.org>

Author: jh
Date: 2005-04-07 04:18:50 -0400 (Thu, 07 Apr 2005)
New Revision: 6237

Modified:
   contrib/1.2/xorg-x11/current/specs/xorg-x11.spec
Log:
- remove duplicate directories


Modified: contrib/1.2/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/1.2/xorg-x11/current/specs/xorg-x11.spec	2005-04-07 08:12:44 UTC (rev 6236)
+++ contrib/1.2/xorg-x11/current/specs/xorg-x11.spec	2005-04-07 08:18:50 UTC (rev 6237)
@@ -2957,8 +2957,6 @@
 %dir %{_x11datadir}
 %dir %{_x11includedir}
 %dir %{_x11libdir}
-%dir %{_x11libdir}
-%dir %{_x11mandir}
 %dir /etc/X11
 %defattr(-,root,root)
 # On x86 and other architectures _x11libdir and _x11datadir are the same dir,
@@ -3036,9 +3034,6 @@
 %{_x11localedir}/zh*/*
 #%{_x11localedir}/%{_lib}/*
 %{_x11localedir}/%{_lib}/common/*
-%ifarch x86_64
-%dir %{_x11libdir}
-%endif
 # Shared libraries:  %{_x11libdir}/lib*.so.* might be better in the long run
 # except for arch specific stuff, but it shouldn't be built in the first place.
 %{_x11libdir}/libFS.so.6



From svn at tinysofa.org  Thu Apr  7 08:37:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Apr 2005 04:37:06 -0400 (EDT)
Subject: [tinysofa-svn] r6238 - contrib/1.2/glib12/current/specs
Message-ID: <20050407083706.0F682344733@minbar.tinysofa.org>

Author: jh
Date: 2005-04-07 04:37:00 -0400 (Thu, 07 Apr 2005)
New Revision: 6238

Modified:
   contrib/1.2/glib12/current/specs/glib12.spec
Log:
- multilib fix


Modified: contrib/1.2/glib12/current/specs/glib12.spec
===================================================================
--- contrib/1.2/glib12/current/specs/glib12.spec	2005-04-07 08:18:50 UTC (rev 6237)
+++ contrib/1.2/glib12/current/specs/glib12.spec	2005-04-07 08:37:00 UTC (rev 6238)
@@ -42,7 +42,7 @@
 %install
 %makeinstall
 install -m 644 glibconfig.h $RPM_BUILD_ROOT/usr/include/glib-1.2/
-rm $RPM_BUILD_ROOT/usr/lib/glib/include/glibconfig.h
+rm -f $RPM_BUILD_ROOT/%{_libdir}/glib/include/glibconfig.h
 
 %nuke_info
 



From svn at tinysofa.org  Thu Apr  7 08:44:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Apr 2005 04:44:38 -0400 (EDT)
Subject: [tinysofa-svn] r6239 - contrib/1.2/xorg-x11/current/specs
Message-ID: <20050407084438.51BBB3445B9@minbar.tinysofa.org>

Author: jh
Date: 2005-04-07 04:44:31 -0400 (Thu, 07 Apr 2005)
New Revision: 6239

Modified:
   contrib/1.2/xorg-x11/current/specs/xorg-x11.spec
Log:
- Cards is not installed on all arches


Modified: contrib/1.2/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/1.2/xorg-x11/current/specs/xorg-x11.spec	2005-04-07 08:37:00 UTC (rev 6238)
+++ contrib/1.2/xorg-x11/current/specs/xorg-x11.spec	2005-04-07 08:44:31 UTC (rev 6239)
@@ -2366,9 +2366,10 @@
 %{_x11bindir}/xwud
 
 %if %{with_Xserver}
-# Provided by the Xconfigurator package in RHL 7.x, and in the hwdata
-# currently in rawhide.
+# XXX: this is broken on non-ix86
+%ifarch %{ix86}
 %{_x11datadir}/X11/Cards
+%endif
 %{_x11datadir}/X11/Options
 #%{_x11datadir}/X11/XF86Config
 %dir %{_x11datadir}/X11/doc



From svn at tinysofa.org  Thu Apr  7 19:31:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  7 Apr 2005 15:31:39 -0400 (EDT)
Subject: [tinysofa-svn] r6240 -
	tinysofa/releases/classic/2.0/nfs-utils/current/specs
Message-ID: <20050407193139.2C75B3444FE@minbar.tinysofa.org>

Author: jh
Date: 2005-04-07 15:31:32 -0400 (Thu, 07 Apr 2005)
New Revision: 6240

Modified:
   tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec
Log:
- fix nfsnobody UID

Modified: tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec
===================================================================
--- tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec	2005-04-07 08:44:31 UTC (rev 6239)
+++ tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec	2005-04-07 19:31:32 UTC (rev 6240)
@@ -1,10 +1,10 @@
-Summary: NFS utlilities and supporting daemons for the kernel NFS server.
+Summary: NFS utililities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.6
-Release: 9jh
+Release: 10jh
 
 # group all 32bit related archs
-%define all_32bit_archs i386 i686 athlon
+%define all_32bit_archs %{ix86}
 
 Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
@@ -300,6 +300,9 @@
 
 
 %changelog
+* Thu Apr  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.0.6-10jh
+- fix nfsnobody UID
+
 * Mon Jan 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.0.6-9jh
 - add nfs version 4 support
 - latest Fedora patches



From svn at tinysofa.org  Fri Apr  8 10:49:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  8 Apr 2005 06:49:18 -0400 (EDT)
Subject: [tinysofa-svn] r6241 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050408104918.08EDB3443D2@minbar.tinysofa.org>

Author: jh
Date: 2005-04-08 06:49:06 -0400 (Fri, 08 Apr 2005)
New Revision: 6241

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.7.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/patch-2.6.11-ac3
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- add 2.6.11.7 changes


Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.7.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.7.patch	2005-04-07 19:31:32 UTC (rev 6240)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.7.patch	2005-04-08 10:49:06 UTC (rev 6241)
@@ -0,0 +1,397 @@
+diff -Nru a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
+--- a/arch/ia64/kernel/fsys.S	2005-04-07 11:59:01 -07:00
++++ b/arch/ia64/kernel/fsys.S	2005-04-07 11:59:01 -07:00
+@@ -611,8 +611,10 @@
+ 	movl r2=ia64_ret_from_syscall
+ 	;;
+ 	mov rp=r2				// set the real return addr
+-	tbit.z p8,p0=r3,TIF_SYSCALL_TRACE
++	and r3=_TIF_SYSCALL_TRACEAUDIT,r3
+ 	;;
++	cmp.eq p8,p0=r3,r0
++
+ (p10)	br.cond.spnt.many ia64_ret_from_syscall	// p10==true means out registers are more than 8
+ (p8)	br.call.sptk.many b6=b6		// ignore this return addr
+ 	br.cond.sptk ia64_trace_syscall
+diff -Nru a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
+--- a/arch/ia64/kernel/signal.c	2005-04-07 11:59:01 -07:00
++++ b/arch/ia64/kernel/signal.c	2005-04-07 11:59:01 -07:00
+@@ -224,7 +224,8 @@
+ 	 * could be corrupted.
+ 	 */
+ 	retval = (long) &ia64_leave_kernel;
+-	if (test_thread_flag(TIF_SYSCALL_TRACE))
++	if (test_thread_flag(TIF_SYSCALL_TRACE)
++	    || test_thread_flag(TIF_SYSCALL_AUDIT))
+ 		/*
+ 		 * strace expects to be notified after sigreturn returns even though the
+ 		 * context to which we return may not be in the middle of a syscall.
+diff -Nru a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
+--- a/arch/um/kernel/skas/uaccess.c	2005-04-07 11:59:01 -07:00
++++ b/arch/um/kernel/skas/uaccess.c	2005-04-07 11:59:01 -07:00
+@@ -61,7 +61,8 @@
+ 	void *arg;
+ 	int *res;
+ 
+-	va_copy(args, *(va_list *)arg_ptr);
++	/* Some old gccs recognize __va_copy, but not va_copy */
++	__va_copy(args, *(va_list *)arg_ptr);
+ 	addr = va_arg(args, unsigned long);
+ 	len = va_arg(args, int);
+ 	is_write = va_arg(args, int);
+diff -Nru a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
+--- a/drivers/i2c/chips/eeprom.c	2005-04-07 11:59:01 -07:00
++++ b/drivers/i2c/chips/eeprom.c	2005-04-07 11:59:01 -07:00
+@@ -130,7 +130,8 @@
+ 
+ 	/* Hide Vaio security settings to regular users (16 first bytes) */
+ 	if (data->nature == VAIO && off < 16 && !capable(CAP_SYS_ADMIN)) {
+-		int in_row1 = 16 - off;
++		size_t in_row1 = 16 - off;
++		in_row1 = min(in_row1, count);
+ 		memset(buf, 0, in_row1);
+ 		if (count - in_row1 > 0)
+ 			memcpy(buf + in_row1, &data->data[16], count - in_row1);
+diff -Nru a/fs/jbd/transaction.c b/fs/jbd/transaction.c
+--- a/fs/jbd/transaction.c	2005-04-07 11:59:01 -07:00
++++ b/fs/jbd/transaction.c	2005-04-07 11:59:01 -07:00
+@@ -1775,10 +1775,10 @@
+ 			JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget");
+ 			ret = __dispose_buffer(jh,
+ 					journal->j_running_transaction);
++			journal_put_journal_head(jh);
+ 			spin_unlock(&journal->j_list_lock);
+ 			jbd_unlock_bh_state(bh);
+ 			spin_unlock(&journal->j_state_lock);
+-			journal_put_journal_head(jh);
+ 			return ret;
+ 		} else {
+ 			/* There is no currently-running transaction. So the
+@@ -1789,10 +1789,10 @@
+ 				JBUFFER_TRACE(jh, "give to committing trans");
+ 				ret = __dispose_buffer(jh,
+ 					journal->j_committing_transaction);
++				journal_put_journal_head(jh);
+ 				spin_unlock(&journal->j_list_lock);
+ 				jbd_unlock_bh_state(bh);
+ 				spin_unlock(&journal->j_state_lock);
+-				journal_put_journal_head(jh);
+ 				return ret;
+ 			} else {
+ 				/* The orphan record's transaction has
+@@ -1813,10 +1813,10 @@
+ 					journal->j_running_transaction);
+ 			jh->b_next_transaction = NULL;
+ 		}
++		journal_put_journal_head(jh);
+ 		spin_unlock(&journal->j_list_lock);
+ 		jbd_unlock_bh_state(bh);
+ 		spin_unlock(&journal->j_state_lock);
+-		journal_put_journal_head(jh);
+ 		return 0;
+ 	} else {
+ 		/* Good, the buffer belongs to the running transaction.
+diff -Nru a/lib/rwsem-spinlock.c b/lib/rwsem-spinlock.c
+--- a/lib/rwsem-spinlock.c	2005-04-07 11:59:01 -07:00
++++ b/lib/rwsem-spinlock.c	2005-04-07 11:59:01 -07:00
+@@ -140,12 +140,12 @@
+ 
+ 	rwsemtrace(sem, "Entering __down_read");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irq(&sem->wait_lock);
+ 
+ 	if (sem->activity >= 0 && list_empty(&sem->wait_list)) {
+ 		/* granted */
+ 		sem->activity++;
+-		spin_unlock(&sem->wait_lock);
++		spin_unlock_irq(&sem->wait_lock);
+ 		goto out;
+ 	}
+ 
+@@ -160,7 +160,7 @@
+ 	list_add_tail(&waiter.list, &sem->wait_list);
+ 
+ 	/* we don't need to touch the semaphore struct anymore */
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irq(&sem->wait_lock);
+ 
+ 	/* wait to be given the lock */
+ 	for (;;) {
+@@ -181,10 +181,12 @@
+  */
+ int fastcall __down_read_trylock(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
+ 	int ret = 0;
++
+ 	rwsemtrace(sem, "Entering __down_read_trylock");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	if (sem->activity >= 0 && list_empty(&sem->wait_list)) {
+ 		/* granted */
+@@ -192,7 +194,7 @@
+ 		ret = 1;
+ 	}
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving __down_read_trylock");
+ 	return ret;
+@@ -209,12 +211,12 @@
+ 
+ 	rwsemtrace(sem, "Entering __down_write");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irq(&sem->wait_lock);
+ 
+ 	if (sem->activity == 0 && list_empty(&sem->wait_list)) {
+ 		/* granted */
+ 		sem->activity = -1;
+-		spin_unlock(&sem->wait_lock);
++		spin_unlock_irq(&sem->wait_lock);
+ 		goto out;
+ 	}
+ 
+@@ -229,7 +231,7 @@
+ 	list_add_tail(&waiter.list, &sem->wait_list);
+ 
+ 	/* we don't need to touch the semaphore struct anymore */
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irq(&sem->wait_lock);
+ 
+ 	/* wait to be given the lock */
+ 	for (;;) {
+@@ -250,10 +252,12 @@
+  */
+ int fastcall __down_write_trylock(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
+ 	int ret = 0;
++
+ 	rwsemtrace(sem, "Entering __down_write_trylock");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	if (sem->activity == 0 && list_empty(&sem->wait_list)) {
+ 		/* granted */
+@@ -261,7 +265,7 @@
+ 		ret = 1;
+ 	}
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving __down_write_trylock");
+ 	return ret;
+@@ -272,14 +276,16 @@
+  */
+ void fastcall __up_read(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
++
+ 	rwsemtrace(sem, "Entering __up_read");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	if (--sem->activity == 0 && !list_empty(&sem->wait_list))
+ 		sem = __rwsem_wake_one_writer(sem);
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving __up_read");
+ }
+@@ -289,15 +295,17 @@
+  */
+ void fastcall __up_write(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
++
+ 	rwsemtrace(sem, "Entering __up_write");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	sem->activity = 0;
+ 	if (!list_empty(&sem->wait_list))
+ 		sem = __rwsem_do_wake(sem, 1);
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving __up_write");
+ }
+@@ -308,15 +316,17 @@
+  */
+ void fastcall __downgrade_write(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
++
+ 	rwsemtrace(sem, "Entering __downgrade_write");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	sem->activity = 1;
+ 	if (!list_empty(&sem->wait_list))
+ 		sem = __rwsem_do_wake(sem, 0);
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving __downgrade_write");
+ }
+diff -Nru a/lib/rwsem.c b/lib/rwsem.c
+--- a/lib/rwsem.c	2005-04-07 11:59:01 -07:00
++++ b/lib/rwsem.c	2005-04-07 11:59:01 -07:00
+@@ -150,7 +150,7 @@
+ 	set_task_state(tsk, TASK_UNINTERRUPTIBLE);
+ 
+ 	/* set up my own style of waitqueue */
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irq(&sem->wait_lock);
+ 	waiter->task = tsk;
+ 	get_task_struct(tsk);
+ 
+@@ -163,7 +163,7 @@
+ 	if (!(count & RWSEM_ACTIVE_MASK))
+ 		sem = __rwsem_do_wake(sem, 0);
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irq(&sem->wait_lock);
+ 
+ 	/* wait to be given the lock */
+ 	for (;;) {
+@@ -219,15 +219,17 @@
+  */
+ struct rw_semaphore fastcall *rwsem_wake(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
++
+ 	rwsemtrace(sem, "Entering rwsem_wake");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	/* do nothing if list empty */
+ 	if (!list_empty(&sem->wait_list))
+ 		sem = __rwsem_do_wake(sem, 0);
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving rwsem_wake");
+ 
+@@ -241,15 +243,17 @@
+  */
+ struct rw_semaphore fastcall *rwsem_downgrade_wake(struct rw_semaphore *sem)
+ {
++	unsigned long flags;
++
+ 	rwsemtrace(sem, "Entering rwsem_downgrade_wake");
+ 
+-	spin_lock(&sem->wait_lock);
++	spin_lock_irqsave(&sem->wait_lock, flags);
+ 
+ 	/* do nothing if list empty */
+ 	if (!list_empty(&sem->wait_list))
+ 		sem = __rwsem_do_wake(sem, 1);
+ 
+-	spin_unlock(&sem->wait_lock);
++	spin_unlock_irqrestore(&sem->wait_lock, flags);
+ 
+ 	rwsemtrace(sem, "Leaving rwsem_downgrade_wake");
+ 	return sem;
+diff -Nru a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
+--- a/net/ipv4/tcp_input.c	2005-04-07 11:59:01 -07:00
++++ b/net/ipv4/tcp_input.c	2005-04-07 11:59:01 -07:00
+@@ -1653,7 +1653,10 @@
+ static void tcp_undo_cwr(struct tcp_sock *tp, int undo)
+ {
+ 	if (tp->prior_ssthresh) {
+-		tp->snd_cwnd = max(tp->snd_cwnd, tp->snd_ssthresh<<1);
++		if (tcp_is_bic(tp))
++			tp->snd_cwnd = max(tp->snd_cwnd, tp->bictcp.last_max_cwnd);
++		else
++			tp->snd_cwnd = max(tp->snd_cwnd, tp->snd_ssthresh<<1);
+ 
+ 		if (undo && tp->prior_ssthresh > tp->snd_ssthresh) {
+ 			tp->snd_ssthresh = tp->prior_ssthresh;
+diff -Nru a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c
+--- a/net/ipv4/xfrm4_output.c	2005-04-07 11:59:01 -07:00
++++ b/net/ipv4/xfrm4_output.c	2005-04-07 11:59:01 -07:00
+@@ -103,16 +103,16 @@
+ 			goto error_nolock;
+ 	}
+ 
+-	spin_lock_bh(&x->lock);
+-	err = xfrm_state_check(x, skb);
+-	if (err)
+-		goto error;
+-
+ 	if (x->props.mode) {
+ 		err = xfrm4_tunnel_check_size(skb);
+ 		if (err)
+-			goto error;
++			goto error_nolock;
+ 	}
++
++	spin_lock_bh(&x->lock);
++	err = xfrm_state_check(x, skb);
++	if (err)
++		goto error;
+ 
+ 	xfrm4_encap(skb);
+ 
+diff -Nru a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
+--- a/net/ipv6/xfrm6_output.c	2005-04-07 11:59:01 -07:00
++++ b/net/ipv6/xfrm6_output.c	2005-04-07 11:59:01 -07:00
+@@ -103,16 +103,16 @@
+ 			goto error_nolock;
+ 	}
+ 
+-	spin_lock_bh(&x->lock);
+-	err = xfrm_state_check(x, skb);
+-	if (err)
+-		goto error;
+-
+ 	if (x->props.mode) {
+ 		err = xfrm6_tunnel_check_size(skb);
+ 		if (err)
+-			goto error;
++			goto error_nolock;
+ 	}
++
++	spin_lock_bh(&x->lock);
++	err = xfrm_state_check(x, skb);
++	if (err)
++		goto error;
+ 
+ 	xfrm6_encap(skb);
+ 
+diff -Nru a/sound/core/timer.c b/sound/core/timer.c
+--- a/sound/core/timer.c	2005-04-07 11:59:01 -07:00
++++ b/sound/core/timer.c	2005-04-07 11:59:01 -07:00
+@@ -1117,7 +1117,8 @@
+ 	if (tu->qused >= tu->queue_size) {
+ 		tu->overrun++;
+ 	} else {
+-		memcpy(&tu->queue[tu->qtail++], tread, sizeof(*tread));
++		memcpy(&tu->tqueue[tu->qtail++], tread, sizeof(*tread));
++		tu->qtail %= tu->queue_size;
+ 		tu->qused++;
+ 	}
+ }
+@@ -1140,6 +1141,8 @@
+ 	spin_lock(&tu->qlock);
+ 	snd_timer_user_append_to_tqueue(tu, &r1);
+ 	spin_unlock(&tu->qlock);
++	kill_fasync(&tu->fasync, SIGIO, POLL_IN);
++	wake_up(&tu->qchange_sleep);
+ }

Modified: tinysofa/releases/classic/2.0/kernel/current/sources/patch-2.6.11-ac3
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/patch-2.6.11-ac3	2005-04-07 19:31:32 UTC (rev 6240)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/patch-2.6.11-ac3	2005-04-08 10:49:06 UTC (rev 6241)
@@ -23137,45 +23137,6 @@
  			init_special_inode(inode, inode->i_mode,
  				old_decode_dev(cramfs_inode->size));
  		}
-diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.11/fs/jbd/transaction.c linux-2.6.11/fs/jbd/transaction.c
---- linux.vanilla-2.6.11/fs/jbd/transaction.c	2005-03-05 15:17:05.000000000 +0000
-+++ linux-2.6.11/fs/jbd/transaction.c	2005-03-07 17:57:15.000000000 +0000
-@@ -1775,10 +1775,10 @@
- 			JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget");
- 			ret = __dispose_buffer(jh,
- 					journal->j_running_transaction);
-+			journal_put_journal_head(jh);
- 			spin_unlock(&journal->j_list_lock);
- 			jbd_unlock_bh_state(bh);
- 			spin_unlock(&journal->j_state_lock);
--			journal_put_journal_head(jh);
- 			return ret;
- 		} else {
- 			/* There is no currently-running transaction. So the
-@@ -1789,10 +1789,10 @@
- 				JBUFFER_TRACE(jh, "give to committing trans");
- 				ret = __dispose_buffer(jh,
- 					journal->j_committing_transaction);
-+				journal_put_journal_head(jh);
- 				spin_unlock(&journal->j_list_lock);
- 				jbd_unlock_bh_state(bh);
- 				spin_unlock(&journal->j_state_lock);
--				journal_put_journal_head(jh);
- 				return ret;
- 			} else {
- 				/* The orphan record's transaction has
-@@ -1813,10 +1813,10 @@
- 					journal->j_running_transaction);
- 			jh->b_next_transaction = NULL;
- 		}
-+		journal_put_journal_head(jh);
- 		spin_unlock(&journal->j_list_lock);
- 		jbd_unlock_bh_state(bh);
- 		spin_unlock(&journal->j_state_lock);
--		journal_put_journal_head(jh);
- 		return 0;
- 	} else {
- 		/* Good, the buffer belongs to the running transaction.
 diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.11/include/asm-i386/ide.h linux-2.6.11/include/asm-i386/ide.h
 --- linux.vanilla-2.6.11/include/asm-i386/ide.h	2005-03-05 15:15:19.000000000 +0000
 +++ linux-2.6.11/include/asm-i386/ide.h	2005-03-05 15:43:01.000000000 +0000

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-04-07 19:31:32 UTC (rev 6240)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-04-08 10:49:06 UTC (rev 6241)
@@ -84,7 +84,8 @@
 Patch3: patch-2.6.11.4-security.patch
 Patch4: 2.6.11.5.patch
 Patch5: 2.6.11.6.patch
-Patch6: acpi-20050309-2.6.11.diff
+Patch6: 2.6.11.7.patch
+Patch7: acpi-20050309-2.6.11.diff
 
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
@@ -231,6 +232,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %patch101 -p1 -b .epoll~
 %patch102 -p1 -b .compile~



From svn at tinysofa.org  Sat Apr  9 07:27:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Apr 2005 03:27:35 -0400 (EDT)
Subject: [tinysofa-svn] r6242 - contrib
Message-ID: <20050409072735.2184134451F@minbar.tinysofa.org>

Author: jh
Date: 2005-04-09 03:27:31 -0400 (Sat, 09 Apr 2005)
New Revision: 6242

Added:
   contrib/classic/
Log:
- create directory classic




From svn at tinysofa.org  Sat Apr  9 07:28:32 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Apr 2005 03:28:32 -0400 (EDT)
Subject: [tinysofa-svn] r6243 - in contrib: . classic
Message-ID: <20050409072832.35B4B34451F@minbar.tinysofa.org>

Author: jh
Date: 2005-04-09 03:28:24 -0400 (Sat, 09 Apr 2005)
New Revision: 6243

Added:
   contrib/classic/2.0/
Removed:
   contrib/1.2/
Log:
- move under classic
- rename to 2.0


Copied: contrib/classic/2.0 (from rev 6242, contrib/1.2)



From svn at tinysofa.org  Sat Apr  9 18:44:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  9 Apr 2005 14:44:59 -0400 (EDT)
Subject: [tinysofa-svn] r6244 -
	tinysofa/releases/classic/2.0/nfs-utils/current/specs
Message-ID: <20050409184459.CE8703445CF@minbar.tinysofa.org>

Author: jh
Date: 2005-04-09 14:44:53 -0400 (Sat, 09 Apr 2005)
New Revision: 6244

Modified:
   tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec
Log:
- correct summary


Modified: tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec
===================================================================
--- tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec	2005-04-09 07:28:24 UTC (rev 6243)
+++ tinysofa/releases/classic/2.0/nfs-utils/current/specs/nfs-utils.spec	2005-04-09 18:44:53 UTC (rev 6244)
@@ -1,4 +1,4 @@
-Summary: NFS utililities and supporting daemons for the kernel NFS server.
+Summary: NFS utilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.6
 Release: 10jh



From svn at tinysofa.org  Sun Apr 10 14:08:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 10 Apr 2005 10:08:59 -0400 (EDT)
Subject: [tinysofa-svn] r6245 - in contrib/classic/2.0/firefox/current:
	sources specs
Message-ID: <20050410140859.0A0BE34471C@minbar.tinysofa.org>

Author: gda
Date: 2005-04-10 10:08:49 -0400 (Sun, 10 Apr 2005)
New Revision: 6245

Added:
   contrib/classic/2.0/firefox/current/sources/firefox-1.0.2-gtar.patch
Removed:
   contrib/classic/2.0/firefox/current/sources/firefox-1.0-bsd-tar.patch
Modified:
   contrib/classic/2.0/firefox/current/specs/firefox.spec
Log:
fixed bsd tar problems

Deleted: contrib/classic/2.0/firefox/current/sources/firefox-1.0-bsd-tar.patch
===================================================================
--- contrib/classic/2.0/firefox/current/sources/firefox-1.0-bsd-tar.patch	2005-04-09 18:44:53 UTC (rev 6244)
+++ contrib/classic/2.0/firefox/current/sources/firefox-1.0-bsd-tar.patch	2005-04-10 14:08:49 UTC (rev 6245)
@@ -1,44 +0,0 @@
---- mozilla/toolkit/mozapps/installer/unix/install_sub.pl.orig	2005-02-15 00:13:02.000000000 +0100
-+++ mozilla/toolkit/mozapps/installer/unix/install_sub.pl	2005-02-15 00:13:27.000000000 +0100
-@@ -35,7 +35,7 @@
-     rename ("$instRoot/mozilla-installer", "$instRoot/$mainExe-installer");
-     rename ("$instRoot/mozilla-installer-bin", "$instRoot/$mainExe-installer-bin");
- 
--    system ("cd $gDirDistInstall/sea && tar -zcv --owner=0 --group=0 --numeric-owner --mode='go-w' -f $seiFileNameSpecific.tar.gz $mainExe-installer");
-+    system ("cd $gDirDistInstall/sea && tar -zcv -f $seiFileNameSpecific.tar.gz $mainExe-installer");
-     return 0;
- }
- 
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2005-02-15 00:15:19.000000000 +0100
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2005-02-15 00:15:48.000000000 +0100
-@@ -70,7 +70,7 @@
- TAR_CREATE_FLAGS = -cvLf
- endif
- 
--CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
-+CREATE_FINAL_TAR = tar -c -f
- 
- ifeq ($(MOZ_PKG_FORMAT),TAR)
- PKG_SUFFIX	= .tar
---- mozilla/xpinstall/packager/Makefile.in.orig	2005-02-15 00:17:16.000000000 +0100
-+++ mozilla/xpinstall/packager/Makefile.in	2005-02-15 00:17:30.000000000 +0100
-@@ -87,7 +87,7 @@
- TAR_CREATE_FLAGS = -cvLf
- endif
- 
--CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
-+CREATE_FINAL_TAR = tar -c -f
- 
- ifeq ($(MOZ_PKG_FORMAT),TAR)
- PKG_SUFFIX	= .tar
---- mozilla/xpinstall/packager/unix/deliver.pl.orig	2005-02-15 00:18:39.000000000 +0100
-+++ mozilla/xpinstall/packager/unix/deliver.pl	2005-02-15 00:18:57.000000000 +0100
-@@ -155,7 +155,7 @@
- #-------------------------------------------------------------------------
- #// tar and gzip mozilla-installer, mozilla-installer-bin, README, license, 
- #// config.ini, installer.ini into stub
--my $create_tar = 'tar -cv --owner=0 --group=0 --numeric-owner --mode="go-w" -f';
-+my $create_tar = 'tar -cv -f';
- spew("Creating stub installer tarball...");
- chdir("$RAW/..");
- system("mv $RAW $ROOT/$SUBDIR");

Added: contrib/classic/2.0/firefox/current/sources/firefox-1.0.2-gtar.patch
===================================================================
--- contrib/classic/2.0/firefox/current/sources/firefox-1.0.2-gtar.patch	2005-04-09 18:44:53 UTC (rev 6244)
+++ contrib/classic/2.0/firefox/current/sources/firefox-1.0.2-gtar.patch	2005-04-10 14:08:49 UTC (rev 6245)
@@ -0,0 +1,51 @@
+--- mozilla/toolkit/mozapps/installer/unix/install_sub.pl.orig	2005-02-15 00:13:02.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/unix/install_sub.pl	2005-02-15 00:13:27.000000000 +0100
+@@ -35,7 +35,7 @@
+     rename ("$instRoot/mozilla-installer", "$instRoot/$mainExe-installer");
+     rename ("$instRoot/mozilla-installer-bin", "$instRoot/$mainExe-installer-bin");
+ 
+-    system ("cd $gDirDistInstall/sea && tar -zcv --owner=0 --group=0 --numeric-owner --mode='go-w' -f $seiFileNameSpecific.tar.gz $mainExe-installer");
++    system ("cd $gDirDistInstall/sea && gtar -zchv --owner=0 --group=0 --numeric-owner --mode='go-w' -f $seiFileNameSpecific.tar.gz $mainExe-installer");
+     return 0;
+ }
+ 
+--- mozilla/xpinstall/packager/Makefile.in.orig	2005-02-15 00:17:16.000000000 +0100
++++ mozilla/xpinstall/packager/Makefile.in	2005-02-15 00:17:30.000000000 +0100
+@@ -87,7 +87,7 @@
+ TAR_CREATE_FLAGS = -cvLf
+ endif
+ 
+-CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
++CREATE_FINAL_TAR = gtar -c -h --owner=0 --group=0 --numeric-owner --mode="go-w" -f
+ 
+ ifeq ($(MOZ_PKG_FORMAT),TAR)
+ PKG_SUFFIX	= .tar
+--- mozilla/xpinstall/packager/unix/deliver.pl.orig	2005-02-15 00:18:39.000000000 +0100
++++ mozilla/xpinstall/packager/unix/deliver.pl	2005-02-15 00:18:57.000000000 +0100
+@@ -155,7 +155,7 @@
+ #-------------------------------------------------------------------------
+ #// tar and gzip mozilla-installer, mozilla-installer-bin, README, license, 
+ #// config.ini, installer.ini into stub
+-my $create_tar = 'tar -cv --owner=0 --group=0 --numeric-owner --mode="go-w" -f';
++my $create_tar = 'gtar -cv --owner=0 --group=0 --numeric-owner --mode="go-w" -f';
+ spew("Creating stub installer tarball...");
+ chdir("$RAW/..");
+ system("mv $RAW $ROOT/$SUBDIR");
+--- mozilla/toolkit/mozapps/installer/packager.mk.bsd-tar	2005-02-18 09:24:24.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk	2005-04-10 12:58:30.000000000 +0200
+@@ -65,13 +65,13 @@
+ 
+ MAKE_PACKAGE	= $(error What is a $(MOZ_PKG_FORMAT) package format?);
+ 
+-TAR_CREATE_FLAGS = -cvhf
++TAR_CREATE_FLAGS = -cvhf
+ 
+ ifeq ($(OS_ARCH),BSD_OS)
+ TAR_CREATE_FLAGS = -cvLf
+ endif
+ 
+-CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f
++CREATE_FINAL_TAR = gtar -c -h --owner=0 --group=0 --numeric-owner --mode="go-w" -f
+ 
+ ifeq ($(MOZ_PKG_FORMAT),TAR)
+ PKG_SUFFIX	= .tar

Modified: contrib/classic/2.0/firefox/current/specs/firefox.spec
===================================================================
--- contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-04-09 18:44:53 UTC (rev 6244)
+++ contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-04-10 14:08:49 UTC (rev 6245)
@@ -10,7 +10,7 @@
 Summary: Mozilla Firefox web browser
 Name: firefox
 Version: 1.0.2
-Release: 1gd
+Release: 2gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -25,7 +25,7 @@
 Patch5: mozilla-1.7-psfonts.patch
 Patch6: firefox-0.10-gcc3-alpha.patch
 Patch101: firefox-PR1-pkgconfig.patch
-Patch102: firefox-1.0-bsd-tar.patch
+Patch102: firefox-1.0.2-gtar.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: xorg-x11-devel, zlib-devel, zip, unzip
@@ -33,6 +33,7 @@
 BuildRequires: gcc-c++, krb5-devel
 BuildRequires: libidl-devel
 BuildRequires: openssl-devel
+BuildRequires: gtar
 Requires: xorg-x11-libs, openssl, freetype
 %{!?_without_gtk2:BuildRequires: gtk-devel, glib-devel}
 %{?_without_gtk2:BuildRequires: gtk12+-devel, glib12-devel}
@@ -181,11 +182,8 @@
 %{__install} -D -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/firefox.png
 
 %{__install} -d -m0755 %{buildroot}%{_libdir}
-%{__tar} -xvz -C %{buildroot}%{_libdir} -f dist/firefox-*-linux-gnu.tar.gz
+gtar -xvz -C %{buildroot}%{_libdir} -f dist/firefox-*-linux-gnu.tar.gz
 
-%{__rm} -f \
-	%{buildroot}%{_libdir}/firefox/defaults/profile/bookmarks.html \
-	%{buildroot}%{_libdir}/firefox/defaults/profile/US/bookmarks.html
 %{__install} -D -m0644 %{SOURCE3} %{buildroot}%{_libdir}/firefox/defaults/profile/bookmarks.html
 %{__install} -D -m0644 %{SOURCE3} %{buildroot}%{_libdir}/firefox/defaults/profile/US/bookmarks.html
 %{__install} -D -m0644 %{SOURCE4} %{buildroot}%{_libdir}/firefox/chrome/icons/default/default.xpm
@@ -248,6 +246,9 @@
 %endif
 
 %changelog
+* Sun Apr 10 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.2-2gd
+- patched for gnu tar
+
 * Thu Mar 24 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.2-1gd
 - 1.0.2
 



From svn at tinysofa.org  Mon Apr 11 20:17:27 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 16:17:27 -0400 (EDT)
Subject: [tinysofa-svn] r6246 - in contrib/classic/2.0: . dansguardian
	dansguardian/current dansguardian/current/sources
	dansguardian/current/specs
Message-ID: <20050411201727.F40AD3447FD@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 16:17:12 -0400 (Mon, 11 Apr 2005)
New Revision: 6246

Added:
   contrib/classic/2.0/dansguardian/
   contrib/classic/2.0/dansguardian/current/
   contrib/classic/2.0/dansguardian/current/sources/
   contrib/classic/2.0/dansguardian/current/sources/dansguardian-2.8.0.4.source.tar.gz
   contrib/classic/2.0/dansguardian/current/specs/
   contrib/classic/2.0/dansguardian/current/specs/dansguardian.spec
   contrib/classic/2.0/dansguardian/pristine/
   contrib/classic/2.0/dansguardian/releases/
Log:
new in tinysofa contrib

Added: contrib/classic/2.0/dansguardian/current/sources/dansguardian-2.8.0.4.source.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/dansguardian/current/sources/dansguardian-2.8.0.4.source.tar.gz
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/dansguardian/current/specs/dansguardian.spec
===================================================================
--- contrib/classic/2.0/dansguardian/current/specs/dansguardian.spec	2005-04-10 14:08:49 UTC (rev 6245)
+++ contrib/classic/2.0/dansguardian/current/specs/dansguardian.spec	2005-04-11 20:17:12 UTC (rev 6246)
@@ -0,0 +1,214 @@
+%define real_name DansGuardian
+
+Summary: Content filtering web proxy
+Name: dansguardian
+Version: 2.8.0.4
+Release: 1gd
+License: GPL
+Group: contrib
+URL: http://www.dansguardian.org/
+Source: http://dansguardian.org/downloads/2/Stable/dansguardian-%{version}.source.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gcc-c++, zlib-devel
+
+%description
+DansGuardian is a web filtering engine that checks the content within
+the page itself in addition to the more traditional URL filtering.
+
+DansGuardian is a content filtering proxy. It filters using multiple methods,
+including URL and domain filtering, content phrase filtering, PICS filtering,
+MIME filtering, file extension filtering, POST filtering.
+
+%prep
+%setup
+
+### FIXME: Add a default dansguardian.httpd for Apache. (Please fix upstream)
+%{__cat} <<EOF >dansguardian.httpd
+### You may need to include conf.d/dansguardian.conf to make it work.
+ScriptAlias /dansguardian/ %{_localstatedir}/www/dansguardian/
+
+<Directory %{_localstatedir}/www/dansguardian/>
+        DirectoryIndex dansguardian.pl
+        Options ExecCGI
+        order deny,allow
+        deny from all
+        allow from 127.0.0.1
+</Directory>
+EOF
+
+%{__cat} <<'EOF' >dansguardian.init
+#!/bin/bash
+#
+# Init file for DansGuardian content filter.
+#
+# Written by Dag Wieers <dag at wieers.com>.
+#
+# chkconfig: - 92 8
+# description: DansGuardian content filter.
+#
+# processname: dansguardian
+# config: %{_sysconfdir}/dansguardian/dansguardian.conf
+# pidfile: %{_localstatedir}/run/dansguardian
+
+source %{_initrddir}/functions
+source %{_sysconfdir}/sysconfig/network
+
+### Check that networking is up.
+[ "${NETWORKING}" == "no" ] && exit 0
+
+[ -x "%{_sbindir}/dansguardian" ] || exit 1
+[ -r "%{_sysconfdir}/dansguardian/dansguardian.conf" ] || exit 1
+
+RETVAL=0
+prog="dansguardian"
+desc="Web Content Filter"
+
+start() {
+	echo -n $"Starting $desc ($prog): "
+	daemon $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
+	return $RETVAL
+}
+
+stop() {
+	echo -n $"Shutting down $desc ($prog): "
+	killproc $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
+}
+
+reload() {
+        echo -n $"Reloading $desc ($prog): "
+        killproc $prog -HUP
+        RETVAL=$?
+        echo
+        return $RETVAL
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	restart
+	;;
+  reload)
+	reload
+	;;
+  condrestart)
+	[ -e %{_localstatedir}/lock/subsys/$prog ] && restart
+	RETVAL=$?
+	;;
+  status)
+	status $prog
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+	RETVAL=1
+esac
+
+exit $RETVAL
+EOF
+
+%build
+### FIXME: Makefiles don't follow proper autotools directory standard. (Please fix upstream)
+./configure \
+	--bindir="%{_sbindir}/" \
+	--cgidir="%{_localstatedir}/www/dansguardian/" \
+	--installprefix="%{buildroot}" \
+	--logdir="%{_localstatedir}/log/dansguardian/" \
+	--logrotatedir="%{_sysconfdir}/logrotate.d/" \
+	--mandir="%{_mandir}/" \
+	--sysconfdir="%{_sysconfdir}/dansguardian/" \
+	--sysvdir="%{_initrddir}/" \
+	--runas_usr="nobody" \
+	--runas_grp="nobody"
+
+%{__perl} -pi.orig -e '
+		s|^(CHKCONFIG) =.*$|$1 = :|;
+                s|^\tchown|#\tchown|;
+		s|/usr/lib|%{_libdir}|g;
+        ' Makefile
+
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+
+### FIXME: Directory not created prior installation. (Please fix upstream)
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d/
+
+%makeinstall
+%{__install} -Dp -m0644 dansguardian.httpd %{buildroot}%{_sysconfdir}/httpd/conf.d/dansguardian.conf
+%{__install} -Dp -m0755 dansguardian.init %{buildroot}%{_initrddir}/dansguardian
+
+%post
+/sbin/chkconfig --add dansguardian
+
+%preun
+if [ $1 -eq 0 ]; then
+        /sbin/service dansguardian stop &>/dev/null || :
+        /sbin/chkconfig --del dansguardian
+fi
+
+%postun
+/sbin/service dansguardian condrestart &>/dev/null || :
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc INSTALL LICENSE README
+%doc %{_mandir}/man?/*
+%dir %{_sysconfdir}/dansguardian/
+%config(noreplace) %{_sysconfdir}/dansguardian/dansguardian.conf
+%config(noreplace) %{_sysconfdir}/dansguardian/dansguardianf1.conf
+#%config(noreplace) %{_sysconfdir}/dansguardian/template.html
+%config %{_sysconfdir}/dansguardian/*list
+%config %{_sysconfdir}/dansguardian/phraselists/
+#%config %{_sysconfdir}/dansguardian/messages
+%config %{_sysconfdir}/dansguardian/languages/
+%config %{_sysconfdir}/dansguardian/logrotation/
+%config %{_sysconfdir}/dansguardian/pics/
+%config %{_sysconfdir}/dansguardian/transparent1x1.gif
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/*
+%config %{_initrddir}/*
+%config %{_sysconfdir}/logrotate.d/*
+%{_sbindir}/*
+%{_localstatedir}/www/dansguardian/
+
+%defattr(0700, nobody, nobody, 0755)
+%{_localstatedir}/log/dansguardian/
+
+%changelog
+* Mon Apr 11 2005 Gerald Dachs <gda at tinysofa dot org> 2.8.0.4-1gd
+- new in tinysofa contrib
+
+* Thu Mar 31 2005 Dag Wieers <dag at wieers.com> - 2.8.0.4-1 - 3051+/dag
+- Updated to release 2.8.0.4.
+
+* Fri Jul 30 2004 Dag Wieers <dag at wieers.com> - 2.8.0.2-1
+- Updated to release 2.8.0.2.
+
+* Wed Jul 21 2004 Dag Wieers <dag at wieers.com> - 2.8.0-1
+- Updated to release 2.8.0-0.
+
+* Thu Apr 15 2004 Dag Wieers <dag at wieers.com> - 2.6.1.13-1
+- Updated to release 2.6.1-13.
+
+* Fri Mar 26 2004 Dag Wieers <dag at wieers.com> - 2.6.1.12-1
+- Initial package. (using DAR)


Property changes on: contrib/classic/2.0/dansguardian/current/specs/dansguardian.spec
___________________________________________________________________
Name: svn:executable
   + *



From svn at tinysofa.org  Mon Apr 11 20:33:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 16:33:18 -0400 (EDT)
Subject: [tinysofa-svn] r6247 - in contrib/classic/2.0: . apcupsd
	apcupsd/current apcupsd/current/sources apcupsd/current/specs
Message-ID: <20050411203318.0CE93344809@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 16:31:04 -0400 (Mon, 11 Apr 2005)
New Revision: 6247

Added:
   contrib/classic/2.0/apcupsd/
   contrib/classic/2.0/apcupsd/current/
   contrib/classic/2.0/apcupsd/current/sources/
   contrib/classic/2.0/apcupsd/current/sources/apcupsd-3.10.17.tar.gz
   contrib/classic/2.0/apcupsd/current/sources/apcupsd.halt.local
   contrib/classic/2.0/apcupsd/current/sources/apcupsd.init.d
   contrib/classic/2.0/apcupsd/current/specs/
   contrib/classic/2.0/apcupsd/current/specs/apcupsd.spec
   contrib/classic/2.0/apcupsd/pristine/
   contrib/classic/2.0/apcupsd/releases/
Log:
new in contrib

Added: contrib/classic/2.0/apcupsd/current/sources/apcupsd-3.10.17.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/apcupsd/current/sources/apcupsd-3.10.17.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/apcupsd/current/sources/apcupsd.halt.local
===================================================================
--- contrib/classic/2.0/apcupsd/current/sources/apcupsd.halt.local	2005-04-11 20:17:12 UTC (rev 6246)
+++ contrib/classic/2.0/apcupsd/current/sources/apcupsd.halt.local	2005-04-11 20:31:04 UTC (rev 6247)
@@ -0,0 +1,12 @@
+#!/bin/bash
+# See if this is a powerfail situation.
+if [ -f /etc/apcupsd/powerfail ]; then
+ echo
+ echo "APCUPSD will now power off the UPS"
+ echo
+ /etc/apcupsd/apccontrol killpower
+ echo
+ echo "Please ensure that the UPS has powered off before rebooting"
+ echo "Otherwise, the UPS may cut the power during the reboot!!!"
+ echo
+fi

Added: contrib/classic/2.0/apcupsd/current/sources/apcupsd.init.d
===================================================================
--- contrib/classic/2.0/apcupsd/current/sources/apcupsd.init.d	2005-04-11 20:17:12 UTC (rev 6246)
+++ contrib/classic/2.0/apcupsd/current/sources/apcupsd.init.d	2005-04-11 20:31:04 UTC (rev 6247)
@@ -0,0 +1,51 @@
+#! /bin/sh
+#
+# apcupsd      This shell script takes care of starting and stopping
+#	       the apcupsd UPS monitoring daemon.
+#
+# chkconfig: 2345 60 99
+# description: apcupsd monitors power and takes action if necessary
+#
+# Modified by Mikael Bak for tinysofa classic server
+#
+APCPID=/var/run/apcupsd.pid
+APCLOCK=/var/lock/subsys/apcupsd
+APCBIN=/sbin/apcupsd
+APCCONF=/etc/apcupsd/apcupsd.conf
+APCPOWERFAIL=/etc/apcupsd/powerfail
+APCNOLOGIN=/etc/nologin
+
+# Source function libarary
+. /etc/init.d/functions
+
+case "$1" in
+    start)
+       rm -f $APCPOWERFAIL
+       rm -f $APCNOLOGIN
+       echo -n "Starting UPS monitoring:" 
+       daemon $APCBIN -f $APCCONF
+       RETVAL=$?
+       echo
+       [ $RETVAL -eq 0 ] && touch $APCLOCK
+       ;;
+    stop)
+       echo -n "Shutting down UPS monitoring:"
+       killproc apcupsd
+       echo
+       rm -f $APCPID
+       rm -f $APCLOCK
+       ;;
+    restart)
+       $0 stop
+       sleep 15
+       $0 start
+       ;;
+    status)
+       /sbin/apcaccess status
+       ;;
+    *)
+       echo "Usage: $0 {start|stop|restart|status}"
+       exit 1
+       ;;
+esac
+exit 0

Added: contrib/classic/2.0/apcupsd/current/specs/apcupsd.spec
===================================================================
--- contrib/classic/2.0/apcupsd/current/specs/apcupsd.spec	2005-04-11 20:17:12 UTC (rev 6246)
+++ contrib/classic/2.0/apcupsd/current/specs/apcupsd.spec	2005-04-11 20:31:04 UTC (rev 6247)
@@ -0,0 +1,133 @@
+Summary: APC UPS power control daemon
+Name: apcupsd
+Version: 3.10.17
+Release: 1gd
+License: GPL
+Group: contrib
+URL: http://www.apcupsd.org/
+Source: apcupsd-%{version}.tar.gz
+Source1: apcupsd.init.d
+Source2: apcupsd.halt.local
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: glibc-devel
+Requires: perl
+%service_requires
+
+%description
+Apcupsd can be used for controlling most APC UPSes. During a power failure,
+apcupsd will inform the users about the power failure and that a shutdown
+may occur. If power is not restored, a system shutdown will follow when the
+battery is exausted, a timeout (seconds) expires, or the battery runtime
+expires based on internal APC calculations determined by power consumption
+rates. If the power is restored before one of the above shutdown conditions
+is met, apcupsd will inform users about this fact.
+
+Some features depend on what UPS model you have (simple or smart).
+
+%prep
+%setup -q
+
+### Add a default apcupsd.conf for Apache.
+#%{__cat} <<EOF >apcupsd.httpd
+#ScriptAlias /apcupsd/ %{_localstatedir}/www/apcupsd/
+#<Directory %{_localstatedir}/www/apcupsd/>
+#        DirectoryIndex upsstats.cgi
+#        Options ExecCGI
+#        order deny,allow
+#        deny from all
+#        allow from 127.0.0.1
+#</Directory>
+#EOF
+
+%{__cat} <<EOF >apcupsd.logrotate
+%{_localstatedir}/log/apcupsd.events {
+        missingok
+        copytruncate
+        notifempty
+}
+EOF
+
+%build
+%configure \
+	--sysconfdir="%{_sysconfdir}/apcupsd" \
+	--sbindir=/sbin \
+	--enable-pthreads \
+	--disable-net \
+	--disable-master-slave \
+	--enable-apcsmart \
+	--enable-dumb \
+	--enable-usb \
+	--with-upstype=usb \
+	--with-upscable=usb \
+	--with-serial-dev=/dev/usb/hid/hiddev[0-15]
+%make
+%{__make} -C examples hid-ups
+
+%install
+### FIXME: 'make install' doesn't create sysv-dir and bails out.
+%{__install} -d -m0755 %{buildroot}%{_initrddir}
+%{__make} install DESTDIR="%{buildroot}"
+
+%{__install} -m0755 examples/hid-ups examples/make-hiddev %{buildroot}%{_sysconfdir}/apcupsd/
+#%{__install} -D -m0644 apcupsd.httpd %{buildroot}%{_sysconfdir}/httpd/conf.d/apcupsd.conf
+%{__install} -D -m0644 apcupsd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/apcupsd
+
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/apcupsd
+install -m 700 %{SOURCE2} $RPM_BUILD_ROOT/sbin/halt.local
+
+%clean
+%clean_buildroot
+
+%post
+%service_post apcupsd
+
+#if [ -f %{_sysconfdir}/httpd/conf/httpd.conf ]; then
+#        if ! grep -q "Include .*/apcupsd.conf" %{_sysconfdir}/httpd/conf/httpd.conf; then
+#                echo -e "\n# Include %{_sysconfdir}/httpd/conf.d/apcupsd.conf" >> %{_sysconfdir}/httpd/conf/httpd.conf
+##               /sbin/service httpd restart
+#        fi
+#fi
+
+%preun
+%service_preun apcupsd
+
+%postun
+%service_postun apcupsd
+
+%files
+%defattr(-, root, root, 0755)
+%doc ChangeLog COPYING INSTALL doc/* examples/
+%doc %{_mandir}/man?/*
+%config(noreplace) %{_sysconfdir}/apcupsd/
+#%config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/*
+%config %{_initrddir}/*
+/sbin/*
+#%{_localstatedir}/www/apcupsd/
+#%exclude %{_initrddir}/halt*
+
+%changelog
+* Mon Apr 11 2005 Gerald Dachs <gda at tinysofa dot org> 3.10.17-1gd
+- 3.10.17
+
+* Tue Apr  5 2005 Gerald Dachs <gda at tinysofa dot org> 3.10.16-2gd
+- cosmetic changes
+
+* Wed Feb 09 2005 Mikael Bak <mikael at iszerviz.hu> - 3.10.16-1mb
+- Rewrote spec for tinysofa distribution
+- Updated to new release 3.10.16.
+
+* Wed Apr 21 2004 Dag Wieers <dag at wieers.com> - 3.10.13-1
+- Updated to new release 3.10.13.
+
+* Tue Mar 16 2004 Dag Wieers <dag at wieers.com> - 3.10.12-1
+- Added apcupsd.logrotate. (Derek Werthmuller)
+- Updated to new release 3.10.12.
+
+* Sat Mar 06 2004 Dag Wieers <dag at wieers.com> - 3.10.11-1
+- Added apcupsd.conf. (Andrew Newman)
+- Fixed unsuccessful 'make install'.
+
+* Tue Feb 17 2004 Dag Wieers <dag at wieers.com> - 3.10.11-0
+- Initial package. (using DAR)



From svn at tinysofa.org  Mon Apr 11 20:40:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 16:40:53 -0400 (EDT)
Subject: [tinysofa-svn] r6248 - in contrib/classic/2.0: . xmlrpc++
	xmlrpc++/current xmlrpc++/current/sources xmlrpc++/current/specs
Message-ID: <20050411204053.C2AE9344812@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 16:40:42 -0400 (Mon, 11 Apr 2005)
New Revision: 6248

Added:
   contrib/classic/2.0/xmlrpc++/
   contrib/classic/2.0/xmlrpc++/current/
   contrib/classic/2.0/xmlrpc++/current/sources/
   contrib/classic/2.0/xmlrpc++/current/sources/xmlrpc++0.7.tar.gz
   contrib/classic/2.0/xmlrpc++/current/specs/
   contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
   contrib/classic/2.0/xmlrpc++/pristine/
   contrib/classic/2.0/xmlrpc++/releases/
Log:
new in contrib

Added: contrib/classic/2.0/xmlrpc++/current/sources/xmlrpc++0.7.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/xmlrpc++/current/sources/xmlrpc++0.7.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
===================================================================
--- contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 20:31:04 UTC (rev 6247)
+++ contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 20:40:42 UTC (rev 6248)
@@ -0,0 +1,43 @@
+Name:      xmlrpc++
+Summary:   an implementation of the XmlRpc protocol written in C++
+Version:   0.7
+Release:   1gd
+Copyright: LGPL
+Group:     System Environment/Libraries
+Source:    http://heanet.dl.sourceforge.net/sourceforge/xmlrpcpp/xmlrpc++%{version}.tar.gz
+BuildArch: i586
+BuildRoot: /var/tmp/%{name}-root
+BuildRequires: gcc-c++
+
+%description
+XmlRpc++ is an implementation of the XmlRpc protocol written in C++, based upon Shilad Sen's excellent py-xmlrpc library. It is designed to make it easy to incorporate XmlRpc client+server support into C++ applications and requires no other libraries.
+
+%prep
+%setup -q -n %{name}%{version}
+
+%build
+make CXXFLAGS="-g" libXmlRpc.a
+
+%install
+mkdir -p $RPM_BUILD_ROOT/usr/include
+mkdir -p $RPM_BUILD_ROOT/usr/lib
+install -m 0644 src/*.h $RPM_BUILD_ROOT/usr/include
+install -m 0644 libXmlRpc.a $RPM_BUILD_ROOT/usr/lib
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc COPYING README.html
+%{_prefix}/lib/lib*.a
+%{_prefix}/include/*.h
+
+%changelog
+* Wed Apr 28 2004 Gerald Dachs <gda at gedas dash onsite dot de> 0.7-1gd
+- initial build
+



From svn at tinysofa.org  Mon Apr 11 20:55:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 16:55:00 -0400 (EDT)
Subject: [tinysofa-svn] r6249 - contrib/classic/2.0/xmlrpc++/current/specs
Message-ID: <20050411205500.D1D7D344737@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 16:54:56 -0400 (Mon, 11 Apr 2005)
New Revision: 6249

Modified:
   contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
Log:
small fixes

Modified: contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
===================================================================
--- contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 20:40:42 UTC (rev 6248)
+++ contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 20:54:56 UTC (rev 6249)
@@ -3,10 +3,10 @@
 Version:   0.7
 Release:   1gd
 Copyright: LGPL
-Group:     System Environment/Libraries
-Source:    http://heanet.dl.sourceforge.net/sourceforge/xmlrpcpp/xmlrpc++%{version}.tar.gz
+Group:     contrib
+Source:    http://heanet.dl.sourceforge.net/sourceforge/xmlrpcpp/%{name}%{version}.tar.gz
 BuildArch: i586
-BuildRoot: /var/tmp/%{name}-root
+BuildRoot: /var/tmp/%{name}-%{version}-root
 BuildRequires: gcc-c++
 
 %description



From svn at tinysofa.org  Mon Apr 11 21:04:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 17:04:22 -0400 (EDT)
Subject: [tinysofa-svn] r6250 - contrib/classic/2.0/xmlrpc++/current/specs
Message-ID: <20050411210422.42C763447E9@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 17:04:17 -0400 (Mon, 11 Apr 2005)
New Revision: 6250

Modified:
   contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
Log:
more fixes

Modified: contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
===================================================================
--- contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 20:54:56 UTC (rev 6249)
+++ contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 21:04:17 UTC (rev 6250)
@@ -25,7 +25,7 @@
 install -m 0644 libXmlRpc.a $RPM_BUILD_ROOT/usr/lib
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 %post -p /sbin/ldconfig
 



From svn at tinysofa.org  Mon Apr 11 21:11:45 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 17:11:45 -0400 (EDT)
Subject: [tinysofa-svn] r6251 - contrib/classic/2.0/xmlrpc++/current/specs
Message-ID: <20050411211145.47F783447FD@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 17:11:39 -0400 (Mon, 11 Apr 2005)
New Revision: 6251

Modified:
   contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
Log:
more fixes

Modified: contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec
===================================================================
--- contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 21:04:17 UTC (rev 6250)
+++ contrib/classic/2.0/xmlrpc++/current/specs/xmlrpc++.spec	2005-04-11 21:11:39 UTC (rev 6251)
@@ -38,6 +38,6 @@
 %{_prefix}/include/*.h
 
 %changelog
-* Wed Apr 28 2004 Gerald Dachs <gda at gedas dash onsite dot de> 0.7-1gd
+* Mon Apr 11 2005 Gerald Dachs <gda at tinysofa dot org> 0.7-1gd
 - initial build
 



From svn at tinysofa.org  Mon Apr 11 21:25:16 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 11 Apr 2005 17:25:16 -0400 (EDT)
Subject: [tinysofa-svn] r6252 - in contrib/classic/2.0: . avelsieve
	avelsieve/current avelsieve/current/sources avelsieve/current/specs
Message-ID: <20050411212516.420193447BC@minbar.tinysofa.org>

Author: gda
Date: 2005-04-11 17:25:02 -0400 (Mon, 11 Apr 2005)
New Revision: 6252

Added:
   contrib/classic/2.0/avelsieve/
   contrib/classic/2.0/avelsieve/current/
   contrib/classic/2.0/avelsieve/current/sources/
   contrib/classic/2.0/avelsieve/current/sources/avelsieve-0.9.11.tar.gz
   contrib/classic/2.0/avelsieve/current/specs/
   contrib/classic/2.0/avelsieve/current/specs/avelsieve.spec
   contrib/classic/2.0/avelsieve/pristine/
   contrib/classic/2.0/avelsieve/releases/
Log:
new in contrib

Added: contrib/classic/2.0/avelsieve/current/sources/avelsieve-0.9.11.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/avelsieve/current/sources/avelsieve-0.9.11.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/avelsieve/current/specs/avelsieve.spec
===================================================================
--- contrib/classic/2.0/avelsieve/current/specs/avelsieve.spec	2005-04-11 21:11:39 UTC (rev 6251)
+++ contrib/classic/2.0/avelsieve/current/specs/avelsieve.spec	2005-04-11 21:25:02 UTC (rev 6252)
@@ -0,0 +1,40 @@
+Name:      avelsieve
+Summary:   SIEVE Mail Filters Plugin for Squirrelmail
+Version:   0.9.11
+Release:   1gd
+Copyright: GPL
+Group:     contrib
+Source:   http://email.uoa.gr/download/squirrelmail/avelsieve/%{name}-%{version}.tar.gz 
+BuildArch: noarch
+BuildRoot: /var/tmp/%{name}-%{version}-root
+PreReq: squirrelmail
+
+%description
+Avelsieve or, verbosely, "SIEVE Mail Filters Plugin for Squirrelmail" is a Squirrelmail plugin for creating SIEVE scripts on a Cyrus IMAP server that runs timsieved (Tim's SIEVE daemon).
+
+%prep
+%setup -q -n %{name}
+
+%build
+
+%install
+mkdir -p %{buildroot}%{_datadir}/squirrelmail/plugins
+cp -a .  %{buildroot}%{_datadir}/squirrelmail/plugins/%{name}
+rm -rf  %{buildroot}%{_datadir}/squirrelmail/plugins/%{name}/doc
+
+%clean
+%clean_buildroot
+
+%post
+
+%postun
+
+%files
+%defattr(-,root,root)
+%doc doc/*
+%{_datadir}/squirrelmail/plugins/%{name}
+
+%changelog
+* Mon Apr 11 2005 Gerald Dachs <gda at tinysofa dot de> 0.9.11-1gd
+- initial build
+



From svn at tinysofa.org  Tue Apr 12 12:43:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Apr 2005 08:43:15 -0400 (EDT)
Subject: [tinysofa-svn] r6253 - in
	tinysofa/releases/classic/2.0/tar/current: sources specs
Message-ID: <20050412124315.8476334481C@minbar.tinysofa.org>

Author: jh
Date: 2005-04-12 08:42:51 -0400 (Tue, 12 Apr 2005)
New Revision: 6253

Added:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017.tar.gz
Removed:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.016.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.016.tar.gz
Modified:
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- 1.02.017, fixes -L/-h switch behaviour

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.016.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017.tar.gz
===================================================================
(Binary files differ)


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

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.016.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017.tar.gz
===================================================================
(Binary files differ)


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

Modified: tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-11 21:25:02 UTC (rev 6252)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-12 12:42:51 UTC (rev 6253)
@@ -1,9 +1,9 @@
-%define libarchive_version	1.02.016
+%define libarchive_version	1.02.017
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.016
-Release: 2jh
+Version: 1.02.017
+Release: 1jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
@@ -36,9 +36,12 @@
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{libarchive_version}"
+export CFLAGS="$RPM_OPT_FLAGS -Ilibarchive-%{libarchive_version}"
 export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
 
+# XXX: POSIX ACLs are broken on Linux
+sed -i 's/define.*HAVE_POSIX_ACL.*$/undef HAVE_POSIX_ACL/'  bsdtar_platform.h
+
 pushd libarchive-%{libarchive_version}
 %configure --prefix=$PWD
 %make
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.017-1jh
+- 1.02.017, fixes -L/-h switch behaviour
+
 * Wed Mar 16 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.016-1jh
 - 1.02.016
 



From svn at tinysofa.org  Tue Apr 12 16:04:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Apr 2005 12:04:34 -0400 (EDT)
Subject: [tinysofa-svn] r6254 -
	tinysofa/releases/classic/2.0/tar/current/specs
Message-ID: <20050412160434.583F6344659@minbar.tinysofa.org>

Author: jh
Date: 2005-04-12 12:04:25 -0400 (Tue, 12 Apr 2005)
New Revision: 6254

Modified:
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- fix the ACL support


Modified: tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-12 12:42:51 UTC (rev 6253)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-12 16:04:25 UTC (rev 6254)
@@ -10,7 +10,9 @@
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
 Patch1: bsdtar-1.02.006-malloc.patch
-Patch2: libarchive-1.02.009-eilseq.patch
+Patch2: bsdtar-1.02.017-acl.patch
+Patch3: libarchive-1.02.009-eilseq.patch
+Patch4: libarchive-1.02.017-acl.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -29,9 +31,11 @@
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
 %patch1 -p1 -b .malloc~
+%patch2 -p1 -b .acl~
 
 pushd libarchive-%{libarchive_version}
-%patch2 -p1 -b .eilseq~
+%patch3 -p1 -b .eilseq~
+%patch4 -p1 -b .acl~
 popd
 
 
@@ -39,16 +43,13 @@
 export CFLAGS="$RPM_OPT_FLAGS -Ilibarchive-%{libarchive_version}"
 export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
 
-# XXX: POSIX ACLs are broken on Linux
-sed -i 's/define.*HAVE_POSIX_ACL.*$/undef HAVE_POSIX_ACL/'  bsdtar_platform.h
-
 pushd libarchive-%{libarchive_version}
 %configure --prefix=$PWD
 %make
 popd
 
 %configure
-%make
+%make LIBS="-lacl"
 
 
 %install



From svn at tinysofa.org  Tue Apr 12 16:05:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 12 Apr 2005 12:05:24 -0400 (EDT)
Subject: [tinysofa-svn] r6255 -
	tinysofa/releases/classic/2.0/tar/current/sources
Message-ID: <20050412160524.AFF2A344750@minbar.tinysofa.org>

Author: jh
Date: 2005-04-12 12:05:18 -0400 (Tue, 12 Apr 2005)
New Revision: 6255

Added:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch
Log:
- add acl patches


Added: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch	2005-04-12 16:04:25 UTC (rev 6254)
+++ tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch	2005-04-12 16:05:18 UTC (rev 6255)
@@ -0,0 +1,17 @@
+--- ./write.c.acl~	2005-04-12 18:54:54.000000000 +0300
++++ ./write.c	2005-04-12 18:55:09.000000000 +0300
+@@ -1044,11 +1044,11 @@
+ 
+ 			acl_get_permset(acl_entry, &acl_permset);
+ 			ae_perm = 0;
+-			if (acl_get_perm_np(acl_permset, ACL_EXECUTE))
++			if (acl_get_perm(acl_permset, ACL_EXECUTE))
+ 				ae_perm |= ARCHIVE_ENTRY_ACL_EXECUTE;
+-			if (acl_get_perm_np(acl_permset, ACL_READ))
++			if (acl_get_perm(acl_permset, ACL_READ))
+ 				ae_perm |= ARCHIVE_ENTRY_ACL_READ;
+-			if (acl_get_perm_np(acl_permset, ACL_WRITE))
++			if (acl_get_perm(acl_permset, ACL_WRITE))
+ 				ae_perm |= ARCHIVE_ENTRY_ACL_WRITE;
+ 
+ 			archive_entry_acl_add_entry(entry,

Added: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch	2005-04-12 16:04:25 UTC (rev 6254)
+++ tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch	2005-04-12 16:05:18 UTC (rev 6255)
@@ -0,0 +1,11 @@
+--- ./archive_platform.h.acl~	2005-04-12 18:52:20.000000000 +0300
++++ ./archive_platform.h	2005-04-12 18:52:52.000000000 +0300
+@@ -113,7 +113,7 @@
+ 
+ /* TODO: Test for the functions we use as well... */
+ #if HAVE_SYS_ACL_H
+-#define	HAVE_POSIX_ACLS	1
++#define	HAVE_POSIX_ACL	1
+ #endif
+ 
+ /* Set up defaults for internal error codes. */



From svn at tinysofa.org  Wed Apr 13 07:58:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Apr 2005 03:58:00 -0400 (EDT)
Subject: [tinysofa-svn] r6256 -
	tinysofa/releases/classic/2.0/tar/current/specs
Message-ID: <20050413075800.6437B344817@minbar.tinysofa.org>

Author: jh
Date: 2005-04-13 03:57:52 -0400 (Wed, 13 Apr 2005)
New Revision: 6256

Modified:
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- install binaries under /bin

Modified: tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-12 16:05:18 UTC (rev 6255)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-13 07:57:52 UTC (rev 6256)
@@ -1,4 +1,5 @@
 %define libarchive_version	1.02.017
+%define _bindir			/bin
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Wed Apr 13 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- install binaries under /bin
+
 * Tue Apr 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.017-1jh
 - 1.02.017, fixes -L/-h switch behaviour
 



From svn at tinysofa.org  Wed Apr 13 08:36:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 13 Apr 2005 04:36:34 -0400 (EDT)
Subject: [tinysofa-svn] r6257 -
	tinysofa/releases/classic/2.0/sed/current/specs
Message-ID: <20050413083634.F3486344838@minbar.tinysofa.org>

Author: jh
Date: 2005-04-13 04:36:28 -0400 (Wed, 13 Apr 2005)
New Revision: 6257

Modified:
   tinysofa/releases/classic/2.0/sed/current/specs/sed.spec
Log:
- 4.1.4


Modified: tinysofa/releases/classic/2.0/sed/current/specs/sed.spec
===================================================================
--- tinysofa/releases/classic/2.0/sed/current/specs/sed.spec	2005-04-13 07:57:52 UTC (rev 6256)
+++ tinysofa/releases/classic/2.0/sed/current/specs/sed.spec	2005-04-13 08:36:28 UTC (rev 6257)
@@ -4,12 +4,11 @@
 
 Summary: A GNU stream text editor.
 Name: sed
-Version: 4.1.2
-Release: 3jh
+Version: 4.1.4
+Release: 1jh
 License: GPL
 Group: main
 Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz
-Patch0: sed-4.1.2-lib-cvs20050104.patch
 %info_requires
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -21,39 +20,49 @@
 that sed performs (substitutions, deletions, insertions, etc.) can be
 specified in a script file or from the command line.
 
+
 %prep
 %setup -q
-%patch0 -p1
 
+
 %build
 %configure
 %make
 
+
 %install
 %makeinstall
 
+mv -f %{buildroot}%{_datadir}/doc/sed.html .
 %install_info doc/sed.texi
 %nuke_info
 
 %find_lang %{name}
 
+
 %post
 %info_post
 
 %postun
 %info_postun
 
+
 %clean
 %clean_buildroot
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc BUGS NEWS README THANKS
+%doc BUGS NEWS README THANKS sed.html
 %{_bindir}/sed 
 %{_htmldir}/%{name}
 %{_mandir}/man1/sed.1*
 
+
 %changelog
+* Wed Apr 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.1.4-1jh
+- 4.1.4
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 4.1.2-2ts
 - current (4.1.2-2jh) integrated as 4.1.2-2ts for release 1.1-U3
 



From svn at tinysofa.org  Fri Apr 15 04:20:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 15 Apr 2005 00:20:35 -0400 (EDT)
Subject: [tinysofa-svn] r6258 - in
	tinysofa/releases/classic/2.0/rpm/current: sources specs
Message-ID: <20050415042035.D169A34485F@minbar.tinysofa.org>

Author: jh
Date: 2005-04-15 00:20:22 -0400 (Fri, 15 Apr 2005)
New Revision: 6258

Added:
   tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.2-python.patch
Modified:
   tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec
Log:
- add support for readHeaderFromFD (python module)

Added: tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.2-python.patch
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.2-python.patch	2005-04-13 08:36:28 UTC (rev 6257)
+++ tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.2-python.patch	2005-04-15 04:20:22 UTC (rev 6258)
@@ -0,0 +1,86 @@
+diff -uNr rpm-4.3.2-orig/python/header-py.c rpm-4.3.2/python/header-py.c
+--- rpm-4.3.2-orig/python/header-py.c	2004-09-04 13:58:24.000000000 -0300
++++ rpm-4.3.2/python/header-py.c	2004-11-22 18:07:55.266310682 -0200
+@@ -977,6 +977,49 @@
+ 
+ /**
+  */
++PyObject * rpmSingleHeaderFromFD(PyObject * self, PyObject * args)
++{
++    FD_t fd;
++    int fileno;
++    off_t offset;
++    PyObject * tuple;
++    Header h;
++
++    if (!PyArg_ParseTuple(args, "i", &fileno)) return NULL;
++
++    offset = lseek(fileno, 0, SEEK_CUR);
++
++    fd = fdDup(fileno);
++
++    if (!fd) {
++	PyErr_SetFromErrno(pyrpmError);
++	return NULL;
++    }
++
++    Py_BEGIN_ALLOW_THREADS
++    h = headerRead(fd, HEADER_MAGIC_YES);
++    Py_END_ALLOW_THREADS
++
++    Fclose(fd);
++
++    tuple = PyTuple_New(2);
++
++    if (h && tuple) {
++	PyTuple_SET_ITEM(tuple, 0, (PyObject *) hdr_Wrap(h));
++	PyTuple_SET_ITEM(tuple, 1, PyLong_FromLong(offset));
++	h = headerFree(h);
++    } else {
++	Py_INCREF(Py_None);
++	Py_INCREF(Py_None);
++	PyTuple_SET_ITEM(tuple, 0, Py_None);
++	PyTuple_SET_ITEM(tuple, 1, Py_None);
++    }
++
++    return tuple;
++}
++
++/**
++ */
+ PyObject * versionCompare (PyObject * self, PyObject * args)
+ {
+     hdrObject * h1, * h2;
+diff -uNr rpm-4.3.2-orig/python/header-py.h rpm-4.3.2/python/header-py.h
+--- rpm-4.3.2-orig/python/header-py.h	2004-09-04 13:58:24.000000000 -0300
++++ rpm-4.3.2/python/header-py.h	2004-11-22 18:07:55.354292649 -0200
+@@ -37,6 +37,8 @@
+ 	/*@*/;
+ PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args)
+ 	/*@*/;
++PyObject * rpmSingleHeaderFromFD(PyObject * self, PyObject * args)
++	/*@*/;
+ PyObject * rpmReadHeaders (FD_t fd)
+ 	/*@*/;
+ PyObject * rhnLoad(PyObject * self, PyObject * args)
+diff -uNr rpm-4.3.2-orig/python/rpmmodule.c rpm-4.3.2/python/rpmmodule.c
+--- rpm-4.3.2-orig/python/rpmmodule.c	2004-09-04 13:58:24.000000000 -0300
++++ rpm-4.3.2/python/rpmmodule.c	2004-11-22 18:07:55.498263140 -0200
+@@ -138,6 +138,8 @@
+ 	NULL },
+     { "readHeaderListFromFile", (PyCFunction) rpmHeaderFromFile, METH_VARARGS,
+ 	NULL },
++    { "readHeaderFromFD", (PyCFunction) rpmSingleHeaderFromFD, METH_VARARGS,
++	NULL },
+ 
+     { "setLogFile", (PyCFunction) setLogFile, METH_VARARGS,
+ 	NULL },
+@@ -427,6 +429,8 @@
+     REGISTER_ENUM(TR_ADDED);
+     REGISTER_ENUM(TR_REMOVED);
+ 
++    REGISTER_ENUM(RPMDBI_PACKAGES);
++
+     PyDict_SetItemString(d, "RPMAL_NOMATCH", o=PyInt_FromLong( (long)RPMAL_NOMATCH ));
+     Py_DECREF(o);
+ 

Modified: tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec	2005-04-13 08:36:28 UTC (rev 6257)
+++ tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec	2005-04-15 04:20:22 UTC (rev 6258)
@@ -21,7 +21,7 @@
 %define version 4.3.3
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 5jh
+Release: 6jh
 Group: main
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Source1: GROUPS
@@ -31,6 +31,7 @@
 Patch3: rpm-4.3.2-aptctrlc.patch
 Patch4: rpm-4.3.3-lkey.patch
 Patch5: rpm-4.3.3-msglvl.patch
+Patch6: rpm-4.3.2-python.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -140,6 +141,7 @@
 %patch3 -p1 -b .aptctrlc~
 %patch4 -p1 -b .lkey~
 #%patch5 -p1 -b .msglvl~
+%patch6 -p1 -b .python~
 
 cp -f %{SOURCE1} .
 
@@ -526,6 +528,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Fri Apr 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.3.3-6jh
+- add support for readHeaderFromFD (python module)
+
 * Tue Jan 11 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.3.3-4jh
 - disable msglvl patch for 1.2
 



From svn at tinysofa.org  Fri Apr 15 08:18:13 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 15 Apr 2005 04:18:13 -0400 (EDT)
Subject: [tinysofa-svn] r6259 -
	tinysofa/releases/classic/2.0/iptables/current/sources
Message-ID: <20050415081813.19458344260@minbar.tinysofa.org>

Author: jh
Date: 2005-04-15 04:18:07 -0400 (Fri, 15 Apr 2005)
New Revision: 6259

Modified:
   tinysofa/releases/classic/2.0/iptables/current/sources/iptables.init
Log:
- correct comment typo


Modified: tinysofa/releases/classic/2.0/iptables/current/sources/iptables.init
===================================================================
--- tinysofa/releases/classic/2.0/iptables/current/sources/iptables.init	2005-04-15 04:20:22 UTC (rev 6258)
+++ tinysofa/releases/classic/2.0/iptables/current/sources/iptables.init	2005-04-15 08:18:07 UTC (rev 6259)
@@ -104,7 +104,7 @@
 
 test_config()
 {
-	# kludge to makge kernel message appear before
+	# kludge to make kernel message appear before
 	/sbin/modprobe ip_tables 2>/dev/null >/dev/null
 
 	NOTE="Testing $SYSCONFFILE"



From svn at tinysofa.org  Sat Apr 16 23:21:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 16 Apr 2005 19:21:50 -0400 (EDT)
Subject: [tinysofa-svn] r6261 - in contrib/classic/2.0/firefox/current:
	sources specs
Message-ID: <20050416232150.4CB4C344773@minbar.tinysofa.org>

Author: gda
Date: 2005-04-16 19:09:56 -0400 (Sat, 16 Apr 2005)
New Revision: 6261

Added:
   contrib/classic/2.0/firefox/current/sources/firefox-1.0.3-source.tar.bz2
Removed:
   contrib/classic/2.0/firefox/current/sources/firefox-1.0.2-source.tar.bz2
Modified:
   contrib/classic/2.0/firefox/current/specs/firefox.spec
Log:
1.0.3

Deleted: contrib/classic/2.0/firefox/current/sources/firefox-1.0.2-source.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/firefox/current/sources/firefox-1.0.3-source.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/firefox/current/sources/firefox-1.0.3-source.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/firefox/current/specs/firefox.spec
===================================================================
--- contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-04-16 20:01:16 UTC (rev 6260)
+++ contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-04-16 23:09:56 UTC (rev 6261)
@@ -9,13 +9,13 @@
 
 Summary: Mozilla Firefox web browser
 Name: firefox
-Version: 1.0.2
-Release: 2gd
+Version: 1.0.3
+Release: 1gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
 
-Source: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2
+Source: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
 Source1: firefox-rebuild-databases.pl.in
 Source2: firefox.png
 Source3: bookmarks.html
@@ -246,6 +246,9 @@
 %endif
 
 %changelog
+* Sat Apr 16 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.3-1gd
+- 1.0.3
+
 * Sun Apr 10 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.2-2gd
 - patched for gnu tar
 



From svn at tinysofa.org  Sun Apr 17 18:01:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 17 Apr 2005 14:01:52 -0400 (EDT)
Subject: [tinysofa-svn] r6262 - in contrib/classic/2.0/libidl/current:
	sources specs
Message-ID: <20050417180152.A65FA34472E@minbar.tinysofa.org>

Author: gda
Date: 2005-04-17 14:01:37 -0400 (Sun, 17 Apr 2005)
New Revision: 6262

Added:
   contrib/classic/2.0/libidl/current/sources/libIDL-0.8.5.tar.bz2
Removed:
   contrib/classic/2.0/libidl/current/sources/libIDL-0.6.8.tar.gz
Modified:
   contrib/classic/2.0/libidl/current/specs/libidl.spec
Log:
0.8.5

Deleted: contrib/classic/2.0/libidl/current/sources/libIDL-0.6.8.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/libidl/current/sources/libIDL-0.8.5.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/libidl/current/sources/libIDL-0.8.5.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/libidl/current/specs/libidl.spec
===================================================================
--- contrib/classic/2.0/libidl/current/specs/libidl.spec	2005-04-16 23:09:56 UTC (rev 6261)
+++ contrib/classic/2.0/libidl/current/specs/libidl.spec	2005-04-17 18:01:37 UTC (rev 6262)
@@ -1,79 +1,104 @@
-Summary: IDL parsing library
-Name: libidl
-Version: 0.6.8
-Release: 17jh
-Source: http://andrewtv.org/libIDL/libIDL-%{version}.tar.gz
-License: LGPL
-Group: contrib
-Requires: glib12
-BuildRequires: glib12-devel flex
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+%define realname libIDL
 
+Summary:	Library for parsing IDL (Interface Definition Language)
+Name:		libidl
+Version:	0.8.5
+Release:	1gd
+License:	LGPL
+Group:		contrib
+URL:		ftp://ftp.gnome.org
+Source:		%{realname}-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}
+BuildRequires:	pkgconfig
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	automake libtool autoconf
+BuildPreReq:	perl flex bison
+
 %description
-libIDL is a small library for creating parse trees of CORBA v2.2
-compliant Interface Definition Language (IDL) files, which is a
-specification for defining interfaces which can be used between
-different CORBA implementations.
+libIDL is a library for parsing IDL (Interface Definition Language).
+It can be used for both COM-style and CORBA-style IDL.
 
 %package devel
-Summary:  Header files and libraries needed for libIDL development
-Group: contrib
-Requires: %{name} = %{version}-%{release}
+Summary:	Libraries and include files for %{name}.
+Group:		contrib
+Requires:	%{name} = %{version}
+Requires:	pkgconfig
+Requires:	glib2-devel >= 2.0
 
 %description devel
-This package includes the header files and libraries needed for
-developing programs using libIDL.
+Development files for %{name}
 
 %prep
-%setup -q -n libIDL-%{version}
+%setup -q -n %{realname}-%{version}
 
 %build
+libtoolize --force --copy
+aclocal-1.9
+automake-1.9
+autoconf
 %configure
-%make
+make
 
 %install
-%makeinstall prefix=$RPM_BUILD_ROOT/%{_prefix}
-%nuke_info 
+rm -rf %{buildroot}
+%makeinstall
 
-%post   -p /sbin/ldconfig
+rm -rf %{buildroot}/%{_datadir}/info/dir
 
-%postun -p /sbin/ldconfig
+perl -p -i -e 's/\/var\/tmp\/libIDL-%{version}//' %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
+rm -rf %{buildroot}/%{_infodir}
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
 %clean
-%clean_buildroot
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog AUTHORS
-%doc README* NEWS BUGS tstidl.c
-%{_libdir}/lib*.so.*
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
-%{_prefix}/bin/*
-%{_libdir}/*.sh
-%{_libdir}/lib*.a
-%{_libdir}/lib*.la
-%{_libdir}/lib*.so
-%{_includedir}/*
-%{_datadir}/aclocal/*
+%{_bindir}/libIDL-config-2
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/libIDL-2.0.pc
+%{_includedir}/libIDL-2.0/libIDL/*.h
+%{_libdir}/*.a
 
 %changelog
-* Mon Oct  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.6.8-17jh
-- include library symlinks to package
+* Sun Apr 17 2005 Gerald Dachs <gda at tinysofa dot org> 0.8.5-1gd
+- 0.8.5 
 
-* 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
+* Sun Feb 13 2005 Matthew Hall <matt at nrpms.net> 0.8.5-1
+- 0.8.5 Release
 
-* Tue Aug 24 2004 Gerald Dachs <gda at tinysofa dot org> 0.6.8-16gd
-- rebuilt for tinysofa contrib
+* Tue Aug 17 2004 Matthew Hall <matt at ecsc.co.uk> 0.8.4-1
+- 0.8.4 Release
 
-* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
-- Rebuilt for TSL 2.1
+* Mon May 24 2004 Matthew Hall <matt at ecsc.co.uk> 0.8.3-3
+- Rebuild for Fedora Core 2
 
-* Wed Jan 14 2004 Chr. Toldnes <christht at trustix dot org> 0.6.8-2ct
-- Big Rebuild
+* Fri Feb 06 2004 Matthew Hall <matt at ecsc.co.uk> 0.8.3-2
+- Strip tmppath from .la's
 
-* Tue Dec 23 2003 Chr. Toldnes <christht at trustix dot org> 0.6.8-1ct
-- Initial release for Trustix Desktop 2.0
-- Based upon work by Andrew T. Veliath
+* Thu Feb 05 2004 Matthew Hall <matt at ecsc.co.uk> 0.8.3-1
+- 0.8.3 Release
+
+* Sat Nov 15 2003 Matthew Hall <matt at ecsc.co.uk> 0.8.2-2
+- Rebuild for Fedora Core 1
+
+* Fri Jun 06 2003 Matthew Hall <matt at ecsc.co.uk> 0.8.2-1
+- 0.8.2 Release
+
+* Fri May 09 2003 Matthew Hall <matt at ecsc.co.uk> 0.8.1-1
+- 0.8.1 Release
+
+* Thu Feb 06 2003 Matthew Hall <matt at ecsc.co.uk>
+- New Spec File
+



From svn at tinysofa.org  Sun Apr 17 18:04:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 17 Apr 2005 14:04:06 -0400 (EDT)
Subject: [tinysofa-svn] r6263 - contrib/classic/2.0/firefox/current/specs
Message-ID: <20050417180406.8142E34472E@minbar.tinysofa.org>

Author: gda
Date: 2005-04-17 14:04:01 -0400 (Sun, 17 Apr 2005)
New Revision: 6263

Modified:
   contrib/classic/2.0/firefox/current/specs/firefox.spec
Log:
build for gtk2

Modified: contrib/classic/2.0/firefox/current/specs/firefox.spec
===================================================================
--- contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-04-17 18:01:37 UTC (rev 6262)
+++ contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-04-17 18:04:01 UTC (rev 6263)
@@ -5,12 +5,11 @@
 
 %define _without_freedesktop 1
 %define icewm_menu 1
-%define _without_gtk2 1
 
 Summary: Mozilla Firefox web browser
 Name: firefox
 Version: 1.0.3
-Release: 1gd
+Release: 2gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -31,12 +30,11 @@
 BuildRequires: xorg-x11-devel, zlib-devel, zip, unzip
 BuildRequires: libpng-devel, libjpeg-devel
 BuildRequires: gcc-c++, krb5-devel
-BuildRequires: libidl-devel
+BuildRequires: libidl-devel >= 0.8.5
 BuildRequires: openssl-devel
 BuildRequires: gtar
-Requires: xorg-x11-libs, openssl, freetype
-%{!?_without_gtk2:BuildRequires: gtk-devel, glib-devel}
-%{?_without_gtk2:BuildRequires: gtk12+-devel, glib12-devel}
+Requires: xorg-x11-libs, openssl, freetype, gtk, libidl >= 0.8.5
+BuildRequires: gtk-devel, glib-devel
 
 Obsoletes: phoenix, MozillaFirebird, mozilla-firebird, mozilla-firefox
 Provides: webclient
@@ -75,8 +73,7 @@
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
-%{?_without_gtk2:ac_add_options --enable-default-toolkit="gtk"}
-%{!?_without_gtk2:ac_add_options --enable-default-toolkit="gtk2"}
+ac_add_options --enable-default-toolkit="gtk2"
 ac_add_options --enable-xft
 ac_add_options --enable-xinerama
 EOF
@@ -194,13 +191,6 @@
 
 %{__install} -d -m0755 %{buildroot}%{_libdir}/mozilla/plugins/
 
-%if %{?_without_gtk2:1}0
-### FIXME: Fixed "nsNativeComponentLoader: GetFactory(libwidget_gtk.so) Load FAILED with error: libwidget_gtk.so" by linking. (Please fix upstream)
-if [ ! -f %{buildroot}%{_libdir}/firefox/components/libwidget_gtk.so ]; then
-	%{__ln_s} -f libwidget_gtk2.so %{buildroot}%{_libdir}/firefox/components/libwidget_gtk.so
-fi
-%endif
-
 ### Clean up buildroot
 find %{buildroot}%{_libdir}/firefox/chrome/* -type d -maxdepth 1 -exec %{__rm} -rf {} \;
 
@@ -246,6 +236,9 @@
 %endif
 
 %changelog
+* Sun Apr 17 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.3-2gd
+- gtk2 support only
+
 * Sat Apr 16 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.3-1gd
 - 1.0.3
 



From svn at tinysofa.org  Mon Apr 18 07:19:51 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 18 Apr 2005 03:19:51 -0400 (EDT)
Subject: [tinysofa-svn] r6264 - in
	tinysofa/releases/classic/2.0/tar/current: sources specs
Message-ID: <20050418071951.173D73447FE@minbar.tinysofa.org>

Author: jh
Date: 2005-04-18 03:19:28 -0400 (Mon, 18 Apr 2005)
New Revision: 6264

Added:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.019.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.019.tar.gz
Removed:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017.tar.gz
Modified:
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- 1.02.019
- ACL fixes integrated to upstream


Deleted: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch	2005-04-17 18:04:01 UTC (rev 6263)
+++ tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017-acl.patch	2005-04-18 07:19:28 UTC (rev 6264)
@@ -1,17 +0,0 @@
---- ./write.c.acl~	2005-04-12 18:54:54.000000000 +0300
-+++ ./write.c	2005-04-12 18:55:09.000000000 +0300
-@@ -1044,11 +1044,11 @@
- 
- 			acl_get_permset(acl_entry, &acl_permset);
- 			ae_perm = 0;
--			if (acl_get_perm_np(acl_permset, ACL_EXECUTE))
-+			if (acl_get_perm(acl_permset, ACL_EXECUTE))
- 				ae_perm |= ARCHIVE_ENTRY_ACL_EXECUTE;
--			if (acl_get_perm_np(acl_permset, ACL_READ))
-+			if (acl_get_perm(acl_permset, ACL_READ))
- 				ae_perm |= ARCHIVE_ENTRY_ACL_READ;
--			if (acl_get_perm_np(acl_permset, ACL_WRITE))
-+			if (acl_get_perm(acl_permset, ACL_WRITE))
- 				ae_perm |= ARCHIVE_ENTRY_ACL_WRITE;
- 
- 			archive_entry_acl_add_entry(entry,

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.017.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.019.tar.gz
===================================================================
(Binary files differ)


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

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch	2005-04-17 18:04:01 UTC (rev 6263)
+++ tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017-acl.patch	2005-04-18 07:19:28 UTC (rev 6264)
@@ -1,11 +0,0 @@
---- ./archive_platform.h.acl~	2005-04-12 18:52:20.000000000 +0300
-+++ ./archive_platform.h	2005-04-12 18:52:52.000000000 +0300
-@@ -113,7 +113,7 @@
- 
- /* TODO: Test for the functions we use as well... */
- #if HAVE_SYS_ACL_H
--#define	HAVE_POSIX_ACLS	1
-+#define	HAVE_POSIX_ACL	1
- #endif
- 
- /* Set up defaults for internal error codes. */

Deleted: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.017.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.019.tar.gz
===================================================================
(Binary files differ)


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

Modified: tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-17 18:04:01 UTC (rev 6263)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-04-18 07:19:28 UTC (rev 6264)
@@ -1,9 +1,9 @@
-%define libarchive_version	1.02.017
+%define libarchive_version	1.02.019
 %define _bindir			/bin
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.017
+Version: 1.02.019
 Release: 1jh
 License: BSD
 Group: main
@@ -11,9 +11,7 @@
 Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{libarchive_version}.tar.gz
 Patch0: bsdtar-1.01.022-setlocale.patch
 Patch1: bsdtar-1.02.006-malloc.patch
-Patch2: bsdtar-1.02.017-acl.patch
 Patch3: libarchive-1.02.009-eilseq.patch
-Patch4: libarchive-1.02.017-acl.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 Provides: bsdtar = %{version}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -32,11 +30,9 @@
 %setup -q -n bsdtar-%{version} -a 1
 %patch0 -p1 -b .setlocale~
 %patch1 -p1 -b .malloc~
-%patch2 -p1 -b .acl~
 
 pushd libarchive-%{libarchive_version}
 %patch3 -p1 -b .eilseq~
-%patch4 -p1 -b .acl~
 popd
 
 
@@ -50,7 +46,7 @@
 popd
 
 %configure
-%make LIBS="-lacl"
+%make
 
 
 %install
@@ -73,6 +69,10 @@
 
 
 %changelog
+* Mon Apr 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.019-1jh
+- 1.02.019
+- ACL fixes integrated to upstream
+
 * Wed Apr 13 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - install binaries under /bin
 



From svn at tinysofa.org  Tue Apr 19 07:27:23 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Apr 2005 03:27:23 -0400 (EDT)
Subject: [tinysofa-svn] r6265 - in
	tinysofa/releases/classic/2.0/nasm/current: sources specs
Message-ID: <20050419072723.607D234498C@minbar.tinysofa.org>

Author: jh
Date: 2005-04-19 03:26:59 -0400 (Tue, 19 Apr 2005)
New Revision: 6265

Added:
   tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.39.tar.bz2
Removed:
   tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.38.tar.bz2
Modified:
   tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.38-overflow.patch
   tinysofa/releases/classic/2.0/nasm/current/specs/nasm.spec
Log:
- 0.98.39
- update overflow patch to address more problems


Modified: tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.38-overflow.patch
===================================================================
--- tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.38-overflow.patch	2005-04-18 07:19:28 UTC (rev 6264)
+++ tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.38-overflow.patch	2005-04-19 07:26:59 UTC (rev 6265)
@@ -1,370 +1,11 @@
---- ./preproc.c.orig	2004-12-16 10:49:55 -0500
-+++ ./preproc.c	2004-12-16 10:51:48 -0500
-@@ -528,7 +528,7 @@
- 	    fname++;
- 	fnlen = strcspn(fname, "\"");
- 	line = nasm_malloc(20 + fnlen);
--	sprintf(line, "%%line %d %.*s", lineno, fnlen, fname);
-+	snprintf(line, 20+fnlen,"%%line %d %.*s", lineno, fnlen, fname);
- 	nasm_free(oldline);
-     }
-     if (tasm_compatible_mode)
-@@ -1043,7 +1043,7 @@
- 		char *p, *q = t->text + 2;
+--- nasm-0.98.39/output/outieee.c.overfl	2005-01-15 23:16:08.000000000 +0100
++++ nasm-0.98.39/output/outieee.c	2005-04-01 12:55:17.231530832 +0200
+@@ -1120,7 +1120,7 @@ static void ieee_putascii(char *format, 
+     va_list ap;
  
- 		q += strspn(q, "$");
--		sprintf(buffer, "..@%lu.", ctx->number);
-+		snprintf(buffer, sizeof(buffer), "..@%lu.", ctx->number);
- 		p = nasm_strcat(buffer, q);
- 		nasm_free(t->text);
- 		t->text = p;
-@@ -1520,23 +1520,30 @@
- 		    t = t->next;
- 		    continue;
- 		}
--		else if (tt->type == TOK_WHITESPACE)
-+		if (tt->type == TOK_WHITESPACE)
- 		{
- 		    tt = tt->next;
- 		    continue;
- 		}
--		else if (tt->type != t->type ||
--			mstrcmp(tt->text, t->text, casesense))
-+		if (tt->type != t->type)
- 		{
- 		    j = FALSE;	/* found mismatching tokens */
- 		    break;
- 		}
--		else
-+		/* Unify surrounding quotes for strings */
-+		if (t->type == TOK_STRING)
- 		{
--		    t = t->next;
--		    tt = tt->next;
--		    continue;
-+		    tt->text[0] = t->text[0];
-+		    tt->text[strlen(tt->text) - 1] = t->text[0];
- 		}
-+		if (mstrcmp(tt->text, t->text, casesense) != 0)
-+		{
-+		    j = FALSE;	/* found mismatching tokens */
-+		    break;
-+		}
-+
-+		t = t->next;
-+		tt = tt->next;
- 	    }
- 	    if ((t->type != TOK_OTHER || strcmp(t->text, ",")) || tt)
- 		j = FALSE;	/* trailing gunk on one end or other */
-@@ -1954,7 +1961,7 @@
- 		free_tlist(tt);
- 
- 		/* Now define the macro for the argument */
--		sprintf(directive, "%%define %s (%s+%d)", arg, StackPointer,
-+		snprintf(directive, sizeof(directive), "%%define %s (%s+%d)", arg, StackPointer,
- 			offset);
- 		do_directive(tokenise(directive));
- 		offset += size;
-@@ -2051,13 +2058,13 @@
- 		free_tlist(tt);
- 
- 		/* Now define the macro for the argument */
--		sprintf(directive, "%%define %s (%s-%d)", local, StackPointer,
-+		snprintf(directive, sizeof(directive), "%%define %s (%s-%d)", local, StackPointer,
- 			offset);
- 		do_directive(tokenise(directive));
- 		offset += size;
- 
- 		/* Now define the assign to setup the enter_c macro correctly */
--		sprintf(directive, "%%assign %%$localsize %%$localsize+%d",
-+		snprintf(directive, sizeof(directive), "%%assign %%$localsize %%$localsize+%d",
- 			size);
- 		do_directive(tokenise(directive));
- 
-@@ -3182,12 +3189,12 @@
- 			 */
- 		    case '0':
- 			type = TOK_NUMBER;
--			sprintf(tmpbuf, "%d", mac->nparam);
-+			snprintf(tmpbuf, sizeof(tmpbuf), "%d", mac->nparam);
- 			text = nasm_strdup(tmpbuf);
- 			break;
- 		    case '%':
- 			type = TOK_ID;
--			sprintf(tmpbuf, "..@%lu.", mac->unique);
-+			snprintf(tmpbuf, sizeof(tmpbuf), "..@%lu.", mac->unique);
- 			text = nasm_strcat(tmpbuf, t->text + 2);
- 			break;
- 		    case '-':
-@@ -4067,7 +4074,7 @@
- 	return;
- 
-     va_start(arg, fmt);
--    vsprintf(buff, fmt, arg);
-+    vsnprintf(buff, sizeof(buff), fmt, arg);
-     va_end(arg);
- 
-     if (istk && istk->mstk && istk->mstk->name)
-@@ -4530,7 +4537,7 @@
- make_tok_num(Token * tok, long val)
- {
-     char numbuf[20];
--    sprintf(numbuf, "%ld", val);
-+    snprintf(numbuf, sizeof(numbuf), "%ld", val);
-     tok->text = nasm_strdup(numbuf);
-     tok->type = TOK_NUMBER;
- }
---- ./disasm.c.orig	2003-02-24 18:22:45.000000000 -0500
-+++ ./disasm.c	2004-12-15 18:00:13.000000000 -0500
-@@ -484,8 +484,8 @@
-     return data - origdata;
- }
- 
--long disasm (unsigned char *data, char *output, int segsize, long offset,
--	     int autosync, unsigned long prefer)
-+long disasm (unsigned char *data, char *output, int outbufsize, int segsize, 
-+	     long offset, int autosync, unsigned long prefer)
- {
-     struct itemplate **p, **best_p;
-     int length, best_length = 0;
-@@ -583,26 +583,26 @@
-     slen = 0;
- 
-     if (lock)
--	slen += sprintf(output+slen, "lock ");
-+	slen += snprintf(output+slen, outbufsize-slen, "lock ");
-     for (i = 0; i < ins.nprefix; i++)
- 	switch (ins.prefixes[i]) {
--	  case P_REP:   slen += sprintf(output+slen, "rep "); break;
--	  case P_REPE:  slen += sprintf(output+slen, "repe "); break;
--	  case P_REPNE: slen += sprintf(output+slen, "repne "); break;
--	  case P_A16:   slen += sprintf(output+slen, "a16 "); break;
--	  case P_A32:   slen += sprintf(output+slen, "a32 "); break;
--	  case P_O16:   slen += sprintf(output+slen, "o16 "); break;
--	  case P_O32:   slen += sprintf(output+slen, "o32 "); break;
-+	  case P_REP:   slen += snprintf(output+slen, outbufsize-slen, "rep "); break;
-+	  case P_REPE:  slen += snprintf(output+slen, outbufsize-slen, "repe "); break;
-+	  case P_REPNE: slen += snprintf(output+slen, outbufsize-slen, "repne "); break;
-+	  case P_A16:   slen += snprintf(output+slen, outbufsize-slen, "a16 "); break;
-+	  case P_A32:   slen += snprintf(output+slen, outbufsize-slen, "a32 "); break;
-+	  case P_O16:   slen += snprintf(output+slen, outbufsize-slen, "o16 "); break;
-+	  case P_O32:   slen += snprintf(output+slen, outbufsize-slen, "o32 "); break;
- 	}
- 
-     for (i = 0; i < elements(ico); i++)
- 	if ((*p)->opcode == ico[i]) {
--	    slen += sprintf(output+slen, "%s%s", icn[i],
-+	    slen += snprintf(output+slen, outbufsize-slen, "%s%s", icn[i],
- 			    whichcond(ins.condition));
- 	    break;
- 	}
-     if (i >= elements(ico))
--	slen += sprintf(output+slen, "%s", insn_names[(*p)->opcode]);
-+	slen += snprintf(output+slen, outbufsize-slen, "%s", insn_names[(*p)->opcode]);
-     colon = FALSE;
-     length += data - origdata;	       /* fix up for prefixes */
-     for (i=0; i<(*p)->operands; i++) {
-@@ -633,14 +633,14 @@
- 	    ins.oprs[i].basereg = whichreg ((*p)->opd[i],
- 					    ins.oprs[i].basereg);
- 	    if ( (*p)->opd[i] & TO )
--		slen += sprintf(output+slen, "to ");
--	    slen += sprintf(output+slen, "%s",
-+		slen += snprintf(output+slen, outbufsize-slen, "to ");
-+	    slen += snprintf(output+slen, outbufsize-slen, "%s",
- 			    reg_names[ins.oprs[i].basereg-EXPR_REG_START]);
- 	} else if (!(UNITY & ~(*p)->opd[i])) {
- 	    output[slen++] = '1';
- 	} else if ( (*p)->opd[i] & IMMEDIATE ) {
- 	    if ( (*p)->opd[i] & BITS8 ) {
--		slen += sprintf(output+slen, "byte ");
-+		slen += snprintf(output+slen, outbufsize-slen, "byte ");
- 		if (ins.oprs[i].segment & SEG_SIGNED) {
- 		    if (ins.oprs[i].offset < 0) {
- 			ins.oprs[i].offset *= -1;
-@@ -649,17 +649,17 @@
- 			output[slen++] = '+';
- 		}
- 	    } else if ( (*p)->opd[i] & BITS16 ) {
--		slen += sprintf(output+slen, "word ");
-+		slen += snprintf(output+slen, outbufsize-slen, "word ");
- 	    } else if ( (*p)->opd[i] & BITS32 ) {
--		slen += sprintf(output+slen, "dword ");
-+		slen += snprintf(output+slen, outbufsize-slen, "dword ");
- 	    } else if ( (*p)->opd[i] & NEAR ) {
--		slen += sprintf(output+slen, "near ");
-+		slen += snprintf(output+slen, outbufsize-slen, "near ");
- 	    } else if ( (*p)->opd[i] & SHORT ) {
--		slen += sprintf(output+slen, "short ");
-+		slen += snprintf(output+slen, outbufsize-slen, "short ");
- 	    }
--	    slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset);
-+	    slen += snprintf(output+slen, outbufsize-slen, "0x%lx", ins.oprs[i].offset);
- 	} else if ( !(MEM_OFFS & ~(*p)->opd[i]) ) {
--	    slen += sprintf(output+slen, "[%s%s%s0x%lx]",
-+	    slen += snprintf(output+slen, outbufsize-slen, "[%s%s%s0x%lx]",
- 			    (segover ? segover : ""),
- 			    (segover ? ":" : ""),
- 			    (ins.oprs[i].addr_size == 32 ? "dword " :
-@@ -669,30 +669,30 @@
- 	} else if ( !(REGMEM & ~(*p)->opd[i]) ) {
- 	    int started = FALSE;
- 	    if ( (*p)->opd[i] & BITS8 )
--		slen += sprintf(output+slen, "byte ");
-+		slen += snprintf(output+slen, outbufsize-slen, "byte ");
- 	    if ( (*p)->opd[i] & BITS16 )
--		slen += sprintf(output+slen, "word ");
-+		slen += snprintf(output+slen, outbufsize-slen, "word ");
- 	    if ( (*p)->opd[i] & BITS32 )
--		slen += sprintf(output+slen, "dword ");
-+		slen += snprintf(output+slen, outbufsize-slen, "dword ");
- 	    if ( (*p)->opd[i] & BITS64 )
--		slen += sprintf(output+slen, "qword ");
-+		slen += snprintf(output+slen, outbufsize-slen, "qword ");
- 	    if ( (*p)->opd[i] & BITS80 )
--		slen += sprintf(output+slen, "tword ");
-+		slen += snprintf(output+slen, outbufsize-slen, "tword ");
- 	    if ( (*p)->opd[i] & FAR )
--		slen += sprintf(output+slen, "far ");
-+		slen += snprintf(output+slen, outbufsize-slen, "far ");
- 	    if ( (*p)->opd[i] & NEAR )
--		slen += sprintf(output+slen, "near ");
-+		slen += snprintf(output+slen, outbufsize-slen, "near ");
- 	    output[slen++] = '[';
- 	    if (ins.oprs[i].addr_size)
--		slen += sprintf(output+slen, "%s",
-+		slen += snprintf(output+slen, outbufsize-slen, "%s",
- 				(ins.oprs[i].addr_size == 32 ? "dword " :
- 				 ins.oprs[i].addr_size == 16 ? "word " : ""));
- 	    if (segover) {
--		slen += sprintf(output+slen, "%s:", segover);
-+		slen += snprintf(output+slen, outbufsize-slen, "%s:", segover);
- 		segover = NULL;
- 	    }
- 	    if (ins.oprs[i].basereg != -1) {
--		slen += sprintf(output+slen, "%s",
-+		slen += snprintf(output+slen, outbufsize-slen, "%s",
- 				reg_names[(ins.oprs[i].basereg -
- 					   EXPR_REG_START)]);
- 		started = TRUE;
-@@ -700,11 +700,11 @@
- 	    if (ins.oprs[i].indexreg != -1) {
- 		if (started)
- 		    output[slen++] = '+';
--		slen += sprintf(output+slen, "%s",
-+		slen += snprintf(output+slen, outbufsize-slen, "%s",
- 				reg_names[(ins.oprs[i].indexreg -
- 					   EXPR_REG_START)]);
- 		if (ins.oprs[i].scale > 1)
--		    slen += sprintf(output+slen, "*%d", ins.oprs[i].scale);
-+		    slen += snprintf(output+slen, outbufsize-slen, "*%d", ins.oprs[i].scale);
- 		started = TRUE;
- 	    }
- 	    if (ins.oprs[i].segment & SEG_DISP8) {
-@@ -713,20 +713,20 @@
- 		    ins.oprs[i].offset = - (signed char) ins.oprs[i].offset;
- 		    sign = '-';
- 		}
--		slen += sprintf(output+slen, "%c0x%lx", sign,
-+		slen += snprintf(output+slen, outbufsize-slen, "%c0x%lx", sign,
- 				ins.oprs[i].offset);
- 	    } else if (ins.oprs[i].segment & SEG_DISP16) {
- 		if (started)
- 		    output[slen++] = '+';
--		slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset);
-+		slen += snprintf(output+slen, outbufsize-slen, "0x%lx", ins.oprs[i].offset);
- 	    } else if (ins.oprs[i].segment & SEG_DISP32) {
- 		if (started)
- 		    output[slen++] = '+';
--		slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset);
-+		slen += snprintf(output+slen, outbufsize-slen, "0x%lx", ins.oprs[i].offset);
- 	    }
- 	    output[slen++] = ']';
- 	} else {
--	    slen += sprintf(output+slen, "<operand%d>", i);
-+	    slen += snprintf(output+slen, outbufsize-slen, "<operand%d>", i);
- 	}
-     }
-     output[slen] = '\0';
-@@ -741,8 +741,8 @@
-     return length;
- }
- 
--long eatbyte (unsigned char *data, char *output) 
-+long eatbyte (unsigned char *data, char *output, int outbufsize) 
- {
--    sprintf(output, "db 0x%02X", *data);
-+    snprintf(output, outbufsize, "db 0x%02X", *data);
-     return 1;
- }
---- ./ndisasm.c.orig	2002-04-30 17:04:18.000000000 -0400
-+++ ./ndisasm.c	2004-12-15 13:27:21.000000000 -0500
-@@ -243,10 +243,10 @@
- 	    nextsync = next_sync (offset, &synclen);
- 	}
- 	while (p > q && (p - q >= INSN_MAX || lenread == 0)) {
--	    lendis = disasm (q, outbuf, bits, offset, autosync, prefer);
-+	    lendis = disasm (q, outbuf, sizeof(outbuf), bits, offset, autosync, prefer);
- 	    if (!lendis || lendis > (p - q) ||
- 		(unsigned long)lendis > nextsync-offset)
--		lendis = eatbyte (q, outbuf);
-+		lendis = eatbyte (q, outbuf, sizeof(outbuf));
- 	    output_ins (offset, q, lendis, outbuf);
- 	    q += lendis;
- 	    offset += lendis;
---- ./listing.c.orig	2002-09-11 22:23:54.000000000 -0400
-+++ ./listing.c	2004-12-15 13:05:05.000000000 -0500
-@@ -192,7 +192,7 @@
-     else if (typ == OUT_RESERVE) 
-     {
- 	char q[20];
--	sprintf(q, "<res %08lX>", size);
-+	snprintf(q, sizeof(q), "<res %08lX>", size);
- 	list_out (offset, q);
-     }
- }
---- ./labels.c.orig	2003-09-07 20:30:40.000000000 -0400
-+++ ./labels.c	2004-12-15 13:03:20.000000000 -0500
-@@ -221,7 +221,7 @@
- 	slen += strlen(lpostfix);
- 	slen++; /* room for that null char */
- 	xsymbol = nasm_malloc(slen);
--	sprintf(xsymbol,"%s%s%s",lprefix,lptr->defn.label,lpostfix);
-+	snprintf(xsymbol,slen,"%s%s%s",lprefix,lptr->defn.label,lpostfix);
- 
- 	ofmt->symdef (xsymbol, segment, offset, exi, 
- 		special ? special : lptr->defn.special);
-@@ -286,7 +286,7 @@
- 	slen += strlen(lpostfix);
- 	slen++; /* room for that null char */
- 	xsymbol = nasm_malloc(slen);
--	sprintf(xsymbol,"%s%s%s",lprefix,lptr->defn.label,lpostfix);
-+	snprintf(xsymbol,slen,"%s%s%s",lprefix,lptr->defn.label,lpostfix);
- 
- 	ofmt->symdef (xsymbol, segment, offset, exi, 
- 		special ? special : lptr->defn.special);
---- ./nasm.c.orig	2003-09-10 19:34:23.000000000 -0400
-+++ ./nasm.c	2004-12-15 12:10:25.000000000 -0500
-@@ -185,7 +185,7 @@
-     /* define some macros dependent of command-line */
-     {
- 	char temp [64];
--	sprintf (temp, "__OUTPUT_FORMAT__=%s\n", ofmt->shortname);
-+	snprintf (temp, sizeof(temp), "__OUTPUT_FORMAT__=%s\n", ofmt->shortname);
- 	pp_pre_define (temp);
-     }
- 
---- ./disasm.h.orig	2002-04-30 16:56:44.000000000 -0400
-+++ ./disasm.h	2004-12-15 13:26:37.000000000 -0500
-@@ -11,8 +11,8 @@
- 
- #define INSN_MAX 32	/* one instruction can't be longer than this */
- 
--long disasm (unsigned char *data, char *output, int segsize, long offset,
--	     int autosync, unsigned long prefer);
--long eatbyte (unsigned char *data, char *output);
-+long disasm (unsigned char *data, char *output, int outbufsize, int segsize, 
-+	     long offset, int autosync, unsigned long prefer);
-+long eatbyte (unsigned char *data, char *output, int outbufsize);
- 
- #endif
+     va_start(ap, format);
+-    vsprintf(buffer, format, ap);
++    vsnprintf(buffer, sizeof(buffer), format, ap);
+     l = strlen(buffer);
+     for (i = 0; i < l; i++)
+         if ((buffer[i] & 0xff) > 31)

Deleted: tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.38.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.39.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/2.0/nasm/current/sources/nasm-0.98.39.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/classic/2.0/nasm/current/specs/nasm.spec
===================================================================
--- tinysofa/releases/classic/2.0/nasm/current/specs/nasm.spec	2005-04-18 07:19:28 UTC (rev 6264)
+++ tinysofa/releases/classic/2.0/nasm/current/specs/nasm.spec	2005-04-19 07:26:59 UTC (rev 6265)
@@ -1,7 +1,7 @@
 Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
 Name: nasm
-Version: 0.98.38
-Release: 8jh
+Version: 0.98.39
+Release: 1jh
 License: LGPL
 Group: development
 Source: http://unc.dl.sourceforge.net/sourceforge/nasm/nasm-%{version}.tar.bz2
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Tue Apr 19 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.98.39-1jh
+- 0.98.39
+- update overflow patch to address more problems
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 0.98.38-7ts
 - current (0.98.38-7jh) integrated as 0.98.38-7ts for release 1.1-U3
 



From svn at tinysofa.org  Tue Apr 19 07:32:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Apr 2005 03:32:34 -0400 (EDT)
Subject: [tinysofa-svn] r6266 - in
	tinysofa/releases/classic/2.0/sharutils/current: sources specs
Message-ID: <20050419073234.F1E53344995@minbar.tinysofa.org>

Author: jh
Date: 2005-04-19 03:32:24 -0400 (Tue, 19 Apr 2005)
New Revision: 6266

Added:
   tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-CAN-2005-0990.patch
   tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-getcwd.patch
Modified:
   tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec
Log:
- fix CAN-2005-0990
- add getcwd patch


Added: tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-CAN-2005-0990.patch
===================================================================
--- tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-CAN-2005-0990.patch	2005-04-19 07:26:59 UTC (rev 6265)
+++ tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-CAN-2005-0990.patch	2005-04-19 07:32:24 UTC (rev 6266)
@@ -0,0 +1,20 @@
+--- sharutils-4.2.1/src/unshar.c.tn	2005-04-07 14:44:05.000000000 +0200
++++ sharutils-4.2.1/src/unshar.c	2005-04-07 14:43:26.000000000 +0200
+@@ -424,13 +424,15 @@
+       }
+   else
+     {
++#ifdef __MSDOS__
+       sprintf (name_buffer, "/tmp/unsh.%05d", (int) getpid ());
+       unlink (name_buffer);
+ 
+       if (file = fopen (name_buffer, "w+"), !file)
+ 	error (EXIT_FAILURE, errno, name_buffer);
+-#ifndef __MSDOS__
+-      unlink (name_buffer);	/* will be deleted on fclose */
++#else
++      if (file = tmpfile(), !file)
++	error (EXIT_FAILURE, errno, "tmpfile");
+ #endif
+ 
+       while (size_read = fread (copy_buffer, 1, sizeof (copy_buffer), stdin),

Added: tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-getcwd.patch
===================================================================
--- tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-getcwd.patch	2005-04-19 07:26:59 UTC (rev 6265)
+++ tinysofa/releases/classic/2.0/sharutils/current/sources/sharutils-4.2.1-getcwd.patch	2005-04-19 07:32:24 UTC (rev 6266)
@@ -0,0 +1,11 @@
+--- sharutils-4.2.1/lib/xgetcwd.c.orig	2005-03-07 15:30:20.000000000 +0100
++++ sharutils-4.2.1/lib/xgetcwd.c	2005-03-07 15:30:40.000000000 +0100
+@@ -32,8 +32,6 @@
+ #ifndef HAVE_GETCWD
+ char *getwd ();
+ #define getcwd(buf, max) getwd (buf)
+-#else
+-char *getcwd ();
+ #endif
+ 
+ /* Amount to increase buffer size by in each try. */

Modified: tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec
===================================================================
--- tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec	2005-04-19 07:26:59 UTC (rev 6265)
+++ tinysofa/releases/classic/2.0/sharutils/current/specs/sharutils.spec	2005-04-19 07:32:24 UTC (rev 6266)
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives.
 Name: sharutils
 Version: 4.2.1
-Release: 24jh
+Release: 25jh
 License: GPL
 Group: extra
 Source: ftp://prep.ai.mit.edu/pub/gnu/sharutils/sharutils-%{version}.tar.gz
@@ -14,6 +14,8 @@
 Patch7: sharutils-4.2.1-uudecode.patch
 Patch8: sharutils-opto.dif
 Patch9: sharutils-4.2.1-sec.patch
+Patch10: sharutils-4.2.1-getcwd.patch
+Patch11: sharutils-4.2.1-CAN-2005-0990.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext
 
@@ -45,6 +47,8 @@
 %patch7 -p1
 %patch8 -p0 -b .ooption
 %patch9 -p1
+%patch10 -p1 -b .getcwd
+%patch11 -p1 -b .CAN-2005-0990
 
 
 %build
@@ -75,6 +79,10 @@
 
 
 %changelog
+* Tue Apr 19 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.2.1-25jh
+- fix CAN-2005-0990
+- add getcwd patch
+
 * Fri Apr  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.2.1-24jh
 - security fixes
 



From svn at tinysofa.org  Tue Apr 19 16:16:09 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Apr 2005 12:16:09 -0400 (EDT)
Subject: [tinysofa-svn] r6267 - in contrib/classic/2.0: . libgpg-error
	libgpg-error/current libgpg-error/current/sources
	libgpg-error/current/specs
Message-ID: <20050419161609.68A19344919@minbar.tinysofa.org>

Author: gda
Date: 2005-04-19 12:15:52 -0400 (Tue, 19 Apr 2005)
New Revision: 6267

Added:
   contrib/classic/2.0/libgpg-error/
   contrib/classic/2.0/libgpg-error/current/
   contrib/classic/2.0/libgpg-error/current/sources/
   contrib/classic/2.0/libgpg-error/current/sources/libgpg-error-1.0.tar.gz
   contrib/classic/2.0/libgpg-error/current/specs/
   contrib/classic/2.0/libgpg-error/current/specs/libgpg-error.spec
   contrib/classic/2.0/libgpg-error/pristine/
   contrib/classic/2.0/libgpg-error/releases/
Log:
new in contrib

Added: contrib/classic/2.0/libgpg-error/current/sources/libgpg-error-1.0.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/libgpg-error/current/sources/libgpg-error-1.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/libgpg-error/current/specs/libgpg-error.spec
===================================================================
--- contrib/classic/2.0/libgpg-error/current/specs/libgpg-error.spec	2005-04-19 07:32:24 UTC (rev 6266)
+++ contrib/classic/2.0/libgpg-error/current/specs/libgpg-error.spec	2005-04-19 16:15:52 UTC (rev 6267)
@@ -0,0 +1,72 @@
+Summary: libgpg-error
+Name: libgpg-error
+Version: 1.0
+Release: 1gd
+URL: ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/
+Source: ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/%{name}-%{version}.tar.gz
+Group: contrib
+Copyright: LGPL
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Prereq: /sbin/ldconfig
+
+%description
+This is a library that defines common error values for all GnuPG
+components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+pinentry, SmartCard Daemon and possibly more in the future.
+
+%package devel
+Summary: Development files for the %{name} package
+Group: contrib
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This is a library that defines common error values for all GnuPG
+components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+pinentry, SmartCard Daemon and possibly more in the future. This package
+contains files necessary to develop applications using libgpg-error.
+
+%prep
+%setup -q
+
+%build
+%configure
+%make
+
+%install
+%makeinstall
+
+%find_lang %{name}
+
+%clean
+%clean_buildroot
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc COPYING COPYING.LIB AUTHORS README INSTALL NEWS ChangeLog
+%{_bindir}/gpg-error
+%{_libdir}/libgpg-error.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_bindir}/gpg-error-config
+%{_libdir}/libgpg-error.so
+%{_libdir}/libgpg-error.*a
+%{_includedir}/gpg-error.h
+%{_datadir}/aclocal/gpg-error.m4
+
+%changelog
+* Mon Apr 18 2005 Gerald Dachs <gda at tinysofa dot org> 1.0-1gd
+- new in tinysofa contrib
+
+* Tue Aug 31 2004 Bill Nottingham <notting at redhat.com> - 1.0-1
+- update to 1.0
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Apr 16 2004 Bill Nottingham <notting at redhat.com> - 0.7-1
+- adapt upstream specfile



From svn at tinysofa.org  Tue Apr 19 17:01:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Apr 2005 13:01:44 -0400 (EDT)
Subject: [tinysofa-svn] r6268 - in contrib/classic/2.0/gpgme/current:
	sources specs
Message-ID: <20050419170144.5F02E3448DC@minbar.tinysofa.org>

Author: gda
Date: 2005-04-19 13:01:18 -0400 (Tue, 19 Apr 2005)
New Revision: 6268

Added:
   contrib/classic/2.0/gpgme/current/sources/gpgme-0.9.0.tar.gz
Removed:
   contrib/classic/2.0/gpgme/current/sources/gpgme-0.3.16.tar.gz
Modified:
   contrib/classic/2.0/gpgme/current/specs/gpgme.spec
Log:
0.9.0

Deleted: contrib/classic/2.0/gpgme/current/sources/gpgme-0.3.16.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/gpgme/current/sources/gpgme-0.9.0.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/gpgme/current/sources/gpgme-0.9.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/gpgme/current/specs/gpgme.spec
===================================================================
--- contrib/classic/2.0/gpgme/current/specs/gpgme.spec	2005-04-19 16:15:52 UTC (rev 6267)
+++ contrib/classic/2.0/gpgme/current/specs/gpgme.spec	2005-04-19 17:01:18 UTC (rev 6268)
@@ -1,28 +1,36 @@
 # This is a template.  The dist target uses it to create the real file.
 Summary: GPGME - GnuPG Made Easy
 Name: gpgme
-Version: 0.3.16
-Release: 2gd
+Version: 0.9.0
+Release: 1gd
 URL: http://www.gnupg.org/gpgme.html
 Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz
 Group: contrib
 Copyright: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}
-BuildRequires: gnupg
+BuildRequires: gnupg libgpg-error-devel gcc-c++
 Prereq: /sbin/ldconfig
-Requires: gnupg
+Requires: gnupg libgpg-error
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier
 for applications. It provides a High-Level Crypto API for encryption,
 decryption, signing, signature verification and key management.
 
+%package devel
+Summary: Development files for the %{name} package
+Group: contrib
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains files necessary to develop applications using %{name}
+
 %prep
 %setup -q
 
 %build
-%configure --prefix=/usr
-make
+%configure --prefix=/usr --enable-static
+%make
 
 %install
 %makeinstall infodir=$RPM_BUILD_ROOT%{_infodir}
@@ -39,15 +47,21 @@
 %files
 %defattr(-,root,root)
 %doc COPYING AUTHORS README INSTALL NEWS ChangeLog TODO THANKS
+%attr(0755,root,root) %{_libdir}/*gpgme*.so*
+%{_infodir}/gpgme.info*
+
+%files devel
+%defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/gpgme-config
-%attr(0755,root,root) %{_libdir}/*gpgme.so*
-%attr(0755,root,root) %{_libdir}/*gpgme.la
-%attr(0644,root,root) %{_libdir}/*gpgme.a
+%attr(0755,root,root) %{_libdir}/*gpgme*.la
+%attr(0644,root,root) %{_libdir}/*gpgme*.a
 %{_includedir}/gpgme.h
 %{_datadir}/aclocal/gpgme.m4
-%{_infodir}/gpgme.info*
 
 %changelog
+* Mon Apr 18 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.0-1gd
+- 0.9.0
+
 * Wed Sep 29 2004 Gerald Dachs <gda at tinysofa dot org> 0.3.16-2gd
 - fixed buildrequirements
 



From svn at tinysofa.org  Tue Apr 19 17:13:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 19 Apr 2005 13:13:12 -0400 (EDT)
Subject: [tinysofa-svn] r6269 - in contrib/classic/2.0/sylpheed/current:
	sources specs
Message-ID: <20050419171312.6151A3448FE@minbar.tinysofa.org>

Author: gda
Date: 2005-04-19 13:12:13 -0400 (Tue, 19 Apr 2005)
New Revision: 6269

Added:
   contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.9.9.tar.bz2
Removed:
   contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.0.4.tar.bz2
Modified:
   contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec
Log:
1.9.9

Deleted: contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.0.4.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.9.9.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.9.9.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec
===================================================================
--- contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec	2005-04-19 17:01:18 UTC (rev 6268)
+++ contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec	2005-04-19 17:12:13 UTC (rev 6269)
@@ -1,19 +1,18 @@
 Summary: a GTK+ based, lightweight, and fast e-mail client
 Name: sylpheed
 Epoch: 1
-Version: 1.0.4
+Version: 1.9.9
 Release: 1gd
 Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Copyright: GPL
 URL: http://sylpheed.good-day.net/
-Requires: gtk+ >= 1.2.6
 Group: contrib
 Buildroot: %{_tmppath}/%{name}-root
-BuildRequires: xorg-x11-devel gtk12+-devel imlib-devel gcc-c++
-BuildRequires: openldap-devel openssl-devel gpgme compface-devel
-BuildRequires: glib12-devel
-Requires: xorg-x11-libs gtk+ >= 1.2.6 gtk12+-devel >= 1.2.6 imlib
-Requires: openldap-libs openssl gpgme compface glib12
+BuildRequires: xorg-x11-devel gtk-devel imlib-devel gcc-c++
+BuildRequires: openldap-devel openssl-devel gpgme-devel >= 0.4.5 compface-devel
+BuildRequires: glib-devel
+Requires: xorg-x11-libs gtk gtk-devel imlib
+Requires: openldap-libs openssl gpgme >= 0.4.5 compface glib
 
 %description
 Sylpheed is an e-mail client (and news reader) based on GTK+, running on
@@ -50,13 +49,16 @@
 
 %files
 %defattr(-,root,root,755)
-%doc COPYING ChangeLog ChangeLog.jp README README.jp INSTALL INSTALL.jp TODO.jp
+%doc COPYING ChangeLog README INSTALL
 %{_bindir}/%{name}
 %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Apr 19 2005 Gerald Dachs <gda at tinysofa dot org> 1.9.9-1gd
+- 1.9.9
+
 * Thu Mar 24 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.4-1gd
 - 1.0.4
 



From svn at tinysofa.org  Fri Apr 22 05:38:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 22 Apr 2005 01:38:26 -0400 (EDT)
Subject: [tinysofa-svn] r6270 -
	tinysofa/releases/classic/2.0/words/current/specs
Message-ID: <20050422053826.F2FC23448F7@minbar.tinysofa.org>

Author: jh
Date: 2005-04-22 01:38:20 -0400 (Fri, 22 Apr 2005)
New Revision: 6270

Modified:
   tinysofa/releases/classic/2.0/words/current/specs/words.spec
Log:
- fix directory name in description


Modified: tinysofa/releases/classic/2.0/words/current/specs/words.spec
===================================================================
--- tinysofa/releases/classic/2.0/words/current/specs/words.spec	2005-04-19 17:12:13 UTC (rev 6269)
+++ tinysofa/releases/classic/2.0/words/current/specs/words.spec	2005-04-22 05:38:20 UTC (rev 6270)
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
-The words file is a dictionary of English words for the /usr/dict
+The words file is a dictionary of English words for the %{_datadir}/dict
 directory.  Programs like ispell use this database of words to check
 spelling.
 



From svn at tinysofa.org  Sun Apr 24 12:26:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 24 Apr 2005 08:26:59 -0400 (EDT)
Subject: [tinysofa-svn] r6271 - in contrib/classic/2.0: . mod_auth_external
	mod_auth_external/current mod_auth_external/current/sources
	mod_auth_external/current/specs
Message-ID: <20050424122659.16410344B75@minbar.tinysofa.org>

Author: gda
Date: 2005-04-24 08:26:44 -0400 (Sun, 24 Apr 2005)
New Revision: 6271

Added:
   contrib/classic/2.0/mod_auth_external/
   contrib/classic/2.0/mod_auth_external/current/
   contrib/classic/2.0/mod_auth_external/current/sources/
   contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-config.patch
   contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-pam.patch
   contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.9.tar.gz
   contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external.conf
   contrib/classic/2.0/mod_auth_external/current/sources/pwauth-2.2.8.tar.gz
   contrib/classic/2.0/mod_auth_external/current/sources/pwauth.pam
   contrib/classic/2.0/mod_auth_external/current/specs/
   contrib/classic/2.0/mod_auth_external/current/specs/mod_auth_external.spec
   contrib/classic/2.0/mod_auth_external/pristine/
   contrib/classic/2.0/mod_auth_external/releases/
Log:
2.2.9

Added: contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-config.patch
===================================================================
--- contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-config.patch	2005-04-22 05:38:20 UTC (rev 6270)
+++ contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-config.patch	2005-04-24 12:26:44 UTC (rev 6271)
@@ -0,0 +1,54 @@
+--- mod_auth_external-2.2.7/pwauth/config.h.orig	2004-06-29 16:38:20.000000000 +0200
++++ mod_auth_external-2.2.7/pwauth/config.h	2004-06-29 16:41:43.000000000 +0200
+@@ -92,11 +92,11 @@
+ 
+ /* #define SHADOW_NONE		/**/
+ /* #define SHADOW_BSD		/**/
+-#define SHADOW_SUN		/**/
++/* #define SHADOW_SUN		/**/
+ /* #define SHADOW_JFH		/**/
+ /* #define SHADOW_MDW		/**/
+ /* #define SHADOW_AIX		/**/
+-/* #define PAM			/**/
++#define PAM			/**/
+ /* #define PAM_SOLARIS_26	/**/
+ 
+ 
+@@ -130,8 +130,8 @@
+  * via the web.  If you have the lastlog.h header file, define HAVE_LASTLOG_H.
+  */
+ 
+-#define UNIX_LASTLOG		/**/
+-#define HAVE_LASTLOG_H		/**/
++/* #define UNIX_LASTLOG		/**/
++/* #define HAVE_LASTLOG_H		/**/
+ 
+ /* SERVER_UIDS is a list of the uid numbers of the accounts that may run
+  * pwauth.  Normally this would just be the uid that your httpd is configured
+@@ -145,7 +145,7 @@
+  * last).
+  */
+ 
+-#define SERVER_UIDS 99		/* user "nobody" */
++/* #define SERVER_UIDS 99		/* user "nobody" */
+ 
+ 
+ /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than
+@@ -156,7 +156,7 @@
+  * given value will be accepted).
+  */
+ 
+-#define MIN_UNIX_UID 500	/**/
++/* #define MIN_UNIX_UID 500	/**/
+ 
+ 
+ /* If IGNORE_CASE is defined, the login given is checked in two different
+@@ -184,7 +184,7 @@
+  * SLEEP_LOCK.  SLEEP_TIME defaults to 2 seconds if not defined.
+  */
+ 
+-#define SLEEP_LOCK "/var/run/pwauth.lock"
++/* #define SLEEP_LOCK "/var/run/pwauth.lock"
+ 
+ 
+ /* If ENV_METHOD is defined, pwauth expects mod_auth_external to be configured

Added: contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-pam.patch
===================================================================
--- contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-pam.patch	2005-04-22 05:38:20 UTC (rev 6270)
+++ contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.7-pam.patch	2005-04-24 12:26:44 UTC (rev 6271)
@@ -0,0 +1,38 @@
+--- mod_auth_external-2.2.7/pwauth/pwauth.c.orig	2004-06-29 17:17:59.000000000 +0200
++++ mod_auth_external-2.2.7/pwauth/pwauth.c	2004-06-29 17:20:25.000000000 +0200
+@@ -653,8 +643,10 @@
+ #endif
+ }
+ 
++#ifdef SERVER_UIDS
+ /* Array of uid numbers that may run this program */
+ int server_uids[]= {SERVER_UIDS, 0};
++#endif
+ 
+ main(int argc, char **argv)
+ {
+@@ -664,7 +656,9 @@
+ char login[BFSZ+1], passwd[BFSZ+1];
+ char *c, *strchr();
+ #endif
++#ifdef SERVER_UIDS
+ int uid,i;
++#endif
+ int passwd_ok;
+ struct rlimit rlim;
+ 
+@@ -672,12 +666,14 @@
+ 	rlim.rlim_cur = rlim.rlim_max = 0;
+ 	(void)setrlimit(RLIMIT_CORE, &rlim);
+ 
++#ifdef SERVER_UIDS
+ 	/* Check that we were invoked by one of the listed uids or by root */
+ 	uid= getuid();
+ 	for (i= 0; server_uids[i] != 0 && server_uids[i] != uid; i++)
+ 	    ;
+ 	if (uid != server_uids[i])
+ 	    exit(2);
++#endif
+ 
+ 	/* Get the arguments (login and password) */
+ #ifdef ENV_METHOD

Added: contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.9.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external-2.2.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external.conf
===================================================================
--- contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external.conf	2005-04-22 05:38:20 UTC (rev 6270)
+++ contrib/classic/2.0/mod_auth_external/current/sources/mod_auth_external.conf	2005-04-24 12:26:44 UTC (rev 6271)
@@ -0,0 +1,37 @@
+LoadModule external_auth_module        /usr/lib/httpd/modules/mod_auth_external.so
+
+AddExternalAuth  pwauth /usr/lib/httpd/modules/pwauth
+SetExternalAuthMethod  pwauth pipe
+
+# For external group check
+# AddExternalGroup unixgroup /usr/lib/apache/unixgroup
+# SetExternalGroupMethod  unixgroup environment
+
+
+#  Put an .htaccess file in whatever directory you want to protect.
+#	(For .htaccess files to work, you may need to change some
+#      "AllowOverride None" directives in your httpd.conf file into
+#      "AllowOverride AuthConfig" directives).
+#
+#      A typical .htaccess file would look like:
+#
+#     AuthName Your-Site-Name
+#     AuthType Basic
+#  	  AuthExternal pwauth
+#  		   require valid-user
+# or 
+# 					 require user1
+#
+#	    GroupExternal unixgroup
+#   	  AuthGroupFile /dev/null
+#     	require group <groupname1> <groupname2> ...
+#
+#      Alternately, you can put a <Directory> block with the same directives
+#      in your httpd.conf file.
+#
+# Note1:	Using group method, don't forget to add users in the authorized group
+# group files
+# somegroup:x:500:user1,user2,user3
+#
+# 
+# - samples from pwauth/INSTALL 

Added: contrib/classic/2.0/mod_auth_external/current/sources/pwauth-2.2.8.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/mod_auth_external/current/sources/pwauth-2.2.8.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/mod_auth_external/current/sources/pwauth.pam
===================================================================
--- contrib/classic/2.0/mod_auth_external/current/sources/pwauth.pam	2005-04-22 05:38:20 UTC (rev 6270)
+++ contrib/classic/2.0/mod_auth_external/current/sources/pwauth.pam	2005-04-24 12:26:44 UTC (rev 6271)
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth       required	/lib/security/pam_stack.so service=system-auth
+auth       required	/lib/security/pam_nologin.so
+account    required	/lib/security/pam_stack.so service=system-auth
+password   required	/lib/security/pam_stack.so service=system-auth
+session    required	/lib/security/pam_stack.so service=system-auth
+session    optional     /lib/security/pam_console.so

Added: contrib/classic/2.0/mod_auth_external/current/specs/mod_auth_external.spec
===================================================================
--- contrib/classic/2.0/mod_auth_external/current/specs/mod_auth_external.spec	2005-04-22 05:38:20 UTC (rev 6270)
+++ contrib/classic/2.0/mod_auth_external/current/specs/mod_auth_external.spec	2005-04-24 12:26:44 UTC (rev 6271)
@@ -0,0 +1,80 @@
+%define pwauth_version 2.2.8
+
+Summary: Apache authentication using external program
+Name: mod_auth_external
+Version: 2.2.9
+Release: 1gd
+Group: contrib
+Copyright: The Apache Group
+Source: mod_auth_external-%{version}.tar.gz
+Source1: mod_auth_external.conf
+Source2: pwauth.pam
+Source3: pwauth-%{pwauth_version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+URL: http://www.unixpapa.com/mod_auth_external.html
+Patch0: mod_auth_external-2.2.7-pam.patch
+Patch1: mod_auth_external-2.2.7-config.patch
+BuildRequires: httpd-devel pam-devel pcre-devel
+Requires: httpd pam pcre
+
+%description
+Apache external authentication module - uses PAM.
+
+%prep
+%setup -q -a 3
+(cd pwauth-%{pwauth_version}
+%patch0 -p2 -b .pam
+%patch1 -p2 -b .orig
+)
+
+%build
+/usr/sbin/apxs -c -I /usr/include/pcre mod_auth_external.c
+(cd pwauth-%{pwauth_version}
+cc -o pwauth pwauth.c -lpam -ldl
+)
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+mkdir -p ${RPM_BUILD_ROOT}/usr/doc/mod_auth_external-%{version}
+mkdir -p ${RPM_BUILD_ROOT}/usr/lib/httpd/modules
+mkdir -p ${RPM_BUILD_ROOT}/etc/pam.d
+mkdir -p ${RPM_BUILD_ROOT}/etc/httpd/conf.d
+install -s .libs/mod_auth_external.so ${RPM_BUILD_ROOT}/usr/lib/httpd/modules
+install -s pwauth-%{pwauth_version}/pwauth ${RPM_BUILD_ROOT}/usr/lib/httpd/modules
+install -m 644 %{SOURCE1} %{buildroot}/etc/httpd/conf.d/
+
+# for PAM Auth
+install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/pwauth
+cp pwauth/README README.pwauth
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc INSTALL README README.pwauth
+%config(noreplace) /etc/httpd/conf.d/mod_auth_external.conf
+%attr(04550,root,httpd) /usr/lib/httpd/modules/pwauth
+%attr(0555,root,root) /usr/lib/httpd/modules/mod_auth_external.so
+%attr(0644,root,root) %config(noreplace)  /etc/pam.d/pwauth
+
+%changelog
+* Sun Apr 24 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.9-1gd
+- 2.2.9
+
+* Sun Apr 24 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.8-3gd
+- fixes for tcs 2.0
+
+* Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 2.2.8-2gd
+- current (2.2.8-2gd) integrated as 2.2.8-2gd
+
+* Fri Aug 20 2004 Gerald Dachs <gda at tinysofa dot org> 2.2.8-2gd
+- fixed requirements
+
+* Sun Aug 08 2004 Gerald Dachs <gda at tinysofa dot org> 2.2.8-1gd
+- new upstream version
+- fixed path for httpd modules
+
+* Tue Jun 29 2004 Gerald Dachs <gda at tinysofa dot org> 2.2.7-1gd
+- new for tinysofa contrib
+



From svn at tinysofa.org  Thu Apr 28 11:04:40 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 28 Apr 2005 07:04:40 -0400 (EDT)
Subject: [tinysofa-svn] r6273 - contrib/classic/2.0/libidl/current/specs
Message-ID: <20050428110440.F1C8134494D@minbar.tinysofa.org>

Author: jh
Date: 2005-04-28 07:04:34 -0400 (Thu, 28 Apr 2005)
New Revision: 6273

Modified:
   contrib/classic/2.0/libidl/current/specs/libidl.spec
Log:
- add missing %%defattr to -devel

Modified: contrib/classic/2.0/libidl/current/specs/libidl.spec
===================================================================
--- contrib/classic/2.0/libidl/current/specs/libidl.spec	2005-04-25 07:22:30 UTC (rev 6272)
+++ contrib/classic/2.0/libidl/current/specs/libidl.spec	2005-04-28 11:04:34 UTC (rev 6273)
@@ -65,6 +65,7 @@
 %{_libdir}/*.so.*
 
 %files devel
+%defattr(-,root,root)
 %{_bindir}/libIDL-config-2
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libIDL-2.0.pc
@@ -72,6 +73,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Apr 28 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- add missing %%defattr to -devel
+
 * Sun Apr 17 2005 Gerald Dachs <gda at tinysofa dot org> 0.8.5-1gd
 - 0.8.5