From svn at tinysofa.org  Mon May  2 07:07:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  2 May 2005 03:07:22 -0400 (EDT)
Subject: [tinysofa-svn] r6276 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050502070722.172FA344C27@minbar.tinysofa.org>

Author: jh
Date: 2005-05-02 03:05:56 -0400 (Mon, 02 May 2005)
New Revision: 6276

Added:
   contrib/classic/2.0/clamav/current/sources/clamav-0.84.tar.gz
Removed:
   contrib/classic/2.0/clamav/current/sources/clamav-0.83.tar.gz
Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
- 0.84

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

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


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

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-01 19:21:45 UTC (rev 6275)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-02 07:05:56 UTC (rev 6276)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.83
-Release: 1gd
+Version: 0.84
+Release: 1jh
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-1jh
+- 0.84
+
 * Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 0.83-1gd
 - New upstream
 



From svn at tinysofa.org  Mon May  2 07:45:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  2 May 2005 03:45:07 -0400 (EDT)
Subject: [tinysofa-svn] r6277 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050502074507.3C753344B5F@minbar.tinysofa.org>

Author: jh
Date: 2005-05-02 03:44:56 -0400 (Mon, 02 May 2005)
New Revision: 6277

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.8.patch
Removed:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.0-tinysofa-as-default.patch
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.8-tinysofa-reiserfs-xattr-lock.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- add 2.6.11.8.patch

Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.8.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.8.patch	2005-05-02 07:05:56 UTC (rev 6276)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.8.patch	2005-05-02 07:44:56 UTC (rev 6277)
@@ -0,0 +1,246 @@
+diff -Nru a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
+--- a/arch/sparc/kernel/ptrace.c	2005-04-29 18:34:37 -07:00
++++ b/arch/sparc/kernel/ptrace.c	2005-04-29 18:34:37 -07:00
+@@ -531,18 +531,6 @@
+ 			pt_error_return(regs, EIO);
+ 			goto out_tsk;
+ 		}
+-		if (addr != 1) {
+-			if (addr & 3) {
+-				pt_error_return(regs, EINVAL);
+-				goto out_tsk;
+-			}
+-#ifdef DEBUG_PTRACE
+-			printk ("Original: %08lx %08lx\n", child->thread.kregs->pc, child->thread.kregs->npc);
+-			printk ("Continuing with %08lx %08lx\n", addr, addr+4);
+-#endif
+-			child->thread.kregs->pc = addr;
+-			child->thread.kregs->npc = addr + 4;
+-		}
+ 
+ 		if (request == PTRACE_SYSCALL)
+ 			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+diff -Nru a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
+--- a/arch/sparc64/kernel/ptrace.c	2005-04-29 18:34:37 -07:00
++++ b/arch/sparc64/kernel/ptrace.c	2005-04-29 18:34:37 -07:00
+@@ -514,25 +514,6 @@
+ 			pt_error_return(regs, EIO);
+ 			goto out_tsk;
+ 		}
+-		if (addr != 1) {
+-			unsigned long pc_mask = ~0UL;
+-
+-			if ((child->thread_info->flags & _TIF_32BIT) != 0)
+-				pc_mask = 0xffffffff;
+-
+-			if (addr & 3) {
+-				pt_error_return(regs, EINVAL);
+-				goto out_tsk;
+-			}
+-#ifdef DEBUG_PTRACE
+-			printk ("Original: %016lx %016lx\n",
+-				child->thread_info->kregs->tpc,
+-				child->thread_info->kregs->tnpc);
+-			printk ("Continuing with %016lx %016lx\n", addr, addr+4);
+-#endif
+-			child->thread_info->kregs->tpc = (addr & pc_mask);
+-			child->thread_info->kregs->tnpc = ((addr + 4) & pc_mask);
+-		}
+ 
+ 		if (request == PTRACE_SYSCALL) {
+ 			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+diff -Nru a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
+--- a/arch/sparc64/kernel/signal32.c	2005-04-29 18:34:37 -07:00
++++ b/arch/sparc64/kernel/signal32.c	2005-04-29 18:34:38 -07:00
+@@ -192,9 +192,12 @@
+ 			err |= __put_user(from->si_uid, &to->si_uid);
+ 			break;
+ 		case __SI_FAULT >> 16:
+-		case __SI_POLL >> 16:
+ 			err |= __put_user(from->si_trapno, &to->si_trapno);
+ 			err |= __put_user((unsigned long)from->si_addr, &to->si_addr);
++			break;
++		case __SI_POLL >> 16:
++			err |= __put_user(from->si_band, &to->si_band);
++			err |= __put_user(from->si_fd, &to->si_fd);
+ 			break;
+ 		case __SI_RT >> 16: /* This is not generated by the kernel as of now.  */
+ 		case __SI_MESGQ >> 16:
+diff -Nru a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
+--- a/arch/sparc64/kernel/systbls.S	2005-04-29 18:34:37 -07:00
++++ b/arch/sparc64/kernel/systbls.S	2005-04-29 18:34:37 -07:00
+@@ -75,7 +75,7 @@
+ /*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
+ 	.word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
+ /*270*/	.word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
+-	.word sys_mq_timedsend, sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
++	.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
+ /*280*/	.word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
+ 
+ #endif /* CONFIG_COMPAT */
+diff -Nru a/arch/um/include/sysdep-i386/syscalls.h b/arch/um/include/sysdep-i386/syscalls.h
+--- a/arch/um/include/sysdep-i386/syscalls.h	2005-04-29 18:34:37 -07:00
++++ b/arch/um/include/sysdep-i386/syscalls.h	2005-04-29 18:34:37 -07:00
+@@ -23,6 +23,9 @@
+ 		      unsigned long prot, unsigned long flags,
+ 		      unsigned long fd, unsigned long pgoff);
+ 
++/* On i386 they choose a meaningless naming.*/
++#define __NR_kexec_load __NR_sys_kexec_load
++
+ #define ARCH_SYSCALLS \
+ 	[ __NR_waitpid ] = (syscall_handler_t *) sys_waitpid, \
+ 	[ __NR_break ] = (syscall_handler_t *) sys_ni_syscall, \
+@@ -101,15 +104,12 @@
+ 	[ 223 ] = (syscall_handler_t *) sys_ni_syscall, \
+ 	[ __NR_set_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
+ 	[ __NR_get_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
+-	[ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64, \
+ 	[ 251 ] = (syscall_handler_t *) sys_ni_syscall, \
+-        [ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages, \
+-	[ __NR_utimes ] = (syscall_handler_t *) sys_utimes, \
+-	[ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall,
+-        
++	[ 285 ] = (syscall_handler_t *) sys_ni_syscall,
++
+ /* 222 doesn't yet have a name in include/asm-i386/unistd.h */
+ 
+-#define LAST_ARCH_SYSCALL __NR_vserver
++#define LAST_ARCH_SYSCALL 285
+ 
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+diff -Nru a/arch/um/include/sysdep-x86_64/syscalls.h b/arch/um/include/sysdep-x86_64/syscalls.h
+--- a/arch/um/include/sysdep-x86_64/syscalls.h	2005-04-29 18:34:37 -07:00
++++ b/arch/um/include/sysdep-x86_64/syscalls.h	2005-04-29 18:34:37 -07:00
+@@ -71,12 +71,7 @@
+ 	[ __NR_iopl ] = (syscall_handler_t *) sys_ni_syscall, \
+ 	[ __NR_set_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
+ 	[ __NR_get_thread_area ] = (syscall_handler_t *) sys_ni_syscall, \
+-        [ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages, \
+ 	[ __NR_semtimedop ] = (syscall_handler_t *) sys_semtimedop, \
+-	[ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64, \
+-	[ 223 ] = (syscall_handler_t *) sys_ni_syscall, \
+-	[ __NR_utimes ] = (syscall_handler_t *) sys_utimes, \
+-	[ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall, \
+ 	[ 251 ] = (syscall_handler_t *) sys_ni_syscall,
+ 
+ #define LAST_ARCH_SYSCALL 251
+diff -Nru a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
+--- a/arch/um/kernel/sys_call_table.c	2005-04-29 18:34:37 -07:00
++++ b/arch/um/kernel/sys_call_table.c	2005-04-29 18:34:37 -07:00
+@@ -48,7 +48,6 @@
+ extern syscall_handler_t old_select;
+ extern syscall_handler_t sys_modify_ldt;
+ extern syscall_handler_t sys_rt_sigsuspend;
+-extern syscall_handler_t sys_vserver;
+ extern syscall_handler_t sys_mbind;
+ extern syscall_handler_t sys_get_mempolicy;
+ extern syscall_handler_t sys_set_mempolicy;
+@@ -242,6 +241,7 @@
+ 	[ __NR_epoll_create ] = (syscall_handler_t *) sys_epoll_create,
+ 	[ __NR_epoll_ctl ] = (syscall_handler_t *) sys_epoll_ctl,
+ 	[ __NR_epoll_wait ] = (syscall_handler_t *) sys_epoll_wait,
++	[ __NR_remap_file_pages ] = (syscall_handler_t *) sys_remap_file_pages,
+         [ __NR_set_tid_address ] = (syscall_handler_t *) sys_set_tid_address,
+ 	[ __NR_timer_create ] = (syscall_handler_t *) sys_timer_create,
+ 	[ __NR_timer_settime ] = (syscall_handler_t *) sys_timer_settime,
+@@ -252,12 +252,10 @@
+ 	[ __NR_clock_gettime ] = (syscall_handler_t *) sys_clock_gettime,
+ 	[ __NR_clock_getres ] = (syscall_handler_t *) sys_clock_getres,
+ 	[ __NR_clock_nanosleep ] = (syscall_handler_t *) sys_clock_nanosleep,
+-	[ __NR_statfs64 ] = (syscall_handler_t *) sys_statfs64,
+-	[ __NR_fstatfs64 ] = (syscall_handler_t *) sys_fstatfs64,
+ 	[ __NR_tgkill ] = (syscall_handler_t *) sys_tgkill,
+ 	[ __NR_utimes ] = (syscall_handler_t *) sys_utimes,
+-	[ __NR_fadvise64_64 ] = (syscall_handler_t *) sys_fadvise64_64,
+-	[ __NR_vserver ] = (syscall_handler_t *) sys_vserver,
++	[ __NR_fadvise64 ] = (syscall_handler_t *) sys_fadvise64,
++	[ __NR_vserver ] = (syscall_handler_t *) sys_ni_syscall,
+ 	[ __NR_mbind ] = (syscall_handler_t *) sys_mbind,
+ 	[ __NR_get_mempolicy ] = (syscall_handler_t *) sys_get_mempolicy,
+ 	[ __NR_set_mempolicy ] = (syscall_handler_t *) sys_set_mempolicy,
+@@ -267,9 +265,8 @@
+ 	[ __NR_mq_timedreceive ] = (syscall_handler_t *) sys_mq_timedreceive,
+ 	[ __NR_mq_notify ] = (syscall_handler_t *) sys_mq_notify,
+ 	[ __NR_mq_getsetattr ] = (syscall_handler_t *) sys_mq_getsetattr,
+-	[ __NR_sys_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
++	[ __NR_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
+ 	[ __NR_waitid ] = (syscall_handler_t *) sys_waitid,
+-	[ 285 ] = (syscall_handler_t *) sys_ni_syscall,
+ 	[ __NR_add_key ] = (syscall_handler_t *) sys_add_key,
+ 	[ __NR_request_key ] = (syscall_handler_t *) sys_request_key,
+ 	[ __NR_keyctl ] = (syscall_handler_t *) sys_keyctl,
+diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
+--- a/drivers/i2c/chips/it87.c	2005-04-29 18:34:37 -07:00
++++ b/drivers/i2c/chips/it87.c	2005-04-29 18:34:37 -07:00
+@@ -631,7 +631,7 @@
+ 	struct it87_data *data = it87_update_device(dev);
+ 	return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
+ }
+-static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
++static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+ 
+ static ssize_t
+ show_vrm_reg(struct device *dev, char *buf)
+diff -Nru a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
+--- a/drivers/i2c/chips/via686a.c	2005-04-29 18:34:37 -07:00
++++ b/drivers/i2c/chips/via686a.c	2005-04-29 18:34:37 -07:00
+@@ -554,7 +554,7 @@
+ 	struct via686a_data *data = via686a_update_device(dev);
+ 	return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
+ }
+-static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
++static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+ 
+ /* The driver. I choose to use type i2c_driver, as at is identical to both
+    smbus_driver and isa_driver, and clients could be of either kind */
+diff -Nru a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
+--- a/drivers/media/video/bttv-cards.c	2005-04-29 18:34:37 -07:00
++++ b/drivers/media/video/bttv-cards.c	2005-04-29 18:34:37 -07:00
+@@ -2718,8 +2718,6 @@
+         }
+ 	btv->pll.pll_current = -1;
+ 
+-	bttv_reset_audio(btv);
+-
+ 	/* tuner configuration (from card list / autodetect / insmod option) */
+  	if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
+ 		if(UNSET == btv->tuner_type)
+diff -Nru a/fs/partitions/msdos.c b/fs/partitions/msdos.c
+--- a/fs/partitions/msdos.c	2005-04-29 18:34:37 -07:00
++++ b/fs/partitions/msdos.c	2005-04-29 18:34:37 -07:00
+@@ -114,6 +114,9 @@
+ 		 */
+ 		for (i=0; i<4; i++, p++) {
+ 			u32 offs, size, next;
++
++			if (SYS_IND(p) == 0)
++				continue;
+ 			if (!NR_SECTS(p) || is_extended_partition(p))
+ 				continue;
+ 
+@@ -430,6 +433,8 @@
+ 	for (slot = 1 ; slot <= 4 ; slot++, p++) {
+ 		u32 start = START_SECT(p)*sector_size;
+ 		u32 size = NR_SECTS(p)*sector_size;
++		if (SYS_IND(p) == 0)
++			continue;
+ 		if (!size)
+ 			continue;
+ 		if (is_extended_partition(p)) {
+diff -Nru a/security/keys/key.c b/security/keys/key.c
+--- a/security/keys/key.c	2005-04-29 18:34:37 -07:00
++++ b/security/keys/key.c	2005-04-29 18:34:37 -07:00
+@@ -57,9 +57,10 @@
+ {
+ 	struct key_user *candidate = NULL, *user;
+ 	struct rb_node *parent = NULL;
+-	struct rb_node **p = &key_user_tree.rb_node;
++	struct rb_node **p;
+ 
+  try_again:
++	p = &key_user_tree.rb_node;
+ 	spin_lock(&key_user_lock);
+ 
+ 	/* search the tree for a user record with a matching UID */

Deleted: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.0-tinysofa-as-default.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.0-tinysofa-as-default.patch	2005-05-02 07:05:56 UTC (rev 6276)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.0-tinysofa-as-default.patch	2005-05-02 07:44:56 UTC (rev 6277)
@@ -1,19 +0,0 @@
-diff -urN linux-2.6.7/drivers/block/ll_rw_blk.c linux-2.6.7.tinysofa-as-default/drivers/block/ll_rw_blk.c
---- linux-2.6.7/drivers/block/ll_rw_blk.c	2004-07-19 16:18:51.000000000 +1000
-+++ linux-2.6.7.tinysofa-as-default/drivers/block/ll_rw_blk.c	2004-07-19 17:09:31.090693224 +1000
-@@ -1360,12 +1360,12 @@
- static int __make_request(request_queue_t *, struct bio *);
- 
- static elevator_t *chosen_elevator =
--#if defined(CONFIG_IOSCHED_CFQ)
--	&iosched_cfq;
--#elif defined(CONFIG_IOSCHED_AS)
-+#if defined(CONFIG_IOSCHED_AS)
- 	&iosched_as;
- #elif defined(CONFIG_IOSCHED_DEADLINE)
- 	&iosched_deadline;
-+#elif defined(CONFIG_IOSCHED_CFQ)
-+	&iosched_cfq;
- #elif defined(CONFIG_IOSCHED_NOOP)
- 	&elevator_noop;
- #else

Deleted: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.8-tinysofa-reiserfs-xattr-lock.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.8-tinysofa-reiserfs-xattr-lock.patch	2005-05-02 07:05:56 UTC (rev 6276)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.8-tinysofa-reiserfs-xattr-lock.patch	2005-05-02 07:44:56 UTC (rev 6277)
@@ -1,20 +0,0 @@
-diff -pur linux-2.6.7-rc2-orig/fs/reiserfs/xattr.c linux-2.6.7-rc2/fs/reiserfs/xattr.c
---- linux-2.6.7-rc2-orig/fs/reiserfs/xattr.c	2004-06-04 00:22:25.000000000 +0400
-+++ linux-2.6.7-rc2/fs/reiserfs/xattr.c	2004-06-04 10:13:00.000000000 +0400
-@@ -944,6 +944,16 @@ reiserfs_getxattr (struct dentry *dentry
- {
-     struct reiserfs_xattr_handler *xah = find_xattr_handler_prefix (name);
-     int err;
-+    struct dentry *dpar;
-+
-+    dpar = dget_parent(dentry);
-+    if (is_reiserfs_priv_object (dentry->d_inode) ||
-+        (dpar && is_reiserfs_priv_object (dpar->d_inode)))
-+    {
-+	    dput(dpar);
-+	    return -ENODATA;
-+    }
-+    dput(dpar);
- 
-     if (!xah || !reiserfs_xattrs(dentry->d_sb) ||
-         get_inode_sd_version (dentry->d_inode) == STAT_DATA_V1)

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-02 07:05:56 UTC (rev 6276)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-02 07:44:56 UTC (rev 6277)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 11jh
+Release: 12jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -85,7 +85,8 @@
 Patch4: 2.6.11.5.patch
 Patch5: 2.6.11.6.patch
 Patch6: 2.6.11.7.patch
-Patch7: acpi-20050309-2.6.11.diff
+Patch7: 2.6.11.8.patch
+Patch8: acpi-20050309-2.6.11.diff
 
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
@@ -233,6 +234,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %patch101 -p1 -b .epoll~
 %patch102 -p1 -b .compile~
@@ -590,6 +592,9 @@
 
 
 %changelog
+* Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-12jh
+- add 2.6.11.8.patch
+
 * Wed Mar 16 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-4jh
 - add security fixes from 2.6.11.4
 



From svn at tinysofa.org  Mon May  2 09:55:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  2 May 2005 05:55:39 -0400 (EDT)
Subject: [tinysofa-svn] r6278 - in
	tinysofa/releases/classic/2.0/tar/current: sources specs
Message-ID: <20050502095539.0F1A4344C55@minbar.tinysofa.org>

Author: jh
Date: 2005-05-02 05:55:16 -0400 (Mon, 02 May 2005)
New Revision: 6278

Added:
   tinysofa/releases/classic/2.0/tar/current/sources/bsdtar-1.02.023.tar.gz
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.023.tar.gz
Removed:
   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
Modified:
   tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.009-eilseq.patch
   tinysofa/releases/classic/2.0/tar/current/specs/tar.spec
Log:
- 1.02.023
- update eilseq patch
- don't install under /bin because it's anyway linked against libraries
- under /usr


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

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


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

Modified: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.009-eilseq.patch
===================================================================
--- tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.009-eilseq.patch	2005-05-02 07:44:56 UTC (rev 6277)
+++ tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.009-eilseq.patch	2005-05-02 09:55:16 UTC (rev 6278)
@@ -1,12 +1,13 @@
---- ./archive_platform.h.old	2005-02-23 07:28:31.000000000 +0200
-+++ ./archive_platform.h	2005-02-23 07:30:02.000000000 +0200
-@@ -121,8 +121,8 @@
+--- ./archive_platform.h.eilseq~	2005-04-18 09:35:33.000000000 +0300
++++ ./archive_platform.h	2005-04-22 08:52:59.000000000 +0300
+@@ -128,8 +128,9 @@
  #if HAVE_EFTYPE
  #define	ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
  #else
 -#if HAVE_EILSEQ
 -#define	ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
-+#if HAVE_ENOTSUP
++#include <errno.h>
++#ifdef ENOTSUP
 +#define	ARCHIVE_ERRNO_FILE_FORMAT ENOTSUP
  #else
  #define	ARCHIVE_ERRNO_FILE_FORMAT EINVAL

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

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


Property changes on: tinysofa/releases/classic/2.0/tar/current/sources/libarchive-1.02.023.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-05-02 07:44:56 UTC (rev 6277)
+++ tinysofa/releases/classic/2.0/tar/current/specs/tar.spec	2005-05-02 09:55:16 UTC (rev 6278)
@@ -1,9 +1,8 @@
-%define libarchive_version	1.02.019
-%define _bindir			/bin
+%define libarchive_version	1.02.023
 Summary: A BSD file archiving program
 Name: tar
 Epoch: 1
-Version: 1.02.019
+Version: 1.02.023
 Release: 1jh
 License: BSD
 Group: main
@@ -69,6 +68,12 @@
 
 
 %changelog
+* Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.023-1jh
+- 1.02.023
+- update eilseq patch
+- don't install under /bin because it's anyway linked against libraries
+- under /usr
+
 * Mon Apr 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.019-1jh
 - 1.02.019
 - ACL fixes integrated to upstream



From svn at tinysofa.org  Mon May  2 16:07:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  2 May 2005 12:07:30 -0400 (EDT)
Subject: [tinysofa-svn] r6279 - in
	tinysofa/releases/classic/2.0/tcpdump/current: sources specs
Message-ID: <20050502160730.29BE1344B6A@minbar.tinysofa.org>

Author: jh
Date: 2005-05-02 12:07:15 -0400 (Mon, 02 May 2005)
New Revision: 6279

Added:
   tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos.patch
   tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-isis-dos.patch
   tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-ldp-dos.patch
   tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-rsvp-dos.patch
Modified:
   tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec
Log:
- fix CAN-2005-1280 (multiple DoS)

Added: tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos.patch
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos.patch	2005-05-02 09:55:16 UTC (rev 6278)
+++ tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-bgp-dos.patch	2005-05-02 16:07:15 UTC (rev 6279)
@@ -0,0 +1,11 @@
+--- tcpdump-3.8.2/print-bgp.c.old	2004-03-24 01:01:00.000000000 +0100
++++ tcpdump-3.8.2/print-bgp.c	2005-04-28 12:47:12.000000000 +0200
+@@ -1089,7 +1089,7 @@
+ 			printf(", no SNPA");
+                 }
+ 
+-		while (len - (tptr - pptr) > 0) {
++		while ((tptr - pptr) > 0 &&  len - (tptr - pptr) > 0) {
+ 			switch (af) {
+ 			case AFNUM_INET:
+                             switch (safi) {

Added: tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-isis-dos.patch
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-isis-dos.patch	2005-05-02 09:55:16 UTC (rev 6278)
+++ tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-isis-dos.patch	2005-05-02 16:07:15 UTC (rev 6279)
@@ -0,0 +1,23 @@
+--- tcpdump-3.8.2/print-isoclns.c.old	2005-04-28 12:58:28.000000000 +0200
++++ tcpdump-3.8.2/print-isoclns.c	2005-04-28 13:07:17.000000000 +0200
+@@ -1748,12 +1748,14 @@
+ 	    lan_alen = *tptr++; /* LAN adress length */
+             tmp --;
+             printf("\n\t      LAN address length %u bytes ",lan_alen);
+-	    while (tmp >= lan_alen) {
+-                if (!TTEST2(*tptr, lan_alen))
+-                    goto trunctlv;
+-                printf("\n\t\tIS Neighbor: %s",isis_print_id(tptr,lan_alen));
+-                tmp -= lan_alen;
+-                tptr +=lan_alen;
++            if(lan_alen >= SYSTEM_ID_LEN) {
++	        while (tmp >= lan_alen) {
++                    if (!TTEST2(*tptr, lan_alen))
++                        goto trunctlv;
++                    printf("\n\t\tIS Neighbor: %s",isis_print_id(tptr,lan_alen));
++                    tmp -= lan_alen;
++                    tptr +=lan_alen;
++                }
+             }
+             break;
+ 

Added: tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-ldp-dos.patch
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-ldp-dos.patch	2005-05-02 09:55:16 UTC (rev 6278)
+++ tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-ldp-dos.patch	2005-05-02 16:07:15 UTC (rev 6279)
@@ -0,0 +1,39 @@
+--- tcpdump-3.8.2/print-ldp.c.t4	2003-11-16 10:36:27.000000000 +0100
++++ tcpdump-3.8.2/print-ldp.c	2005-04-28 14:17:15.000000000 +0200
+@@ -327,7 +327,8 @@
+                LDP_MASK_U_BIT(EXTRACT_16BITS(&ldp_msg_header->type)) ? "continue processing" : "ignore");
+ 
+         msg_tptr=tptr+sizeof(struct ldp_msg_header);
+-        msg_tlen=msg_len-sizeof(struct ldp_msg_header)+4; /* Type & Length fields not included */
++       /* Type & Length fields not included */
++        msg_tlen = (msg_len >= (sizeof(struct ldp_msg_header) + 4)) ? (msg_len - sizeof(struct ldp_msg_header) + 4) : 0;
+ 
+         /* did we capture enough for fully decoding the message ? */
+         if (!TTEST2(*tptr, msg_len))
+@@ -372,8 +373,12 @@
+             print_unknown_data(tptr+sizeof(sizeof(struct ldp_msg_header)),"\n\t  ",
+                                msg_len);
+ 
+-        tptr+=msg_len;
+-        tlen-=msg_len;
++        if(!msg_len)
++            break;
++        else {
++            tptr+=msg_len;
++            tlen-=msg_len;
++        }
+     }
+     return;
+ trunc:
+--- tcpdump-3.8.2/print-ascii.c.t4	2003-12-29 12:05:10.000000000 +0100
++++ tcpdump-3.8.2/print-ascii.c	2005-04-28 14:05:42.000000000 +0200
+@@ -142,6 +142,9 @@
+ 	register int nshorts;
+ 
+ 	nshorts = (u_int) length / sizeof(u_short);
++        if(!nshorts)
++          return;
++
+ 	i = 0;
+ 	while (--nshorts >= 0) {
+ 		if ((i++ % 8) == 0) {

Added: tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-rsvp-dos.patch
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-rsvp-dos.patch	2005-05-02 09:55:16 UTC (rev 6278)
+++ tinysofa/releases/classic/2.0/tcpdump/current/sources/tcpdump-3.8.2-rsvp-dos.patch	2005-05-02 16:07:15 UTC (rev 6279)
@@ -0,0 +1,31 @@
+--- tcpdump-3.8.2/print-rsvp.c.old	2004-03-24 05:00:38.000000000 +0100
++++ tcpdump-3.8.2/print-rsvp.c	2005-04-27 17:09:34.000000000 +0200
+@@ -872,6 +872,8 @@
+ 
+         case RSVP_OBJ_RRO:
+         case RSVP_OBJ_ERO:
++            {
++            int step;
+             switch(rsvp_obj_ctype) {
+             case RSVP_CTYPE_IPV4:
+                 while(obj_tlen >= 4 ) {
+@@ -889,15 +891,16 @@
+                                    "none",
+                                    *(obj_tptr+7))); /* rfc3209 says that this field is rsvd. */
+                     }
+-                    obj_tlen-=*(obj_tptr+1);
+-                    obj_tptr+=*(obj_tptr+1);
++                    step = *(obj_tptr+1) ? *(obj_tptr+1) : obj_tlen;
++                    obj_tlen -= step;
++                    obj_tptr += step;
+                 }
+                 break;
+             default:
+                 hexdump=TRUE;
+             }
+             break;
+-
++            }
+         case RSVP_OBJ_HELLO:
+             switch(rsvp_obj_ctype) {
+             case RSVP_CTYPE_1:

Modified: tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec
===================================================================
--- tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec	2005-05-02 09:55:16 UTC (rev 6278)
+++ tinysofa/releases/classic/2.0/tcpdump/current/specs/tcpdump.spec	2005-05-02 16:07:15 UTC (rev 6279)
@@ -1,12 +1,15 @@
 Summary: A network traffic monitoring tool.
 Name: tcpdump
 Version: 3.8.3
-Release: 4jh
+Release: 5jh
 License: BSD
 Group: main
 Source: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
+Patch0: tcpdump-3.8.2-bgp-dos.patch
+Patch1: tcpdump-3.8.2-isis-dos.patch
+Patch2: tcpdump-3.8.2-ldp-dos.patch
+Patch3: tcpdump-3.8.2-rsvp-dos.patch
 BuildRequires: libpcap-devel
-Conflicts: kernel < 2.2.20
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -20,6 +23,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -51,6 +58,9 @@
 
 
 %changelog
+* Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.8.3-5jh
+- fix CAN-2005-1280 (multiple DoS)
+
 * Sat Feb 12 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - ensure that libpcap is linked dynamically
 



From svn at tinysofa.org  Tue May  3 13:18:10 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 09:18:10 -0400 (EDT)
Subject: [tinysofa-svn] r6280 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050503131810.EB0E534426E@minbar.tinysofa.org>

Author: gda
Date: 2005-05-03 09:18:03 -0400 (Tue, 03 May 2005)
New Revision: 6280

Modified:
   contrib/classic/2.0/clamav/current/sources/freshclam.sh
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
fixed init script

Modified: contrib/classic/2.0/clamav/current/sources/freshclam.sh
===================================================================
--- contrib/classic/2.0/clamav/current/sources/freshclam.sh	2005-05-02 16:07:15 UTC (rev 6279)
+++ contrib/classic/2.0/clamav/current/sources/freshclam.sh	2005-05-03 13:18:03 UTC (rev 6280)
@@ -26,8 +26,7 @@
 prog=freshclam
 path=/usr/bin/freshclam
 
-ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on-
-error-execute=$ONERROR $FRESHOPTIONS"
+ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on- error-execute=$ONERROR $FRESHOPTIONS"
 
 if [ $HTTPPROXY ] ; then
    ALLOPTIONS=$ALLOPTIONS" --http-proxy=$HTTPPROXY --proxy-user=$PROXYUSER"

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-02 16:07:15 UTC (rev 6279)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-03 13:18:03 UTC (rev 6280)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
 Version: 0.84
-Release: 1jh
+Release: 2gd
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-2gd
+- fixed init script
+
 * Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-1jh
 - 0.84
 



From svn at tinysofa.org  Tue May  3 13:25:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 09:25:17 -0400 (EDT)
Subject: [tinysofa-svn] r6281 - contrib/classic/2.0/clamav/current/specs
Message-ID: <20050503132517.E939D3447ED@minbar.tinysofa.org>

Author: gda
Date: 2005-05-03 09:25:12 -0400 (Tue, 03 May 2005)
New Revision: 6281

Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
fixed changelog

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-03 13:18:03 UTC (rev 6280)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-03 13:25:12 UTC (rev 6281)
@@ -178,7 +178,7 @@
 
 
 %changelog
-* Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-2gd
+* Tue May  3 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-2gd
 - fixed init script
 
 * Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-1jh



From svn at tinysofa.org  Tue May  3 13:48:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 09:48:47 -0400 (EDT)
Subject: [tinysofa-svn] r6282 - in contrib/classic/2.0: . hotplug
	hotplug/current hotplug/current/sources hotplug/current/specs
Message-ID: <20050503134847.0BF2034483F@minbar.tinysofa.org>

Author: gda
Date: 2005-05-03 09:48:36 -0400 (Tue, 03 May 2005)
New Revision: 6282

Added:
   contrib/classic/2.0/hotplug/
   contrib/classic/2.0/hotplug/current/
   contrib/classic/2.0/hotplug/current/sources/
   contrib/classic/2.0/hotplug/current/sources/hotplug-2004_03_29.tar.gz
   contrib/classic/2.0/hotplug/current/sources/hotplug.init
   contrib/classic/2.0/hotplug/current/specs/
   contrib/classic/2.0/hotplug/current/specs/hotplug.spec
   contrib/classic/2.0/hotplug/pristine/
   contrib/classic/2.0/hotplug/releases/
Log:
new in 2.0

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


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

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

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



From svn at tinysofa.org  Tue May  3 14:06:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 10:06:47 -0400 (EDT)
Subject: [tinysofa-svn] r6283 - in contrib/classic/2.0: . imapd-pam
	imapd-pam/current imapd-pam/current/sources imapd-pam/current/specs
Message-ID: <20050503140647.06CF1344A57@minbar.tinysofa.org>

Author: gda
Date: 2005-05-03 10:06:40 -0400 (Tue, 03 May 2005)
New Revision: 6283

Added:
   contrib/classic/2.0/imapd-pam/
   contrib/classic/2.0/imapd-pam/current/
   contrib/classic/2.0/imapd-pam/current/sources/
   contrib/classic/2.0/imapd-pam/current/sources/imap.pamd
   contrib/classic/2.0/imapd-pam/current/specs/
   contrib/classic/2.0/imapd-pam/current/specs/imapd-pam.spec
   contrib/classic/2.0/imapd-pam/pristine/
   contrib/classic/2.0/imapd-pam/releases/
Log:
moved to tcs 2.0 contrib

Added: contrib/classic/2.0/imapd-pam/current/sources/imap.pamd
===================================================================
--- contrib/classic/2.0/imapd-pam/current/sources/imap.pamd	2005-05-03 13:48:36 UTC (rev 6282)
+++ contrib/classic/2.0/imapd-pam/current/sources/imap.pamd	2005-05-03 14:06:40 UTC (rev 6283)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       required     pam_stack.so service=system-auth
+account    required     pam_stack.so service=system-auth
+session    required     pam_mkhomedir.so skel=/etc/skel/ umask=0076
+

Added: contrib/classic/2.0/imapd-pam/current/specs/imapd-pam.spec
===================================================================
--- contrib/classic/2.0/imapd-pam/current/specs/imapd-pam.spec	2005-05-03 13:48:36 UTC (rev 6282)
+++ contrib/classic/2.0/imapd-pam/current/specs/imapd-pam.spec	2005-05-03 14:06:40 UTC (rev 6283)
@@ -0,0 +1,53 @@
+Summary: PAM for the different IMAP services
+Name: imapd-pam
+Version: 1.9.0
+Release: 10gd
+License: GPL
+Group: contrib
+Source0: imap.pamd
+Requires: imapd
+ExclusiveOs: Linux
+BuildRoot: %{_tmppath}/%{name}-root
+BuildArchitectures: noarch
+
+%description
+This is the PAM file for the different IMAP daemons.
+
+%prep
+
+%install
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pam.d/imap
+install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pam.d/pop
+install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pam.d/pop3
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%config(noreplace) /etc/pam.d/imap
+%config(noreplace) /etc/pam.d/pop
+%config(noreplace) /etc/pam.d/pop3
+
+%changelog
+* Tue May  3 2005 Gerald Dachs <gda at tinysofa dot org> 1.9.0-10gd
+- moved to tcs 2.0 contrib
+
+* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.9.0-9ts
+- current (1.9.0-8ts) integrated as 1.9.0-9ts for release 1.0-U1
+
+* Sat Dec  6 2003 Erlend Midttun <erlendbm at trustix dot org> 1.9.0-5tr
+- Big rebuild
+
+* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.9.0-4tr
+- Big rebuild
+
+* Mon Apr 12 2003 Erlend Midttun <erlendbm at trustix dot com> 1.9.0-3em
+- Added pop3 as courier-imap uses that.
+
+* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> -2em
+- Rebuilt against glibc 2.3.2.
+
+* Wed Nov 20 2002 Erlend Midttun <erlendbm at trustix dot com>
+- Initial release.



From svn at tinysofa.org  Tue May  3 16:55:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 12:55:34 -0400 (EDT)
Subject: [tinysofa-svn] r6284 -
	tinysofa/releases/classic/2.0/sysklogd/current/specs
Message-ID: <20050503165534.5B8E6344BC2@minbar.tinysofa.org>

Author: jh
Date: 2005-05-03 12:55:29 -0400 (Tue, 03 May 2005)
New Revision: 6284

Modified:
   tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec
Log:
- change owner of /var/log/cron to syslog

Modified: tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec
===================================================================
--- tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec	2005-05-03 14:06:40 UTC (rev 6283)
+++ tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec	2005-05-03 16:55:29 UTC (rev 6284)
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 39jh
+Release: 40jh
 License: GPL
 Group: main
 Source: sysklogd-%{version}rh.tar.gz
@@ -71,14 +71,13 @@
 %groupadd syslog 60
 %useradd syslog 60 syslog -d /var/log -s /bin/false
 %service_post -o syslog
-for n in /var/log/{messages,secure,maillog,spooler}; do
+for n in /var/log/{messages,secure,maillog,spooler,cron}; do
 	[ -f $n ] && continue
 	touch $n
 	%{__chmod} 640 $n
 	%{__chown} syslog.syslog $n
 done
 
-
 %preun
 %service_preun syslog
 
@@ -91,7 +90,12 @@
 fi
 %service_postun syslog
 
+%triggerpostun -- sysklogd < 1.4.1-40
+%{__chown} syslog.syslog /var/log/cron*
+%{__chmod} 640 /var/log/cron*
+%service_postun syslog
 
+
 %files
 %defattr(-,root,root)
 %doc ANNOUNCE CHANGES README* NEWS INSTALL redhat/ChangeLog
@@ -104,6 +108,9 @@
 
 
 %changelog
+* Tue May  3 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.4.1-40jh
+- change owner of /var/log/cron to syslog
+
 * Tue Jan 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.4.1-38jh
 - new Red Hat upstream
 



From svn at tinysofa.org  Tue May  3 17:07:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 13:07:00 -0400 (EDT)
Subject: [tinysofa-svn] r6285 -
	tinysofa/releases/classic/2.0/sysklogd/current/specs
Message-ID: <20050503170700.F3DC6344C1F@minbar.tinysofa.org>

Author: jh
Date: 2005-05-03 13:06:55 -0400 (Tue, 03 May 2005)
New Revision: 6285

Modified:
   tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec
Log:
- improve the new trigger script


Modified: tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec
===================================================================
--- tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec	2005-05-03 16:55:29 UTC (rev 6284)
+++ tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec	2005-05-03 17:06:55 UTC (rev 6285)
@@ -91,9 +91,10 @@
 %service_postun syslog
 
 %triggerpostun -- sysklogd < 1.4.1-40
-%{__chown} syslog.syslog /var/log/cron*
-%{__chmod} 640 /var/log/cron*
+%{__chown} syslog.syslog /var/log/cron* 2> /dev/null || :
+%{__chmod} 640 /var/log/cron* 2> /dev/null || :
 %service_postun syslog
+exit 0
 
 
 %files



From svn at tinysofa.org  Tue May  3 20:43:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  3 May 2005 16:43:15 -0400 (EDT)
Subject: [tinysofa-svn] r6286 - in
	tinysofa/releases/classic/2.0/wireless-tools/current: sources specs
Message-ID: <20050503204315.6E05D344C08@minbar.tinysofa.org>

Author: gda
Date: 2005-05-03 16:42:59 -0400 (Tue, 03 May 2005)
New Revision: 6286

Added:
   tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-27-makefile.patch
   tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless_tools.27.tar.gz
Removed:
   tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-26-makefile.patch
   tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless_tools.26.tar.gz
Modified:
   tinysofa/releases/classic/2.0/wireless-tools/current/specs/wireless-tools.spec
Log:
27

Deleted: tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-26-makefile.patch
===================================================================
--- tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-26-makefile.patch	2005-05-03 17:06:55 UTC (rev 6285)
+++ tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-26-makefile.patch	2005-05-03 20:42:59 UTC (rev 6286)
@@ -1,42 +0,0 @@
-diff -Nru wireless_tools.26.orig/Makefile wireless_tools.26/Makefile
---- wireless_tools.26.orig/Makefile	2003-06-18 01:38:58.000000000 +0000
-+++ wireless_tools.26/Makefile	2003-12-11 10:38:33.000000000 +0000
-@@ -5,7 +5,7 @@
- ## Installation directory. By default, go in /usr/local
- ## Distributions should probably use /usr, but they probably know better...
- ifndef PREFIX
--  PREFIX = /usr/local
-+  PREFIX = /usr
- endif
- 
- ## Compiler to use
-@@ -78,10 +78,10 @@
- 
- # Do we want to build with or without libm ?
- ifdef BUILD_NOLIBM
--  LIBS=
-+  LIBS=-L. -liw
-   WELIB_FLAG = -DWE_NOLIBM=y
- else
--  LIBS= -lm
-+  LIBS=-L. -liw -lm
- endif
- 
- #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror
-@@ -92,7 +92,7 @@
- all:: $(STATIC) $(DYNAMIC) $(PROGS)
- 
- %: %.o
--	$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $< $(LIBS)
- %.o: %.c
- 	$(CC) $(XCFLAGS) -c $<
- %.so: %.c
-@@ -117,6 +117,7 @@
- # Compilation of the dynamic library
- $(DYNAMIC): $(OBJS:.o=.so)
- 	$(CC) -shared -o $@ -Wl,-soname,$@ $(LIBS) -lc $^
-+	ln -s $@ $(DYNAMIC_LINK)
- 
- # Compilation of the static library
- $(STATIC): $(OBJS)

Added: tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-27-makefile.patch
===================================================================
--- tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-27-makefile.patch	2005-05-03 17:06:55 UTC (rev 6285)
+++ tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless-tools-27-makefile.patch	2005-05-03 20:42:59 UTC (rev 6286)
@@ -0,0 +1,28 @@
+--- wireless_tools.27/Makefile.orig	2004-10-12 00:16:15.000000000 +0200
++++ wireless_tools.27/Makefile	2005-05-03 19:59:47.000000000 +0200
+@@ -5,7 +5,7 @@
+ ## Installation directory. By default, go in /usr/local
+ ## Distributions should probably use /, but they probably know better...
+ ifndef PREFIX
+-  PREFIX = /usr/local
++  PREFIX = /usr
+ endif
+ 
+ ## Compiler to use (modify this for cross compile)
+@@ -92,7 +92,7 @@
+ all:: $(IWLIB) $(PROGS)
+ 
+ %: %.o
+-	$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $< $(IWLIB) $(LIBS)
+ %.o: %.c wireless.h
+ 	$(CC) $(XCFLAGS) -c $<
+ %.so: %.c wireless.h
+@@ -121,6 +121,7 @@
+ # Compilation of the dynamic library
+ $(DYNAMIC): $(OBJS:.o=.so)
+ 	$(CC) -shared -o $@ -Wl,-soname,$@ $(LIBS) -lc $^
++	ln -s $@ $(DYNAMIC_LINK)
+ 
+ # Compilation of the static library
+ $(STATIC): $(OBJS)

Deleted: tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless_tools.26.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/wireless-tools/current/sources/wireless_tools.27.tar.gz
===================================================================
(Binary files differ)


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

Modified: tinysofa/releases/classic/2.0/wireless-tools/current/specs/wireless-tools.spec
===================================================================
--- tinysofa/releases/classic/2.0/wireless-tools/current/specs/wireless-tools.spec	2005-05-03 17:06:55 UTC (rev 6285)
+++ tinysofa/releases/classic/2.0/wireless-tools/current/specs/wireless-tools.spec	2005-05-03 20:42:59 UTC (rev 6286)
@@ -2,11 +2,11 @@
 Group: main
 License: GPL
 Name: wireless-tools
-Version: 26
-Release: 6jh
+Version: 27
+Release: 1gd
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.%{version}.tar.gz
-Patch1: wireless-tools-26-makefile.patch
+Patch1: wireless-tools-27-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -23,7 +23,7 @@
 
 %build
 make clean
-%make CFLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1
+%make CFLAGS="$RPM_OPT_FLAGS -I." BUILD_SHARED=1 LDFLAGS="-L."
 
 
 %install
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Tue May  3 2005 Gerald Dachs <gda at tinysofa dot org> 27-1gd
+- 27
+
 * Sun Nov 28 2004 Jaakko Heinonen <jh at tinysofa dot org>
 - fix libiw.so symlink on multilib arches
 



From svn at tinysofa.org  Wed May  4 08:45:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  4 May 2005 04:45:24 -0400 (EDT)
Subject: [tinysofa-svn] r6287 -
	tinysofa/releases/classic/2.0/sysklogd/current/specs
Message-ID: <20050504084524.C79B6344B44@minbar.tinysofa.org>

Author: jh
Date: 2005-05-04 04:45:18 -0400 (Wed, 04 May 2005)
New Revision: 6287

Modified:
   tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec
Log:
- another trigger imrovement


Modified: tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec
===================================================================
--- tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec	2005-05-03 20:42:59 UTC (rev 6286)
+++ tinysofa/releases/classic/2.0/sysklogd/current/specs/sysklogd.spec	2005-05-04 08:45:18 UTC (rev 6287)
@@ -91,8 +91,8 @@
 %service_postun syslog
 
 %triggerpostun -- sysklogd < 1.4.1-40
-%{__chown} syslog.syslog /var/log/cron* 2> /dev/null || :
-%{__chmod} 640 /var/log/cron* 2> /dev/null || :
+%{__chown} syslog.syslog /var/log/cron /var/log/cron.*.gz 2> /dev/null || :
+%{__chmod} 640 /var/log/cron /var/log/cron.*.gz 2> /dev/null || :
 %service_postun syslog
 exit 0
 



From svn at tinysofa.org  Wed May  4 10:05:37 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  4 May 2005 06:05:37 -0400 (EDT)
Subject: [tinysofa-svn] r6288 - in contrib/1.1/clamav/current: sources specs
Message-ID: <20050504100537.DCF16344B6F@minbar.tinysofa.org>

Author: jh
Date: 2005-05-04 06:05:24 -0400 (Wed, 04 May 2005)
New Revision: 6288

Added:
   contrib/1.1/clamav/current/sources/clamav-0.84.tar.gz
Removed:
   contrib/1.1/clamav/current/sources/clamav-0.83.tar.gz
Modified:
   contrib/1.1/clamav/current/sources/freshclam.sh
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
- merge from 2.0


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

Copied: contrib/1.1/clamav/current/sources/clamav-0.84.tar.gz (from rev 6287, contrib/classic/2.0/clamav/current/sources/clamav-0.84.tar.gz)


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

Modified: contrib/1.1/clamav/current/sources/freshclam.sh
===================================================================
--- contrib/1.1/clamav/current/sources/freshclam.sh	2005-05-04 08:45:18 UTC (rev 6287)
+++ contrib/1.1/clamav/current/sources/freshclam.sh	2005-05-04 10:05:24 UTC (rev 6288)
@@ -26,8 +26,7 @@
 prog=freshclam
 path=/usr/bin/freshclam
 
-ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on-
-error-execute=$ONERROR $FRESHOPTIONS"
+ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on- error-execute=$ONERROR $FRESHOPTIONS"
 
 if [ $HTTPPROXY ] ; then
    ALLOPTIONS=$ALLOPTIONS" --http-proxy=$HTTPPROXY --proxy-user=$PROXYUSER"

Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2005-05-04 08:45:18 UTC (rev 6287)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2005-05-04 10:05:24 UTC (rev 6288)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.83
-Release: 1gd
+Version: 0.84
+Release: 2gd
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -178,6 +178,12 @@
 
 
 %changelog
+* Tue May  3 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-2gd
+- fixed init script
+
+* Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-1jh
+- 0.84
+
 * Tue Feb 15 2005 Gerald Dachs <gda at tinysofa dot org> 0.83-1gd
 - New upstream
 



From svn at tinysofa.org  Thu May  5 07:16:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  5 May 2005 03:16:17 -0400 (EDT)
Subject: [tinysofa-svn] r6289 - in contrib/1.1/cvs/current: sources specs
Message-ID: <20050505071617.6D0EC344C17@minbar.tinysofa.org>

Author: jh
Date: 2005-05-05 03:15:18 -0400 (Thu, 05 May 2005)
New Revision: 6289

Added:
   contrib/1.1/cvs/current/sources/cvs-1.11.19-extzlib.patch
   contrib/1.1/cvs/current/sources/cvs-1.11.20.tar.bz2
Removed:
   contrib/1.1/cvs/current/sources/cvs-1.11.16-extzlib.patch
   contrib/1.1/cvs/current/sources/cvs-1.11.17.tar.bz2
Modified:
   contrib/1.1/cvs/current/specs/cvs.spec
Log:
- 1.11.20

Deleted: contrib/1.1/cvs/current/sources/cvs-1.11.16-extzlib.patch
===================================================================
--- contrib/1.1/cvs/current/sources/cvs-1.11.16-extzlib.patch	2005-05-04 10:05:24 UTC (rev 6288)
+++ contrib/1.1/cvs/current/sources/cvs-1.11.16-extzlib.patch	2005-05-05 07:15:18 UTC (rev 6289)
@@ -1,144 +0,0 @@
-diff -urN cvs-1.11.16/Makefile.am cvs-1.11.16-extzlib/Makefile.am
---- cvs-1.11.16/Makefile.am	2004-05-19 14:54:03.000000000 +0200
-+++ cvs-1.11.16-extzlib/Makefile.am	2004-05-29 17:47:07.000000000 +0200
-@@ -17,7 +17,7 @@
- ## Subdirectories to run make in for the primary targets.
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- 	windows-NT os2 emx vms
-diff -urN cvs-1.11.16/Makefile.in cvs-1.11.16-extzlib/Makefile.in
---- cvs-1.11.16/Makefile.in	2004-05-19 16:05:42.000000000 +0200
-+++ cvs-1.11.16-extzlib/Makefile.in	2004-05-29 17:47:43.000000000 +0200
-@@ -142,7 +142,7 @@
- 
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- 	windows-NT os2 emx vms
-@@ -172,7 +172,7 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
-+CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
- DIST_SOURCES =
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-@@ -184,7 +184,7 @@
- 	COPYING COPYING.LIB ChangeLog INSTALL Makefile.am NEWS TODO \
- 	acinclude.m4 aclocal.m4 compile config.h.in configure \
- 	configure.in cvs.spec.in depcomp install-sh mdate-sh missing \
--	mkinstalldirs
-+	mkinstalldirs config.guess config.sub ltmain.sh
- DIST_SUBDIRS = $(SUBDIRS)
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -229,8 +229,6 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
- uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
-@@ -373,7 +371,7 @@
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
- 	mkdir $(distdir)
--	$(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib
-+	$(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
-diff -urN cvs-1.11.16/configure cvs-1.11.16-extzlib/configure
---- cvs-1.11.16/configure	2004-05-18 22:35:43.000000000 +0200
-+++ cvs-1.11.16-extzlib/configure	2004-05-29 17:47:07.000000000 +0200
-@@ -11558,7 +11558,7 @@
-           ac_config_files="$ac_config_files windows-NT/fix-msvc-mak:windows-NT/fix-msvc-mak-head.pl:windows-NT/fix-msvc-mak.pl"
- 
- 
--                                                                                                                                                      ac_config_files="$ac_config_files Makefile contrib/Makefile cvs.spec diff/Makefile doc/Makefile emx/Makefile lib/Makefile man/Makefile os2/Makefile src/Makefile tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile zlib/Makefile"
-+                                                                                                                                            ac_config_files="$ac_config_files Makefile contrib/Makefile cvs.spec diff/Makefile doc/Makefile emx/Makefile lib/Makefile man/Makefile os2/Makefile src/Makefile tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -12156,7 +12156,6 @@
-   "vms/Makefile" ) CONFIG_FILES="$CONFIG_FILES vms/Makefile" ;;
-   "windows-NT/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/Makefile" ;;
-   "windows-NT/SCC/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/SCC/Makefile" ;;
--  "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
-   "lib/fnmatch.h" ) CONFIG_LINKS="$CONFIG_LINKS lib/fnmatch.h:lib/fnmatch.h.in" ;;
-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-diff -urN cvs-1.11.16/configure.in cvs-1.11.16-extzlib/configure.in
---- cvs-1.11.16/configure.in	2004-05-18 22:34:49.000000000 +0200
-+++ cvs-1.11.16-extzlib/configure.in	2004-05-29 17:47:07.000000000 +0200
-@@ -1039,8 +1039,7 @@
- 	  tools/Makefile \
- 	  vms/Makefile \
- 	  windows-NT/Makefile \
--	  windows-NT/SCC/Makefile \
--	  zlib/Makefile])
-+	  windows-NT/SCC/Makefile])
- 
- dnl and we're done
- AC_OUTPUT
-diff -urN cvs-1.11.16/src/Makefile.am cvs-1.11.16-extzlib/src/Makefile.am
---- cvs-1.11.16/src/Makefile.am	2004-02-03 20:05:36.000000000 +0100
-+++ cvs-1.11.16-extzlib/src/Makefile.am	2004-05-29 17:47:07.000000000 +0200
-@@ -22,7 +22,7 @@
- # try and remove naming ocnflicts and fix Automake to allow particular includes
- # to be attached only to particular object files.  Short term fix is either or.
- ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
- 
- bin_PROGRAMS = cvs
- bin_SCRIPTS = cvsbug
-@@ -103,7 +103,7 @@
- cvs_LDADD = \
- 	../diff/libdiff.a \
- 	../lib/libcvs.a \
--	../zlib/libz.a
-+	-lz
- 
- # extra clean targets
- # wish this could be distclean-hdr-local but it's not part of automake
-diff -urN cvs-1.11.16/src/Makefile.in cvs-1.11.16-extzlib/src/Makefile.in
---- cvs-1.11.16/src/Makefile.in	2004-05-19 16:05:47.000000000 +0200
-+++ cvs-1.11.16-extzlib/src/Makefile.in	2004-05-29 17:47:07.000000000 +0200
-@@ -146,7 +146,7 @@
- # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
- # try and remove naming ocnflicts and fix Automake to allow particular includes
- # to be attached only to particular object files.  Short term fix is either or.
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
- 
- bin_PROGRAMS = cvs
- bin_SCRIPTS = cvsbug
-@@ -228,7 +228,7 @@
- cvs_LDADD = \
- 	../diff/libdiff.a \
- 	../lib/libcvs.a \
--	../zlib/libz.a
-+	-lz
- 
- 
- # extra clean targets
-@@ -272,7 +272,7 @@
- 	vers_ts.$(OBJEXT) watch.$(OBJEXT) wrapper.$(OBJEXT) \
- 	zlib.$(OBJEXT)
- cvs_OBJECTS = $(am_cvs_OBJECTS)
--cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
-+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
- cvs_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
- 

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

Added: contrib/1.1/cvs/current/sources/cvs-1.11.19-extzlib.patch
===================================================================
--- contrib/1.1/cvs/current/sources/cvs-1.11.19-extzlib.patch	2005-05-04 10:05:24 UTC (rev 6288)
+++ contrib/1.1/cvs/current/sources/cvs-1.11.19-extzlib.patch	2005-05-05 07:15:18 UTC (rev 6289)
@@ -0,0 +1,44 @@
+--- cvs-1.11.19/configure.in.old.old4	2005-02-01 00:10:49.000000000 +0100
++++ cvs-1.11.19/configure.in	2005-02-28 13:27:10.000000000 +0100
+@@ -1040,8 +1040,8 @@
+ 	  tools/Makefile \
+ 	  vms/Makefile \
+ 	  windows-NT/Makefile \
+-	  windows-NT/SCC/Makefile \
+-	  zlib/Makefile])
++	  windows-NT/SCC/Makefile
++	  ])
+ 
+ dnl and we're done
+ AC_OUTPUT
+--- cvs-1.11.19/Makefile.am.old.old4	2004-11-11 23:30:36.000000000 +0100
++++ cvs-1.11.19/Makefile.am	2005-02-28 13:25:32.000000000 +0100
+@@ -17,7 +17,7 @@
+ ## Subdirectories to run make in for the primary targets.
+ # Unix source subdirs, where we'll want to run lint and etags:
+ # This is a legacy variable from b4 Automake
+-USOURCE_SUBDIRS = lib zlib diff src
++USOURCE_SUBDIRS = lib diff src
+ # All other subdirs:
+ SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
+ 	windows-NT os2 emx vms
+--- cvs-1.11.19/src/Makefile.am.old.old4	2005-01-31 23:07:35.000000000 +0100
++++ cvs-1.11.19/src/Makefile.am	2005-02-28 13:24:26.000000000 +0100
+@@ -24,7 +24,7 @@
+ # try and remove naming ocnflicts and fix Automake to allow particular includes
+ # to be attached only to particular object files.  Short term fix is either or.
+ ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
+ 
+ bin_PROGRAMS = cvs
+ bin_SCRIPTS = cvsbug
+@@ -105,7 +105,7 @@
+ cvs_LDADD = \
+ 	../diff/libdiff.a \
+ 	../lib/libcvs.a \
+-	../zlib/libz.a
++	-lz
+ 
+ # extra clean targets
+ # wish this could be distclean-hdr-local but it's not part of automake

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


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

Modified: contrib/1.1/cvs/current/specs/cvs.spec
===================================================================
--- contrib/1.1/cvs/current/specs/cvs.spec	2005-05-04 10:05:24 UTC (rev 6288)
+++ contrib/1.1/cvs/current/specs/cvs.spec	2005-05-05 07:15:18 UTC (rev 6289)
@@ -1,21 +1,22 @@
 Summary: A version control system.
 Name:    cvs
-Version: 1.11.17
-Release: 1bg
+Version: 1.11.20
+Release: 1jh
 License: GPL
 Group: contrib
-Source:  https://ccvs.cvshome.org/files/documents/19/191/cvs-1.11.17.tar.bz2
+Source:  https://ccvs.cvshome.org/files/documents/19/191/cvs-%{version}.tar.bz2
 URL:     https://www.cvshome.org/
 Patch0:  cvs-1.11.1p1-authserver.patch
 Patch1:  cvs-1.11.2-cvspass.patch
 Patch2:  cvs-1.11.1p1-bs.patch
 Patch3:  cvs-1.11.2-abortabort.patch
-Patch4:  cvs-1.11.16-extzlib.patch
+Patch4:  cvs-1.11.19-extzlib.patch
 Requires:  htmlinfo, vim
 BuildRequires: zlib-devel, texinfo, tcsh, vim
+BuildRequires: autoconf automake
 #%{!?nokerberos:BuildPrereq: krb5-devel}
 Prefix:  %{_prefix}
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 CVS (Concurrent Version System) is a version control system that can
@@ -51,13 +52,14 @@
 %patch0 -p1 -b .authserver
 %patch1 -p1 -b .cvspass
 %patch2 -p1 -b .bs
-%patch3 -p1 -b .extzlib
-%patch4 -p1 -b .abortabort
+%patch3 -p1 -b .abortabort
+%patch4 -p1 -b .extzlib
 
 
 %build
+autoreconf
 %configure --without-gssapi
-make LDFLAGS=-s
+%make
 
 if [ `id -u` -ne 0 ] ; then
     make check
@@ -69,8 +71,7 @@
 
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%makeinstall_std
 
 install -d -m 755 %{buildroot}/%{_datadir}/html/%{name}/
 install -m 644 doc/%{name}.html  %{buildroot}/%{_datadir}/html/%{name}/
@@ -84,7 +85,7 @@
 rm -r %{buildroot}%{_infodir}
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+%clean_buildroot
 
 %post
 /usr/sbin/htmlinfo_update.sh
@@ -92,6 +93,7 @@
 %preun
 /usr/sbin/htmlinfo_update.sh
 
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING* DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS
@@ -109,8 +111,10 @@
 %{_datadir}/%{name}
  
 
+%changelog
+* Thu May  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.11.20-1jh
+- 1.11.20
 
-%changelog
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 1.11.17-1bg
 - current (1.11.17-1bg) integrated as 1.11.17-1bg
 



From svn at tinysofa.org  Thu May  5 07:28:34 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  5 May 2005 03:28:34 -0400 (EDT)
Subject: [tinysofa-svn] r6290 - in contrib/1.1/bsdtar/current: sources specs
Message-ID: <20050505072834.9CEF9344951@minbar.tinysofa.org>

Author: jh
Date: 2005-05-05 03:28:08 -0400 (Thu, 05 May 2005)
New Revision: 6290

Added:
   contrib/1.1/bsdtar/current/sources/bsdtar-1.01.022-setlocale.patch
   contrib/1.1/bsdtar/current/sources/bsdtar-1.02.006-malloc.patch
   contrib/1.1/bsdtar/current/sources/bsdtar-1.02.023.tar.gz
   contrib/1.1/bsdtar/current/sources/libarchive-1.02.009-eilseq.patch
   contrib/1.1/bsdtar/current/sources/libarchive-1.02.023.tar.gz
Removed:
   contrib/1.1/bsdtar/current/sources/bsdtar-1.01.020.tar.gz
   contrib/1.1/bsdtar/current/sources/libarchive-1.01.020.tar.gz
Modified:
   contrib/1.1/bsdtar/current/specs/bsdtar.spec
Log:
- merge changes from 2.0

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

Added: contrib/1.1/bsdtar/current/sources/bsdtar-1.01.022-setlocale.patch
===================================================================
--- contrib/1.1/bsdtar/current/sources/bsdtar-1.01.022-setlocale.patch	2005-05-05 07:15:18 UTC (rev 6289)
+++ contrib/1.1/bsdtar/current/sources/bsdtar-1.01.022-setlocale.patch	2005-05-05 07:28:08 UTC (rev 6290)
@@ -0,0 +1,15 @@
+--- ./bsdtar.c.setlocale~	2004-12-22 08:44:04.000000000 +0200
++++ ./bsdtar.c	2005-02-17 14:40:12.000000000 +0200
+@@ -190,8 +190,12 @@
+ 	bsdtar->fd = -1; /* Mark as "unused" */
+ 	option_o = 0;
+ 
++#if 0
+ 	if (setlocale(LC_ALL, "") == NULL)
+ 		bsdtar_warnc(bsdtar, 0, "Failed to set default locale");
++#else
++	setlocale(LC_ALL, "");
++#endif
+ #if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
+ 	bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
+ #endif

Added: contrib/1.1/bsdtar/current/sources/bsdtar-1.02.006-malloc.patch
===================================================================
--- contrib/1.1/bsdtar/current/sources/bsdtar-1.02.006-malloc.patch	2005-05-05 07:15:18 UTC (rev 6289)
+++ contrib/1.1/bsdtar/current/sources/bsdtar-1.02.006-malloc.patch	2005-05-05 07:28:08 UTC (rev 6290)
@@ -0,0 +1,24 @@
+--- bsdtar-1.02.006/tree.c.malloc~	2005-02-13 01:43:21.000000000 +0200
++++ bsdtar-1.02.006/tree.c	2005-02-13 16:19:08.000000000 +0200
+@@ -147,6 +147,10 @@
+ 	struct tree_entry *te;
+ 
+ 	te = malloc(sizeof(*te));
++	if(te == NULL) {
++		perror("No Memory");
++		exit(1);
++	}
+ 	memset(te, 0, sizeof(*te));
+ 	te->next = t->stack;
+ 	t->stack = te;
+@@ -193,6 +197,10 @@
+ 	struct tree *t;
+ 
+ 	t = malloc(sizeof(*t));
++	if(t == NULL) {
++		perror("No Memory");
++		exit(1);
++	}
+ 	memset(t, 0, sizeof(*t));
+ 	tree_append(t, path, strlen(path));
+ 	t->initialDirFd = open(".", O_RDONLY);

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


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

Deleted: contrib/1.1/bsdtar/current/sources/libarchive-1.01.020.tar.gz
===================================================================
(Binary files differ)

Added: contrib/1.1/bsdtar/current/sources/libarchive-1.02.009-eilseq.patch
===================================================================
--- contrib/1.1/bsdtar/current/sources/libarchive-1.02.009-eilseq.patch	2005-05-05 07:15:18 UTC (rev 6289)
+++ contrib/1.1/bsdtar/current/sources/libarchive-1.02.009-eilseq.patch	2005-05-05 07:28:08 UTC (rev 6290)
@@ -0,0 +1,14 @@
+--- ./archive_platform.h.eilseq~	2005-04-18 09:35:33.000000000 +0300
++++ ./archive_platform.h	2005-04-22 08:52:59.000000000 +0300
+@@ -128,8 +128,9 @@
+ #if HAVE_EFTYPE
+ #define	ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
+ #else
+-#if HAVE_EILSEQ
+-#define	ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
++#include <errno.h>
++#ifdef ENOTSUP
++#define	ARCHIVE_ERRNO_FILE_FORMAT ENOTSUP
+ #else
+ #define	ARCHIVE_ERRNO_FILE_FORMAT EINVAL
+ #endif

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


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

Modified: contrib/1.1/bsdtar/current/specs/bsdtar.spec
===================================================================
--- contrib/1.1/bsdtar/current/specs/bsdtar.spec	2005-05-05 07:15:18 UTC (rev 6289)
+++ contrib/1.1/bsdtar/current/specs/bsdtar.spec	2005-05-05 07:28:08 UTC (rev 6290)
@@ -1,15 +1,18 @@
-Summary: A FreeBSD file archiving program
+%define libarchive_version	1.02.023
+Summary: A BSD file archiving program
 Name: bsdtar
-Version: 1.01.020
+Version: 1.02.023
 Release: 1jh
 License: BSD
 Group: main
 Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz
-Source1: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+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
+Patch3: libarchive-1.02.009-eilseq.patch
 BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-
 %description
 The tar program saves many files together in one archive and can
 restore individual files (or all of the files) from that archive. Tar
@@ -21,17 +24,24 @@
 
 
 %prep
-%setup -q -a 1
+%setup -q -n bsdtar-%{version} -a 1
+%patch0 -p1 -b .setlocale~
+%patch1 -p1 -b .malloc~
 
+pushd libarchive-%{libarchive_version}
+%patch3 -p1 -b .eilseq~
+popd
 
+
 %build
-pushd libarchive-%{version}
+export CFLAGS="$RPM_OPT_FLAGS -Ilibarchive-%{libarchive_version}"
+export LDFLAGS="$LDFLAGS -Llibarchive-%{libarchive_version}"
+
+pushd libarchive-%{libarchive_version}
 %configure --prefix=$PWD
 %make
 popd
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Ilibarchive-%{version}"
-export LDFLAGS="$LDFLAGS -Llibarchive-%{version}"
 %configure
 %make
 
@@ -51,5 +61,8 @@
 
 
 %changelog
+* Thu May  5 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.02.023-1jh
+- merge changes from 2.0
+
 * Thu Nov 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.01.020-1jh
 - intial spec file



From svn at tinysofa.org  Thu May  5 17:17:21 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  5 May 2005 13:17:21 -0400 (EDT)
Subject: [tinysofa-svn] r6291 - contrib/classic/2.0
Message-ID: <20050505171721.C627B344C08@minbar.tinysofa.org>

Author: jh
Date: 2005-05-05 13:17:09 -0400 (Thu, 05 May 2005)
New Revision: 6291

Added:
   contrib/classic/2.0/cvs/
Log:
- copy from 1.1


Copied: contrib/classic/2.0/cvs (from rev 6290, contrib/1.1/cvs)



From svn at tinysofa.org  Fri May  6 08:56:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  6 May 2005 04:56:01 -0400 (EDT)
Subject: [tinysofa-svn] r6292 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050506085601.B9C4B344B4F@minbar.tinysofa.org>

Author: gda
Date: 2005-05-06 04:55:53 -0400 (Fri, 06 May 2005)
New Revision: 6292

Modified:
   contrib/classic/2.0/clamav/current/sources/freshclam.sh
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
fixed typo in initscript

Modified: contrib/classic/2.0/clamav/current/sources/freshclam.sh
===================================================================
--- contrib/classic/2.0/clamav/current/sources/freshclam.sh	2005-05-05 17:17:09 UTC (rev 6291)
+++ contrib/classic/2.0/clamav/current/sources/freshclam.sh	2005-05-06 08:55:53 UTC (rev 6292)
@@ -26,7 +26,7 @@
 prog=freshclam
 path=/usr/bin/freshclam
 
-ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on- error-execute=$ONERROR $FRESHOPTIONS"
+ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on-error-execute=$ONERROR $FRESHOPTIONS"
 
 if [ $HTTPPROXY ] ; then
    ALLOPTIONS=$ALLOPTIONS" --http-proxy=$HTTPPROXY --proxy-user=$PROXYUSER"

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-05 17:17:09 UTC (rev 6291)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-06 08:55:53 UTC (rev 6292)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
 Version: 0.84
-Release: 2gd
+Release: 3gd
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Fri May  6 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-3gd
+- fixed typo in init script
+
 * Tue May  3 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-2gd
 - fixed init script
 



From svn at tinysofa.org  Fri May  6 17:51:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  6 May 2005 13:51:28 -0400 (EDT)
Subject: [tinysofa-svn] r6293 - in
	tinysofa/releases/classic/2.0/vim/current: sources specs
Message-ID: <20050506175128.8F2233448CF@minbar.tinysofa.org>

Author: jh
Date: 2005-05-06 13:51:18 -0400 (Fri, 06 May 2005)
New Revision: 6293

Added:
   tinysofa/releases/classic/2.0/vim/current/sources/vim-6.3.063-071.patch
Modified:
   tinysofa/releases/classic/2.0/vim/current/specs/vim.spec
Log:
- update to 6.3.71

Added: tinysofa/releases/classic/2.0/vim/current/sources/vim-6.3.063-071.patch
===================================================================
--- tinysofa/releases/classic/2.0/vim/current/sources/vim-6.3.063-071.patch	2005-05-06 08:55:53 UTC (rev 6292)
+++ tinysofa/releases/classic/2.0/vim/current/sources/vim-6.3.063-071.patch	2005-05-06 17:51:18 UTC (rev 6293)
@@ -0,0 +1,581 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.063
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.063
+Problem:    When a CursorHold autocommand changes to another window
+	    (temporarily) 'mousefocus' stops working.
+Solution:   Call gui_mouse_correct() after triggering CursorHold.
+Files:	    src/gui.c
+
+
+*** ../vim-6.3.050/src/gui.c	Sun Sep  5 20:48:38 2004
+--- src/gui.c	Fri Mar 11 19:11:00 2005
+***************
+*** 2626,2631 ****
+--- 2626,2635 ----
+  	    update_screen(VALID);
+  	    showruler(FALSE);
+  	    setcursor();
++ 	    /* In case the commands moved the focus to another window
++ 	     * (temporarily). */
++ 	    if (need_mouse_correct)
++ 		gui_mouse_correct();
+  
+  	    once_already = 1;
+  	    retval = 0;
+*** ../vim-6.3.050/src/version.c	Sun Feb 13 20:46:05 2005
+--- src/version.c	Fri Mar 11 19:12:29 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     63,
+  /**/
+
+-- 
+Trees moving back and forth is what makes the wind blow.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.064
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.064
+Problem:    line2byte(line("$") + 1) sometimes returns the wrong number.
+	    (Charles Campbell)
+Solution:   Flush the cached line before counting the bytes.
+Files:	    src/memline.c
+
+
+*** ../vim-6.3.041/src/memline.c	Wed Jun  9 14:56:26 2004
+--- src/memline.c	Thu Feb 17 11:02:53 2005
+***************
+*** 4247,4252 ****
+--- 4247,4255 ----
+      int		ffdos = (get_fileformat(buf) == EOL_DOS);
+      int		extra = 0;
+  
++     /* take care of cached line first */
++     ml_flush_line(curbuf);
++ 
+      if (buf->b_ml.ml_usedchunks == -1
+  	    || buf->b_ml.ml_chunksize == NULL
+  	    || line < 0)
+*** ../vim-6.3.041/src/version.c	Fri Mar 11 19:14:17 2005
+--- src/version.c	Fri Mar 11 19:15:46 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     64,
+  /**/
+
+-- 
+FATHER:    You killed eight wedding guests in all!
+LAUNCELOT: Er, Well ... the thing is ... I thought your son was a lady.
+FATHER:    I can understand that.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.066
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.066
+Problem:    Backup file may get wrong permissions.
+Solution:   Use permissions of original file for backup file in more places.
+Files:	    src/fileio.c
+
+
+*** ../vim-6.3.029/src/fileio.c	Sat Sep 18 21:13:25 2004
+--- src/fileio.c	Fri Mar 18 12:56:41 2005
+***************
+*** 3314,3320 ****
+  		    /* Open with O_EXCL to avoid the file being created while
+  		     * we were sleeping (symlink hacker attack?) */
+  		    bfd = mch_open((char *)backup,
+! 				       O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, 0666);
+  		    if (bfd < 0)
+  		    {
+  			vim_free(backup);
+--- 3314,3320 ----
+  		    /* Open with O_EXCL to avoid the file being created while
+  		     * we were sleeping (symlink hacker attack?) */
+  		    bfd = mch_open((char *)backup,
+! 				O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, perm & 0777);
+  		    if (bfd < 0)
+  		    {
+  			vim_free(backup);
+***************
+*** 3698,3704 ****
+      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
+  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
+  			: (O_CREAT | O_TRUNC))
+! 			, 0666)) < 0)
+      {
+  	/*
+  	 * A forced write will try to create a new file if the old one is
+--- 3698,3704 ----
+      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
+  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
+  			: (O_CREAT | O_TRUNC))
+! 			, perm & 0777)) < 0)
+      {
+  	/*
+  	 * A forced write will try to create a new file if the old one is
+***************
+*** 4104,4110 ****
+  		if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0)
+  		{
+  		    if ((write_info.bw_fd = mch_open((char *)fname,
+! 			  O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA, 0666)) >= 0)
+  		    {
+  			/* copy the file. */
+  			write_info.bw_buf = smallbuf;
+--- 4104,4111 ----
+  		if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0)
+  		{
+  		    if ((write_info.bw_fd = mch_open((char *)fname,
+! 				    O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA,
+! 							   perm & 0777)) >= 0)
+  		    {
+  			/* copy the file. */
+  			write_info.bw_buf = smallbuf;
+***************
+*** 4261,4267 ****
+  
+  	    if (org == NULL
+  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+! 								   0666)) < 0)
+  	      EMSG(_("E206: patchmode: can't touch empty original file"));
+  	    else
+  	      close(empty_fd);
+--- 4262,4268 ----
+  
+  	    if (org == NULL
+  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+! 							    perm & 0777)) < 0)
+  	      EMSG(_("E206: patchmode: can't touch empty original file"));
+  	    else
+  	      close(empty_fd);
+***************
+*** 5693,5698 ****
+--- 5694,5703 ----
+      BPTR	flock;
+  #endif
+      struct stat	st;
++     long	perm;
++ #ifdef HAVE_ACL
++     vim_acl_T	acl;		/* ACL from original file */
++ #endif
+  
+      /*
+       * When the names are identical, there is nothing to do.
+***************
+*** 5743,5752 ****
+      /*
+       * Rename() failed, try copying the file.
+       */
+      fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
+      if (fd_in == -1)
+  	return -1;
+!     fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, 0666);
+      if (fd_out == -1)
+      {
+  	close(fd_in);
+--- 5748,5764 ----
+      /*
+       * Rename() failed, try copying the file.
+       */
++     perm = mch_getperm(from);
++ #ifdef HAVE_ACL
++     /* For systems that support ACL: get the ACL from the original file. */
++     acl = mch_get_acl(from);
++ #endif
+      fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
+      if (fd_in == -1)
+  	return -1;
+! 
+!     /* Create the new file with same permissions as the original. */
+!     fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, (int)perm);
+      if (fd_out == -1)
+      {
+  	close(fd_in);
+***************
+*** 5777,5782 ****
+--- 5789,5798 ----
+  	errmsg = _("E210: Error reading \"%s\"");
+  	to = from;
+      }
++     mch_setperm(to, perm);
++ #ifdef HAVE_ACL
++     mch_set_acl(to, acl);
++ #endif
+      if (errmsg != NULL)
+      {
+  	EMSG2(errmsg, to);
+*** ../vim-6.3.029/src/version.c	Fri Mar 18 10:56:48 2005
+--- src/version.c	Fri Mar 18 13:36:18 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     66,
+  /**/
+
+-- 
+Why is "abbreviation" such a long word?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.067
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.067 (after 6.3.066)
+Problem:    Newly created file gets execute permission.
+Solution:   Check for "perm" to be negative before using it.
+Files:	    src/fileio.c
+
+
+*** ../vim-6.3.030/src/fileio.c	Fri Mar 18 13:37:34 2005
+--- src/fileio.c	Fri Mar 18 19:16:29 2005
+***************
+*** 3698,3704 ****
+      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
+  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
+  			: (O_CREAT | O_TRUNC))
+! 			, perm & 0777)) < 0)
+      {
+  	/*
+  	 * A forced write will try to create a new file if the old one is
+--- 3698,3704 ----
+      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
+  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
+  			: (O_CREAT | O_TRUNC))
+! 			, perm < 0 ? 0666 : (perm & 0777))) < 0)
+      {
+  	/*
+  	 * A forced write will try to create a new file if the old one is
+***************
+*** 4262,4268 ****
+  
+  	    if (org == NULL
+  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+! 							    perm & 0777)) < 0)
+  	      EMSG(_("E206: patchmode: can't touch empty original file"));
+  	    else
+  	      close(empty_fd);
+--- 4262,4268 ----
+  
+  	    if (org == NULL
+  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+! 					perm < 0 ? 0666 : (perm & 0777))) < 0)
+  	      EMSG(_("E206: patchmode: can't touch empty original file"));
+  	    else
+  	      close(empty_fd);
+*** ../vim-6.3.030/src/version.c	Fri Mar 18 13:37:34 2005
+--- src/version.c	Fri Mar 18 19:17:45 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     67,
+  /**/
+
+-- 
+If corn oil comes from corn, where does baby oil come from?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.068
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.068
+Problem:    When editing a compressed file xxx.gz which is a symbolic link to
+            the actual file a ":write" renames the link.
+Solution:   Resolve the link, so that the actual file is renamed and
+            compressed.
+Files:      runtime/plugin/gzip.vim
+    
+
+*** ../vim-6.3.025/runtime/plugin/gzip.vim	Wed Jun  9 14:56:33 2004
+--- runtime/plugin/gzip.vim	Thu Mar 24 10:56:30 2005
+***************
+*** 1,6 ****
+  " Vim plugin for editing compressed files.
+  " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2004 Jan 12
+  
+  " Exit quickly when:
+  " - this plugin was already loaded
+--- 1,6 ----
+  " Vim plugin for editing compressed files.
+  " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2005 Mar 24
+  
+  " Exit quickly when:
+  " - this plugin was already loaded
+***************
+*** 113,119 ****
+    " don't do anything if the cmd is not supported
+    if s:check(a:cmd)
+      " Rename the file before compressing it.
+!     let nm = expand("<afile>")
+      let nmt = s:tempname(nm)
+      if rename(nm, nmt) == 0
+        call system(a:cmd . " " . nmt)
+--- 113,119 ----
+    " don't do anything if the cmd is not supported
+    if s:check(a:cmd)
+      " Rename the file before compressing it.
+!     let nm = resolve(expand("<afile>"))
+      let nmt = s:tempname(nm)
+      if rename(nm, nmt) == 0
+        call system(a:cmd . " " . nmt)
+*** ../vim-6.3.025/src/version.c	Fri Mar 18 19:21:29 2005
+--- src/version.c	Thu Mar 24 10:59:13 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     68,
+  /**/
+
+-- 
+Are leaders born or made?  And if they're made, can we return them under
+warranty?
+				(Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.069
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.069
+Problem:    When converting text with illegal characters Vim may crash.
+Solution:   Avoid that too much is subtracted from the length. (Da Woon Jung)
+Files:	    src/mbyte.c
+
+
+*** ../vim-6.3.022/src/mbyte.c	Thu Oct  7 20:07:59 2004
+--- src/mbyte.c	Sat Mar 19 18:53:19 2005
+***************
+*** 3039,3045 ****
+  	    *to++ = '?';
+  	    if ((*mb_ptr2cells)((char_u *)from) > 1)
+  		*to++ = '?';
+! 	    l = (*mb_ptr2len_check)((char_u *)from);
+  	    from += l;
+  	    fromlen -= l;
+  	}
+--- 3039,3052 ----
+  	    *to++ = '?';
+  	    if ((*mb_ptr2cells)((char_u *)from) > 1)
+  		*to++ = '?';
+! 	    if (enc_utf8)
+! 		l = utfc_ptr2len_check_len((char_u *)from, fromlen);
+! 	    else
+! 	    {
+! 		l = (*mb_ptr2len_check)((char_u *)from);
+! 		if (l > fromlen)
+! 		    l = fromlen;
+! 	    }
+  	    from += l;
+  	    fromlen -= l;
+  	}
+*** ../vim-6.3.022/src/version.c	Thu Mar 24 11:03:11 2005
+--- src/version.c	Mon Apr 11 11:37:19 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     69,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+99. The hum of a cooling fan and the click of keys is comforting to you.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.070
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.070
+Problem:    After ":set number linebreak wrap" and a vertical split, moving
+	    the vertical separator far left will crash Vim. (Georg Dahn)
+Solution:   Avoid dividing by zero.
+Files:	    src/charset.c
+
+
+*** ../vim-6.3.019/src/charset.c	Wed Jun  9 14:56:26 2004
+--- src/charset.c	Sun Apr 10 17:35:14 2005
+***************
+*** 1005,1010 ****
+--- 1005,1011 ----
+      int		numberextra;
+      char_u	*ps;
+      int		tab_corr = (*s == TAB);
++     int		n;
+  
+      /*
+       * No 'linebreak' and 'showbreak': return quickly.
+***************
+*** 1048,1056 ****
+  	col2 = col;
+  	colmax = W_WIDTH(wp) - numberextra;
+  	if (col >= colmax)
+! 	    colmax += (((col - colmax)
+! 			/ (colmax + win_col_off2(wp))) + 1)
+! 			* (colmax + win_col_off2(wp));
+  	for (;;)
+  	{
+  	    ps = s;
+--- 1049,1060 ----
+  	col2 = col;
+  	colmax = W_WIDTH(wp) - numberextra;
+  	if (col >= colmax)
+! 	{
+! 	    n = colmax + win_col_off2(wp);
+! 	    if (n > 0)
+! 		colmax += (((col - colmax) / n) + 1) * n;
+! 	}
+! 
+  	for (;;)
+  	{
+  	    ps = s;
+*** ../vim-6.3.019/src/version.c	Mon Apr 11 11:38:29 2005
+--- src/version.c	Mon Apr 11 11:40:47 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     70,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+100. The most exciting sporting events you noticed during summer 1996
+    was Netscape vs. Microsoft.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
+To: vim-dev at vim.org
+Subject: Patch 6.3.071
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.071
+Problem:    The message for CTRL-X mode is still displayed after an error for
+	    'thesaurus' or 'dictionary' being empty.
+Solution:   Clear "edit_submode".
+Files:	    src/edit.c
+
+
+*** ../vim-6.3.020/src/edit.c	Sat Jan 29 16:19:09 2005
+--- src/edit.c	Fri Apr  8 11:16:31 2005
+***************
+*** 959,964 ****
+--- 959,965 ----
+  		if (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)
+  		{
+  		    ctrl_x_mode = 0;
++ 		    edit_submode = NULL;
+  		    msg_attr((char_u *)_("'thesaurus' option is empty"),
+  			     hl_attr(HLF_E));
+  		    if (emsg_silent == 0)
+***************
+*** 1163,1168 ****
+--- 1164,1170 ----
+  		if (*curbuf->b_p_dict == NUL && *p_dict == NUL)
+  		{
+  		    ctrl_x_mode = 0;
++ 		    edit_submode = NULL;
+  		    msg_attr((char_u *)_("'dictionary' option is empty"),
+  			     hl_attr(HLF_E));
+  		    if (emsg_silent == 0)
+*** ../vim-6.3.020/src/version.c	Mon Apr 11 11:49:54 2005
+--- src/version.c	Mon Apr 11 11:51:26 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     71,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+101. U can read htis w/o ny porblm and cant figur eout Y its evn listd.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

Modified: tinysofa/releases/classic/2.0/vim/current/specs/vim.spec
===================================================================
--- tinysofa/releases/classic/2.0/vim/current/specs/vim.spec	2005-05-06 08:55:53 UTC (rev 6292)
+++ tinysofa/releases/classic/2.0/vim/current/specs/vim.spec	2005-05-06 17:51:18 UTC (rev 6293)
@@ -1,7 +1,7 @@
 Summary: The VIM editor.
 Name: vim
 %define srcversion 6.3
-%define patchlevel 62
+%define patchlevel 71
 %define shortname vim63
 Version: %srcversion.%patchlevel
 Release: 2jh
@@ -11,6 +11,7 @@
 Source1: vimrc
 Patch1: vim-6.3.001-057.patch
 Patch2: vim-6.3.058-062.patch
+Patch3: vim-6.3.063-071.patch
 Patch8: vim-6.3-tmpfile.patch
 Patch1000: xxd-locale.patch
 Requires: gawk
@@ -83,6 +84,7 @@
 %setup -q -n %{shortname}
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 %patch8 -p1
 
@@ -192,6 +194,9 @@
 
 
 %changelog
+* Fri May  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 6.3.71-1jh
+- update to 6.3.71
+
 * Sun Feb 20 2005 Jaakko Heinonen <jh at tinysofa dot org> 6.3.62-1jh
 - upate to 6.3.62
 



From svn at tinysofa.org  Fri May  6 20:16:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  6 May 2005 16:16:55 -0400 (EDT)
Subject: [tinysofa-svn] r6295 - in
	tinysofa/releases/classic/2.0/postgresql/current: sources specs
Message-ID: <20050506201655.0698A344B68@minbar.tinysofa.org>

Author: jh
Date: 2005-05-06 16:16:04 -0400 (Fri, 06 May 2005)
New Revision: 6295

Added:
   tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-0247.patch
   tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1409.patch
   tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1410.patch
Modified:
   tinysofa/releases/classic/2.0/postgresql/current/specs/postgresql.spec
Log:
- fix CAN-2005-1410, CAN-2005-0247, CAN-2005-1409

Added: tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-0247.patch
===================================================================
--- tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-0247.patch	2005-05-06 18:01:35 UTC (rev 6294)
+++ tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-0247.patch	2005-05-06 20:16:04 UTC (rev 6295)
@@ -0,0 +1,69 @@
+diff -Naur postgresql-7.4.7.orig/src/pl/plpgsql/src/gram.y postgresql-7.4.7/src/pl/plpgsql/src/gram.y
+--- postgresql-7.4.7.orig/src/pl/plpgsql/src/gram.y	2005-01-20 19:31:21.000000000 -0500
++++ postgresql-7.4.7/src/pl/plpgsql/src/gram.y	2005-02-08 14:21:48.723658452 -0500
+@@ -1699,6 +1699,16 @@
+ 		}
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_VARIABLE:
+@@ -1856,6 +1866,15 @@
+ 
+ 					while ((tok = yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = yylex();
+ 						switch(tok)
+ 						{
+@@ -1906,6 +1925,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_VARIABLE:
+@@ -1989,6 +2018,15 @@
+ 
+ 				while ((tok = yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = yylex();
+ 					switch(tok)
+ 					{

Added: tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1409.patch
===================================================================
--- tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1409.patch	2005-05-06 18:01:35 UTC (rev 6294)
+++ tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1409.patch	2005-05-06 20:16:04 UTC (rev 6295)
@@ -0,0 +1,59 @@
+--- postgresql-7.4.7-old/src/backend/utils/mb/conversion_procs/Makefile.old	2005-05-06 13:37:50.120333568 +0000
++++ postgresql-7.4.7-old/src/backend/utils/mb/conversion_procs/Makefile	2005-05-06 13:38:00.857701240 +0000
+@@ -157,7 +157,7 @@
+ 		func=$$1; shift; \
+ 		obj=$$1; shift; \
+ 		echo "-- $$se --> $$de"; \
+-		echo "CREATE OR REPLACE FUNCTION $$func (INTEGER, INTEGER, CSTRING, CSTRING, INTEGER) RETURNS VOID AS '$$"libdir"/$$obj', '$$func' LANGUAGE 'c' STRICT;"; \
++		echo "CREATE OR REPLACE FUNCTION $$func (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '$$"libdir"/$$obj', '$$func' LANGUAGE 'c' STRICT;"; \
+ 		echo "DROP CONVERSION pg_catalog.$$name;"; \
+ 		echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \
+ 	done > $@
+--- postgresql-7.4.7-old/src/backend/commands/conversioncmds.c.old	2005-05-06 13:35:08.980830496 +0000
++++ postgresql-7.4.7-old/src/backend/commands/conversioncmds.c	2005-05-06 13:35:50.027590440 +0000
+@@ -46,7 +46,7 @@
+ 	const char *from_encoding_name = stmt->for_encoding_name;
+ 	const char *to_encoding_name = stmt->to_encoding_name;
+ 	List	   *func_name = stmt->func_name;
+-	static Oid	funcargs[] = {INT4OID, INT4OID, CSTRINGOID, CSTRINGOID, INT4OID};
++	static Oid	funcargs[] = {INT4OID, INT4OID, CSTRINGOID, INTERNALOID, INT4OID};
+ 
+ 	/* Convert list of names to a name and namespace */
+ 	namespaceId = QualifiedNameGetCreationNamespace(stmt->conversion_name,
+--- postgresql-7.4.7-old/doc/src/sgml/ref/create_conversion.sgml.old	2005-05-06 13:31:10.335110160 +0000
++++ postgresql-7.4.7-old/doc/src/sgml/ref/create_conversion.sgml	2005-05-06 13:34:33.691195336 +0000
+@@ -8,7 +8,7 @@
+ 
+  <refnamediv>
+   <refname>CREATE CONVERSION</refname>
+-  <refpurpose>define a new conversion</refpurpose>
++  <refpurpose>define a new encoding conversion</refpurpose>
+  </refnamediv>
+ 
+  <indexterm zone="sql-createconversion">
+@@ -26,10 +26,13 @@
+   <title>Description</title>
+ 
+   <para>
+-   <command>CREATE CONVERSION</command> defines a new encoding
+-   conversion.  Conversion names may be used in the <function>convert</function> function
++   
++   <command>CREATE CONVERSION</command> defines a new conversion between
++   character set encodings.  Conversion names may be used in the
++   <function>convert</function> function
+    to specify a particular encoding conversion.  Also, conversions that
+-   are marked <literal>DEFAULT</> can be used for automatic encoding conversion between
++   are marked <literal>DEFAULT</> can be used for automatic encoding
++   conversion between   
+    client and server. For this purpose, two conversions, from encoding A to
+    B <emphasis>and</emphasis> from encoding B to A, must be defined.
+  </para>
+@@ -109,7 +112,7 @@
+     integer,  -- source encoding ID
+     integer,  -- destination encoding ID
+     cstring,  -- source string (null terminated C string)
+-    cstring,  -- destination string (null terminated C string)
++    internal,  -- destination string (null terminated C string)
+     integer   -- source string length
+ ) RETURNS void;
+ </programlisting>

Added: tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1410.patch
===================================================================
--- tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1410.patch	2005-05-06 18:01:35 UTC (rev 6294)
+++ tinysofa/releases/classic/2.0/postgresql/current/sources/postgresql-7.4.7-CAN-2005-1410.patch	2005-05-06 20:16:04 UTC (rev 6295)
@@ -0,0 +1,80 @@
+--- postgresql-7.4.7-old/contrib/tsearch2/tsearch.sql.in.old	2005-05-06 13:20:29.476535472 +0000
++++ postgresql-7.4.7-old/contrib/tsearch2/tsearch.sql.in	2005-05-06 13:22:19.077873536 +0000
+@@ -44,7 +44,7 @@
+ 	with (isstrict);
+ 
+ --built-in dictionaries
+-CREATE FUNCTION dex_init(text)
++CREATE FUNCTION dex_init(internal)
+ 	returns internal
+ 	as 'MODULE_PATHNAME' 
+ 	language 'C';
+@@ -63,7 +63,7 @@
+ 	'Simple example of dictionary.'
+ ;
+ 	 
+-CREATE FUNCTION snb_en_init(text)
++CREATE FUNCTION snb_en_init(internal)
+ 	returns internal
+ 	as 'MODULE_PATHNAME' 
+ 	language 'C';
+@@ -82,7 +82,7 @@
+ 	'English Stemmer. Snowball.'
+ ;
+ 
+-CREATE FUNCTION snb_ru_init(text)
++CREATE FUNCTION snb_ru_init(internal)
+ 	returns internal
+ 	as 'MODULE_PATHNAME' 
+ 	language 'C';
+@@ -95,7 +95,7 @@
+ 	'Russian Stemmer. Snowball.'
+ ;
+ 	 
+-CREATE FUNCTION spell_init(text)
++CREATE FUNCTION spell_init(internal)
+ 	returns internal
+ 	as 'MODULE_PATHNAME' 
+ 	language 'C';
+@@ -114,7 +114,7 @@
+ 	'ISpell interface. Must have .dict and .aff files'
+ ;
+ 
+-CREATE FUNCTION syn_init(text)
++CREATE FUNCTION syn_init(internal)
+ 	returns internal
+ 	as 'MODULE_PATHNAME' 
+ 	language 'C';
+--- postgresql-7.4.7-old/contrib/tsearch2/untsearch.sql.in.old	2005-05-06 13:22:27.103653432 +0000
++++ postgresql-7.4.7-old/contrib/tsearch2/untsearch.sql.in	2005-05-06 13:23:48.641257832 +0000
+@@ -34,14 +34,14 @@
+ DROP FUNCTION lexize(text);
+ DROP FUNCTION set_curdict(int);
+ DROP FUNCTION set_curdict(text);
+-DROP FUNCTION dex_init(text);
++DROP FUNCTION dex_init(internal);
+ DROP FUNCTION dex_lexize(internal,internal,int4);
+-DROP FUNCTION snb_en_init(text);
++DROP FUNCTION snb_en_init(internal);
+ DROP FUNCTION snb_lexize(internal,internal,int4);
+-DROP FUNCTION snb_ru_init(text);
+-DROP FUNCTION spell_init(text);
++DROP FUNCTION snb_ru_init(internal);
++DROP FUNCTION spell_init(internal);
+ DROP FUNCTION spell_lexize(internal,internal,int4);
+-DROP FUNCTION syn_init(text);
++DROP FUNCTION syn_init(internal);
+ DROP FUNCTION syn_lexize(internal,internal,int4);
+ DROP FUNCTION set_curprs(int);
+ DROP FUNCTION set_curprs(text);
+--- postgresql-7.4.7-old/contrib/tsearch2/gendict/sql.IN.old	2005-05-06 13:24:49.357027632 +0000
++++ postgresql-7.4.7-old/contrib/tsearch2/gendict/sql.IN	2005-05-06 13:25:04.771684248 +0000
+@@ -1,7 +1,7 @@
+ SET search_path = public;
+ BEGIN;
+ 
+-HASINIT create function dinit_CFG_MODNAME(text)
++HASINIT create function dinit_CFG_MODNAME(internal)
+ HASINIT         returns internal
+ HASINIT         as 'MODULE_PATHNAME'
+ HASINIT         language 'C';

Modified: tinysofa/releases/classic/2.0/postgresql/current/specs/postgresql.spec
===================================================================
--- tinysofa/releases/classic/2.0/postgresql/current/specs/postgresql.spec	2005-05-06 18:01:35 UTC (rev 6294)
+++ tinysofa/releases/classic/2.0/postgresql/current/specs/postgresql.spec	2005-05-06 20:16:04 UTC (rev 6295)
@@ -8,7 +8,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 7.4.7
-Release: 2jh
+Release: 3jh
 License: BSD
 Group: main
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -34,6 +34,9 @@
 # Not in use
 Patch4: postgresql-7.3.2-rpm.patch
 Patch5: rpm-multilib-7.4.7.patch
+Patch6: postgresql-7.4.7-CAN-2005-1410.patch
+Patch7: postgresql-7.4.7-CAN-2005-0247.patch
+Patch8: postgresql-7.4.7-CAN-2005-1409.patch
 Requires: glibc shadow-utils initscripts zlib >= 1.1.4
 Requires: %{name}-libs = %{version}-%{release}
 BuildRequires: perl gcc sed readline-devel ncurses-devel zlib-devel openssl-devel pam-devel
@@ -163,12 +166,15 @@
 %setup -q
 %patch2 -p1 -b .plperl
 %patch5 -p1 -b .multilib
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 chmod -R go-w . || :
 chown -R $USER. . || :
 
+
 %build
-
 CFLAGS=`echo $RPM_OPT_FLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
 export CXXFLAGS="$CFLAGS"
 
@@ -651,6 +657,9 @@
 
 
 %changelog
+* Fri May  6 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.4.7-3jh
+- fix CAN-2005-1410, CAN-2005-0247, CAN-2005-1409
+
 * Tue Feb  1 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.4.7-1jh
 - 7.4.7, which fixes several security issues
 



From svn at tinysofa.org  Sat May  7 06:06:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 02:06:28 -0400 (EDT)
Subject: [tinysofa-svn] r6296 - contrib/1.1/irssi/current/specs
Message-ID: <20050507060628.84E50344BDD@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 02:06:21 -0400 (Sat, 07 May 2005)
New Revision: 6296

Modified:
   contrib/1.1/irssi/current/specs/irssi.spec
Log:
- ssl support


Modified: contrib/1.1/irssi/current/specs/irssi.spec
===================================================================
--- contrib/1.1/irssi/current/specs/irssi.spec	2005-05-06 20:16:04 UTC (rev 6295)
+++ contrib/1.1/irssi/current/specs/irssi.spec	2005-05-07 06:06:21 UTC (rev 6296)
@@ -1,11 +1,12 @@
 Name: irssi
 Version: 0.8.9
-Release: 3jh
+Release: 4jh
 Summary: Irssi is an IRC client
 License: GPL
 Group: contrib
 BuildRequires: pkgconfig glib-devel >= 2 ncurses-devel perl-devel
 BuildRequires: gcc-c++
+BuildRequires: openssl-devel
 URL: http://irssi.org/
 Source: http://irssi.org/irssi/files/irssi-%{version}.tar.bz2
 Requires: perl 
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sat May  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.8.9-4jh
+- add ssl support
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.8.9-3jh
 - current (0.8.9-3jh) integrated as 0.8.9-3jh
 



From svn at tinysofa.org  Sat May  7 09:07:12 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 05:07:12 -0400 (EDT)
Subject: [tinysofa-svn] r6297 - contrib/classic/2.0/clamav/current/specs
Message-ID: <20050507090712.1CFA9344B72@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 05:07:06 -0400 (Sat, 07 May 2005)
New Revision: 6297

Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
- add bzip2 support

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-07 06:06:21 UTC (rev 6296)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-07 09:07:06 UTC (rev 6297)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
 Version: 0.84
-Release: 3gd
+Release: 4jh
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -13,7 +13,7 @@
 Source7: freshclam.logrotate
 Source8: freshclam.conf
 Source10: clamd.conf
-BuildRequires: sed, zlib-devel, gmp-devel
+BuildRequires: sed, zlib-devel, gmp-devel, bzip2-devel
 BuildRequires: zlib, gmp
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sat May  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-4jh
+- add bzip2 support
+
 * Fri May  6 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-3gd
 - fixed typo in init script
 



From svn at tinysofa.org  Sat May  7 09:18:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 05:18:00 -0400 (EDT)
Subject: [tinysofa-svn] r6298 - contrib/classic/2.0
Message-ID: <20050507091800.24DE934494F@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 05:17:48 -0400 (Sat, 07 May 2005)
New Revision: 6298

Added:
   contrib/classic/2.0/irssi/
Log:
- copy from 1.1


Copied: contrib/classic/2.0/irssi (from rev 6297, contrib/1.1/irssi)



From svn at tinysofa.org  Sat May  7 09:25:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 05:25:48 -0400 (EDT)
Subject: [tinysofa-svn] r6299 - in contrib/1.1/slrn/current: sources specs
Message-ID: <20050507092548.8AB8B344BD9@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 05:25:11 -0400 (Sat, 07 May 2005)
New Revision: 6299

Added:
   contrib/1.1/slrn/current/sources/slrn-0.9.8.0-config.patch
   contrib/1.1/slrn/current/sources/slrn-0.9.8.1-gcc4.patch
   contrib/1.1/slrn/current/sources/slrn-0.9.8.1.tar.bz2
Removed:
   contrib/1.1/slrn/current/sources/slrn-0.9.7.3-config.patch
   contrib/1.1/slrn/current/sources/slrn-0.9.7.4-utf8.patch
   contrib/1.1/slrn/current/sources/slrn-0.9.7.4.tar.bz2
Modified:
   contrib/1.1/slrn/current/sources/slrnpull-expire
   contrib/1.1/slrn/current/specs/slrn.spec
Log:
- 0.9.8.1

Deleted: contrib/1.1/slrn/current/sources/slrn-0.9.7.3-config.patch
===================================================================
--- contrib/1.1/slrn/current/sources/slrn-0.9.7.3-config.patch	2005-05-07 09:17:48 UTC (rev 6298)
+++ contrib/1.1/slrn/current/sources/slrn-0.9.7.3-config.patch	2005-05-07 09:25:11 UTC (rev 6299)
@@ -1,20 +0,0 @@
---- slrn-0.9.7.3/src/slrnfeat.h.config	Sat Nov  3 10:16:00 2001
-+++ slrn-0.9.7.3/src/slrnfeat.h	Tue Dec  4 13:59:10 2001
-@@ -167,7 +167,7 @@
- /* #define OUR_ORGANIZATION "organization-name" */
- /* #define OUR_HOSTNAME "host.name.here" */
- /* #define NNTPSERVER_NAME  "my.server.name" */
--/* #define NNTPSERVER_FILE		"/usr/local/lib/news/nntp_server" */
-+#define NNTPSERVER_FILE		"/usr/lib/news/nntp_server"
- 
- #if SLRN_HAS_GROUPLENS
- # undef SLRN_USE_SLTCP
-@@ -177,7 +177,7 @@
- /* The rest of the files apply to slrnpull. */
- 
- /* This must be set to an absolute pathname. */
--#define SLRNPULL_ROOT_DIR	"/var/spool/news/slrnpull"
-+#define SLRNPULL_ROOT_DIR	"/var/spool/slrnpull"
- 
- /* The remaing variables are specified as relative names with respect to the
-  * SLRNPULL_ROOT_DIR.

Deleted: contrib/1.1/slrn/current/sources/slrn-0.9.7.4-utf8.patch
===================================================================
--- contrib/1.1/slrn/current/sources/slrn-0.9.7.4-utf8.patch	2005-05-07 09:17:48 UTC (rev 6298)
+++ contrib/1.1/slrn/current/sources/slrn-0.9.7.4-utf8.patch	2005-05-07 09:25:11 UTC (rev 6299)
@@ -1,103 +0,0 @@
-Only in slrn-0.9.7.4: config.cache
-Only in slrn-0.9.7.4: config.h
-Only in slrn-0.9.7.4: config.log
-Only in slrn-0.9.7.4: config.status
-Only in slrn-0.9.7.4/doc: Makefile
-Only in slrn-0.9.7.4/doc/tm: Makefile
-Only in slrn-0.9.7.4/intl: Makefile
-Only in slrn-0.9.7.4: Makefile
-Only in slrn-0.9.7.4/po: Makefile
-Only in slrn-0.9.7.4/po: Makefile.in
-Only in slrn-0.9.7.4/po: POTFILES
-diff -ru slrn-0.9.7.4-old/src/art.c slrn-0.9.7.4/src/art.c
---- slrn-0.9.7.4-old/src/art.c	2002-03-12 07:48:44.000000000 -0500
-+++ slrn-0.9.7.4/src/art.c	2002-07-08 23:57:28.000000000 -0400
-@@ -7661,7 +7661,7 @@
- 
- static void draw_tree (Slrn_Header_Type *h) /*{{{*/
- {
--   unsigned char buf[2];
-+   SLsmg_Char_Type buf[2];
- 
- #if !defined(IBMPC_SYSTEM)
-    if (Graphic_Chars_Mode == 0)
-@@ -7683,7 +7683,7 @@
- 	buf[0] = Graphic_UTee_Char;
- 	buf[1] = Graphic_HLine_Char;
- 	SLsmg_forward (-1);
--	smg_write_char (Graphic_ULCorn_Char);
-+	SLsmg_write_char (Graphic_ULCorn_Char);
-      }
-    else if ((h->sister == NULL) ||
- 	    ((h->sister->flags & FAKE_PARENT) && ((h->flags & FAKE_PARENT) == 0)))
-@@ -7696,7 +7696,8 @@
- 	buf[0] = Graphic_LTee_Char;
- 	buf[1] = Graphic_HLine_Char;
-      }
--   slrn_write_nchars ((char *) buf, 2);
-+   SLsmg_write_char(buf[0]);
-+   SLsmg_write_char(buf[1]);
- 
- #if !defined(IBMPC_SYSTEM)
-    if (Graphic_Chars_Mode == ALT_CHAR_SET_MODE) SLsmg_set_char_set (0);
-Only in slrn-0.9.7.4/src: art_misc.o
-Only in slrn-0.9.7.4/src: art.o
-Only in slrn-0.9.7.4/src: art_sort.o
-Only in slrn-0.9.7.4/src: chkslang
-Only in slrn-0.9.7.4/src: chkslang.o
-Only in slrn-0.9.7.4/src: chmap.o
-Only in slrn-0.9.7.4/src: config.h
-Only in slrn-0.9.7.4/src: decode.o
-Only in slrn-0.9.7.4/src: editscore.o
-Only in slrn-0.9.7.4/src: group.o
-Only in slrn-0.9.7.4/src: grplens.o
-Only in slrn-0.9.7.4/src: hash.o
-Only in slrn-0.9.7.4/src: help.o
-Only in slrn-0.9.7.4/src: hooks.o
-Only in slrn-0.9.7.4/src: interp.o
-Only in slrn-0.9.7.4/src: Makefile
-Only in slrn-0.9.7.4/src: menu.o
-Only in slrn-0.9.7.4/src: mime.o
-Only in slrn-0.9.7.4/src: misc.o
-Only in slrn-0.9.7.4/src: nntplib.o
-Only in slrn-0.9.7.4/src: post.o
-Only in slrn-0.9.7.4/src: print.o
-Only in slrn-0.9.7.4/src: score.o
-Only in slrn-0.9.7.4/src: server.o
-Only in slrn-0.9.7.4/src: slrn
-diff -ru slrn-0.9.7.4-old/src/slrn.c slrn-0.9.7.4/src/slrn.c
---- slrn-0.9.7.4-old/src/slrn.c	2002-02-26 20:50:08.000000000 -0500
-+++ slrn-0.9.7.4/src/slrn.c	2002-07-08 23:55:19.000000000 -0400
-@@ -130,12 +130,12 @@
- 
- FILE *Slrn_Debug_Fp = NULL;
- 
--int Graphic_LTee_Char = SLSMG_LTEE_CHAR;
--int Graphic_UTee_Char = SLSMG_UTEE_CHAR;
--int Graphic_LLCorn_Char = SLSMG_LLCORN_CHAR;
--int Graphic_HLine_Char = SLSMG_HLINE_CHAR;
--int Graphic_VLine_Char = SLSMG_VLINE_CHAR;
--int Graphic_ULCorn_Char = SLSMG_ULCORN_CHAR;
-+SLsmg_Char_Type Graphic_LTee_Char;
-+SLsmg_Char_Type Graphic_UTee_Char;
-+SLsmg_Char_Type Graphic_LLCorn_Char;
-+SLsmg_Char_Type Graphic_HLine_Char;
-+SLsmg_Char_Type Graphic_VLine_Char;
-+SLsmg_Char_Type Graphic_ULCorn_Char;
- 
- int Graphic_Chars_Mode = ALT_CHAR_SET_MODE;
- 
-Only in slrn-0.9.7.4/src: slrndir.o
-Only in slrn-0.9.7.4/src: slrn.o
-Only in slrn-0.9.7.4/src: slrnpull
-Only in slrn-0.9.7.4/src: slrnpull.o
-Only in slrn-0.9.7.4/src: snprintf.o
-Only in slrn-0.9.7.4/src: sortdate.o
-Only in slrn-0.9.7.4/src: stamp2
-Only in slrn-0.9.7.4/src: stamp-h
-Only in slrn-0.9.7.4/src: startup.o
-Only in slrn-0.9.7.4/src: ttymsg.o
-Only in slrn-0.9.7.4/src: util.o
-Only in slrn-0.9.7.4/src: version.o
-Only in slrn-0.9.7.4/src: vfile.o
-Only in slrn-0.9.7.4/src: xover.o

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

Added: contrib/1.1/slrn/current/sources/slrn-0.9.8.0-config.patch
===================================================================
--- contrib/1.1/slrn/current/sources/slrn-0.9.8.0-config.patch	2005-05-07 09:17:48 UTC (rev 6298)
+++ contrib/1.1/slrn/current/sources/slrn-0.9.8.0-config.patch	2005-05-07 09:25:11 UTC (rev 6299)
@@ -0,0 +1,11 @@
+--- slrn-0.9.8.0/src/slrnfeat.h.config	2003-07-30 15:36:32.000000000 +0200
++++ slrn-0.9.8.0/src/slrnfeat.h	2004-10-06 15:47:45.532559472 +0200
+@@ -162,7 +162,7 @@
+ /* The rest of the files apply to slrnpull. */
+ 
+ /* This must be set to an absolute pathname. */
+-#define SLRNPULL_ROOT_DIR	"/var/spool/news/slrnpull"
++#define SLRNPULL_ROOT_DIR	"/var/spool/slrnpull"
+ 
+ /* The remaing variables are specified as relative names with respect to the
+  * SLRNPULL_ROOT_DIR.

Added: contrib/1.1/slrn/current/sources/slrn-0.9.8.1-gcc4.patch
===================================================================
--- contrib/1.1/slrn/current/sources/slrn-0.9.8.1-gcc4.patch	2005-05-07 09:17:48 UTC (rev 6298)
+++ contrib/1.1/slrn/current/sources/slrn-0.9.8.1-gcc4.patch	2005-05-07 09:25:11 UTC (rev 6299)
@@ -0,0 +1,42 @@
+--- slrn-0.9.8.1/src/art.c.gcc4	2004-10-07 01:44:02.000000000 +0200
++++ slrn-0.9.8.1/src/art.c	2005-03-07 14:44:42.030531560 +0100
+@@ -7085,7 +7085,7 @@ static void art_mouse (void (*top_status
+      {
+ 	if (Slrn_Highlight_Urls && (c < 255))
+ 	  {
+-	     unsigned short buf[255];
++	     SLsmg_Char_Type buf[255];
+ 	     char line[512];
+ 	     char *url = NULL;
+ 	     unsigned int len, i;
+--- slrn-0.9.8.1/src/mime.c.gcc4	2004-08-15 01:09:20.000000000 +0200
++++ slrn-0.9.8.1/src/mime.c	2005-03-07 14:39:28.760155896 +0100
+@@ -1288,7 +1288,7 @@ static int min_encode (unsigned char *fr
+ 	  {
+ 	     len = eword - bword;
+ 	     if ((int)max < len) return -1;
+-	     strncpy (dest, bword, len);
++	     strncpy ((char*)dest, (const char*)bword, len);
+ 	     dest += len; max -= len; total += len;
+ 	     Keyword_Len = 0;
+ 	  }
+@@ -1330,7 +1330,7 @@ static int encode_quoted_string (unsigne
+      {
+ 	int len = end + 1 - *from;
+ 	if ((int)max <= len) return -1;
+-	strncpy (dest, *from, len);
++	strncpy ((char*)dest, (const char*)*from, len);
+ 	dest[len] = '\0';
+ 	*from = end + 1;
+ 	return len;
+--- slrn-0.9.8.1/src/misc.c.gcc4	2004-09-27 23:30:35.000000000 +0200
++++ slrn-0.9.8.1/src/misc.c	2005-03-07 14:39:28.762155592 +0100
+@@ -1842,7 +1842,7 @@ static void generic_mini_complete (int c
+    slrn_strncpy (buf, (char *) Slrn_Keymap_RLI->buf, n);
+    n = 0;
+    
+-   if (strcmp (Slrn_Keymap_RLI->buf, prevcall) ||
++   if (strcmp ((const char*)Slrn_Keymap_RLI->buf, prevcall) ||
+        (Slrn_Keymap_RLI->point != lastpoint) ||
+        (0 == In_Completion))
+      {

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


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

Modified: contrib/1.1/slrn/current/sources/slrnpull-expire
===================================================================
--- contrib/1.1/slrn/current/sources/slrnpull-expire	2005-05-07 09:17:48 UTC (rev 6298)
+++ contrib/1.1/slrn/current/sources/slrnpull-expire	2005-05-07 09:25:11 UTC (rev 6299)
@@ -2,5 +2,5 @@
 
 umask 022
 if [ -d /var/spool/slrnpull ]; then
-	exec su news -c 'slrnpull --expire'
+	exec runuser news -c 'slrnpull --expire'
 fi

Modified: contrib/1.1/slrn/current/specs/slrn.spec
===================================================================
--- contrib/1.1/slrn/current/specs/slrn.spec	2005-05-07 09:17:48 UTC (rev 6298)
+++ contrib/1.1/slrn/current/specs/slrn.spec	2005-05-07 09:25:11 UTC (rev 6299)
@@ -1,5 +1,5 @@
 Name: slrn
-Version: 0.9.7.4
+Version: 0.9.8.1
 Release: 1jh
 License: GPL
 Group: contrib
@@ -7,9 +7,9 @@
 Source1: slrnpull-expire
 Source2: slrnpull.log
 Source4: README.rpm-slrnpull
-Patch0: slrn-0.9.7.3-config.patch
-Patch2: slrn-scorefile.patch
-Patch3: slrn-0.9.7.4-utf8.patch
+Patch0: slrn-0.9.8.0-config.patch
+Patch1: slrn-scorefile.patch
+Patch2: slrn-0.9.8.1-gcc4.patch
 Requires: slang >= 1.2.2
 BuildRequires: slang-devel openssl-devel pkgconfig postfix gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -36,14 +36,15 @@
 %prep
 %setup -q
 %patch0 -p1 -b .config
-%patch2 -p1 -b .scorefile
-%patch3 -p1 -b .utf8
+%patch1 -p1 -b .scorefile
+%patch2 -p1 -b .gcc4
 
 %build
 if pkg-config openssl ; then
 	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
+export CFLAGS="$RPM_OPT_FLAGS"
 slrn_cv_domain=no %configure --with-ssl --with-slrnpull \
  --with-ssl-includes=%{_includedir} --with-ssl-library=%{_libdir} \
  --enable-setgid-code
@@ -55,6 +56,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc
 install -m644 doc/slrn.rc $RPM_BUILD_ROOT/etc/slrn.rc
+mkdir -p $RPM_BUILD_ROOT/usr/share/slrn/contrib
+install -m644 contrib/README* $RPM_BUILD_ROOT/usr/share/slrn/contrib
+install -m755 contrib/cleanscore contrib/slrnrc-conv $RPM_BUILD_ROOT/usr/share/slrn/contrib
 
 # slrnpull stuff
 mkdir -p $RPM_BUILD_ROOT/etc/{cron.daily,logrotate.d}
@@ -70,7 +74,6 @@
 # remove unpackaged files from the buildroot
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/slrn
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/slrnpull.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,9 +95,14 @@
 %attr(2750,root,news) /usr/bin/slrnpull
 %attr(775,news,news) %dir /var/spool/slrnpull
 %attr(3777,news,news) %dir /var/spool/slrnpull/out.going
-%attr(644,news,news) %config /var/spool/slrnpull/slrnpull.conf
+%attr(644,news,news) %config(noreplace) /var/spool/slrnpull/slrnpull.conf
+%{_mandir}/man1/slrnpull.1*
 
+
 %changelog
+* Sat May  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.9.8.1-1jh
+- 0.9.8.1
+
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 



From svn at tinysofa.org  Sat May  7 09:27:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 05:27:28 -0400 (EDT)
Subject: [tinysofa-svn] r6300 - contrib/classic/2.0
Message-ID: <20050507092728.92C21344814@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 05:27:16 -0400 (Sat, 07 May 2005)
New Revision: 6300

Added:
   contrib/classic/2.0/slrn/
Log:
- copy from 1.1


Copied: contrib/classic/2.0/slrn (from rev 6299, contrib/1.1/slrn)



From svn at tinysofa.org  Sat May  7 09:27:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 05:27:59 -0400 (EDT)
Subject: [tinysofa-svn] r6301 - contrib/classic/2.0
Message-ID: <20050507092759.0B221344814@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 05:27:47 -0400 (Sat, 07 May 2005)
New Revision: 6301

Added:
   contrib/classic/2.0/dtach/
Log:
- copy from 1.1


Copied: contrib/classic/2.0/dtach (from rev 6300, contrib/1.1/dtach)



From svn at tinysofa.org  Sat May  7 15:32:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  7 May 2005 11:32:35 -0400 (EDT)
Subject: [tinysofa-svn] r6302 - contrib/classic/2.0/slrn/current/sources
Message-ID: <20050507153235.6C655344BE6@minbar.tinysofa.org>

Author: jh
Date: 2005-05-07 11:32:29 -0400 (Sat, 07 May 2005)
New Revision: 6302

Modified:
   contrib/classic/2.0/slrn/current/sources/slrnpull-expire
Log:
- runuser -> su


Modified: contrib/classic/2.0/slrn/current/sources/slrnpull-expire
===================================================================
--- contrib/classic/2.0/slrn/current/sources/slrnpull-expire	2005-05-07 09:27:47 UTC (rev 6301)
+++ contrib/classic/2.0/slrn/current/sources/slrnpull-expire	2005-05-07 15:32:29 UTC (rev 6302)
@@ -2,5 +2,5 @@
 
 umask 022
 if [ -d /var/spool/slrnpull ]; then
-	exec runuser news -c 'slrnpull --expire'
+	exec su news -c 'slrnpull --expire'
 fi



From svn at tinysofa.org  Sun May  8 16:43:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  8 May 2005 12:43:43 -0400 (EDT)
Subject: [tinysofa-svn] r6303 - in
	tinysofa/releases/classic/2.0/grsecurity/current: sources specs
Message-ID: <20050508164343.6B9E4344CAD@minbar.tinysofa.org>

Author: jh
Date: 2005-05-08 12:43:32 -0400 (Sun, 08 May 2005)
New Revision: 6303

Added:
   tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050508.tar
Removed:
   tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050316.tar
Modified:
   tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec
Log:
- update policies


Deleted: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050316.tar
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050508.tar
===================================================================
(Binary files differ)


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

Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec	2005-05-07 15:32:29 UTC (rev 6302)
+++ tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec	2005-05-08 16:43:32 UTC (rev 6303)
@@ -1,8 +1,8 @@
-%define policies_date	20050316
+%define policies_date	20050508
 Summary: grsecurity user space utilities and policies
 Name: grsecurity
 Version: 2.1.3
-Release: 2jh
+Release: 3jh
 Source0: gradm-%{version}-200503070918.tar.gz
 Source1: grsec.init
 Source2: policies-%{policies_date}.tar



From svn at tinysofa.org  Sun May  8 16:53:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  8 May 2005 12:53:35 -0400 (EDT)
Subject: [tinysofa-svn] r6304 - contrib/classic/2.0/mach/current/specs
Message-ID: <20050508165335.6A52D344CDC@minbar.tinysofa.org>

Author: jh
Date: 2005-05-08 12:53:29 -0400 (Sun, 08 May 2005)
New Revision: 6304

Modified:
   contrib/classic/2.0/mach/current/specs/mach.spec
Log:
- don't replace the config file


Modified: contrib/classic/2.0/mach/current/specs/mach.spec
===================================================================
--- contrib/classic/2.0/mach/current/specs/mach.spec	2005-05-08 16:43:32 UTC (rev 6303)
+++ contrib/classic/2.0/mach/current/specs/mach.spec	2005-05-08 16:53:29 UTC (rev 6304)
@@ -104,7 +104,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
 %dir %{_sysconfdir}/mach
-%attr(644,root,root) %config %{_sysconfdir}/mach/conf
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/mach/conf
 %config %{_sysconfdir}/mach/location
 %config %{_sysconfdir}/mach/dist.d
 %attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach



From svn at tinysofa.org  Sun May  8 18:15:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  8 May 2005 14:15:25 -0400 (EDT)
Subject: [tinysofa-svn] r6305 - contrib/classic/2.0
Message-ID: <20050508181525.37389344C39@minbar.tinysofa.org>

Author: jh
Date: 2005-05-08 14:15:13 -0400 (Sun, 08 May 2005)
New Revision: 6305

Added:
   contrib/classic/2.0/tinysofa-utils/
Log:
- copy to 2.0


Copied: contrib/classic/2.0/tinysofa-utils (from rev 6304, contrib/1.1/tinysofa-utils)



From svn at tinysofa.org  Sun May  8 18:19:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  8 May 2005 14:19:30 -0400 (EDT)
Subject: [tinysofa-svn] r6306 -
	contrib/classic/2.0/tinysofa-utils/current/specs
Message-ID: <20050508181930.80E1E344BB5@minbar.tinysofa.org>

Author: jh
Date: 2005-05-08 14:19:24 -0400 (Sun, 08 May 2005)
New Revision: 6306

Modified:
   contrib/classic/2.0/tinysofa-utils/current/specs/tinysofa-utils.spec
Log:
- update for 2.0


Modified: contrib/classic/2.0/tinysofa-utils/current/specs/tinysofa-utils.spec
===================================================================
--- contrib/classic/2.0/tinysofa-utils/current/specs/tinysofa-utils.spec	2005-05-08 18:15:13 UTC (rev 6305)
+++ contrib/classic/2.0/tinysofa-utils/current/specs/tinysofa-utils.spec	2005-05-08 18:19:24 UTC (rev 6306)
@@ -1,6 +1,6 @@
 Name: tinysofa-utils
 Version: 2.0
-Release: 8jh
+Release: 9jh
 URL: http://www.tinysofa.org
 Summary: tinysofa utilities
 Source1: tsbuild
@@ -18,9 +18,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: coreutils
 Requires: rpm python rpm-python
-# for tsrelease (swup requirements should be removed for 1.2)
-Requires: anaconda-runtime mkisofs gnupg rdfgen apt
-
+# for rel.sh
+Requires: anaconda-runtime mkisofs gnupg apt
 Requires: mktemp
 BuildArch: noarch
 
@@ -28,18 +27,21 @@
 The tinysofa utils is a set of utilities and scripts that are made
 in the development process, and that really fit in no other package. 
 
-This includes the tsrep, tsbuild, tsintegrate and tsrelease utlities.
+This includes the tsrep, tsbuild, tsintegrate and tsrel utlities.
 
+
 %prep
 # satisfy rpm
 
+
 %install
 install -d $RPM_BUILD_ROOT%{_datadir}/tinysofa-utils
 install -m755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsbuild
 install -m755 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsintegrate
 install -m755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsrep
 install -m755 %{SOURCE4} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsunpack_rpm
-install -m755 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsrelease
+# don't install tsrelease for 2.0
+#install -m755 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsrelease
 install -m755 %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/unpackrpm
 install -m755 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsmakesrpm
 install -m755 %{SOURCE8} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/tsmkdir
@@ -47,15 +49,21 @@
 
 install -m755 %{SOURCE10} ${RPM_BUILD_ROOT}%{_datadir}/tinysofa-utils/rel.sh
 
+
 %clean
 %clean_buildroot
 
+
 %files
 %defattr(0755,root,root)
 %dir %{_datadir}/tinysofa-utils
 %{_datadir}/tinysofa-utils/*
 
+
 %changelog
+* Sun May  8 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.0-9jh
+- don't install tsrelease anymore
+
 * Sun Feb 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.0-8jh
 - add classic server 1.2 release script rel.sh
 



From svn at tinysofa.org  Mon May  9 06:08:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  9 May 2005 02:08:24 -0400 (EDT)
Subject: [tinysofa-svn] r6307 -
	contrib/classic/2.0/tinysofa-utils/current/sources
Message-ID: <20050509060824.AA84B344B64@minbar.tinysofa.org>

Author: jh
Date: 2005-05-09 02:08:18 -0400 (Mon, 09 May 2005)
New Revision: 6307

Modified:
   contrib/classic/2.0/tinysofa-utils/current/sources/rel.sh
Log:
- update for final 2.0


Modified: contrib/classic/2.0/tinysofa-utils/current/sources/rel.sh
===================================================================
--- contrib/classic/2.0/tinysofa-utils/current/sources/rel.sh	2005-05-08 18:19:24 UTC (rev 6306)
+++ contrib/classic/2.0/tinysofa-utils/current/sources/rel.sh	2005-05-09 06:08:18 UTC (rev 6307)
@@ -6,8 +6,8 @@
 #
 
 ARCH=`uname -m | sed -e 's/i.86/i586/'`
-distname="classic-1.2-test1"
-release="1.1.99"
+distname="Ceara"
+release="2.0"
 
 comps="$1"
 cdroot="$2"
@@ -25,7 +25,7 @@
 	arch="$ARCH"
 	bootimg="isolinux/isolinux.bin"
 	bootcat="isolinux/boot.cat"
-	myname="tinysofa <http://www.tinysofa.org/>"
+	myname="tinysofa <http://classic.tinysofa.org/>"
 	mkisopts="-R -J -T"
 	bootopts="-no-emul-boot -boot-load-size 4 -boot-info-table"
 	isoname="$distname.$arch.iso"



From svn at tinysofa.org  Mon May  9 06:42:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  9 May 2005 02:42:44 -0400 (EDT)
Subject: [tinysofa-svn] r6308 - in contrib/1.1/clamav/current: sources specs
Message-ID: <20050509064244.E9DBA344BF9@minbar.tinysofa.org>

Author: jh
Date: 2005-05-09 02:42:36 -0400 (Mon, 09 May 2005)
New Revision: 6308

Modified:
   contrib/1.1/clamav/current/sources/freshclam.sh
   contrib/1.1/clamav/current/specs/clamav.spec
Log:
- merge from 2.0


Modified: contrib/1.1/clamav/current/sources/freshclam.sh
===================================================================
--- contrib/1.1/clamav/current/sources/freshclam.sh	2005-05-09 06:08:18 UTC (rev 6307)
+++ contrib/1.1/clamav/current/sources/freshclam.sh	2005-05-09 06:42:36 UTC (rev 6308)
@@ -26,7 +26,7 @@
 prog=freshclam
 path=/usr/bin/freshclam
 
-ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on- error-execute=$ONERROR $FRESHOPTIONS"
+ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on-error-execute=$ONERROR $FRESHOPTIONS"
 
 if [ $HTTPPROXY ] ; then
    ALLOPTIONS=$ALLOPTIONS" --http-proxy=$HTTPPROXY --proxy-user=$PROXYUSER"

Modified: contrib/1.1/clamav/current/specs/clamav.spec
===================================================================
--- contrib/1.1/clamav/current/specs/clamav.spec	2005-05-09 06:08:18 UTC (rev 6307)
+++ contrib/1.1/clamav/current/specs/clamav.spec	2005-05-09 06:42:36 UTC (rev 6308)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
 Version: 0.84
-Release: 2gd
+Release: 4jh
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -13,7 +13,7 @@
 Source7: freshclam.logrotate
 Source8: freshclam.conf
 Source10: clamd.conf
-BuildRequires: sed, zlib-devel, gmp-devel
+BuildRequires: sed, zlib-devel, gmp-devel, bzip2-devel
 BuildRequires: zlib, gmp
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -178,6 +178,12 @@
 
 
 %changelog
+* Sat May  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-4jh
+- add bzip2 support
+
+* Fri May  6 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-3gd
+- fixed typo in init script
+
 * Tue May  3 2005 Gerald Dachs <gda at tinysofa dot org> 0.84-2gd
 - fixed init script
 



From svn at tinysofa.org  Mon May  9 16:32:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  9 May 2005 12:32:25 -0400 (EDT)
Subject: [tinysofa-svn] r6309 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050509163225.12474344C8C@minbar.tinysofa.org>

Author: jh
Date: 2005-05-09 12:31:52 -0400 (Mon, 09 May 2005)
New Revision: 6309

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/specs/kernel.spec
Log:
- use sane default for exec_shield

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-05-09 06:42:36 UTC (rev 6308)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch	2005-05-09 16:31:52 UTC (rev 6309)
@@ -5694,7 +5694,7 @@
  
 +extern unsigned int vdso_enabled;
 +
-+int exec_shield = 2;
++int exec_shield = 1;
 +int exec_shield_randomize = 1;
 +
 +static int __init setup_exec_shield(char *str)

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-09 06:42:36 UTC (rev 6308)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-09 16:31:52 UTC (rev 6309)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 12jh
+Release: 13jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -592,6 +592,9 @@
 
 
 %changelog
+* Mon May  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-13jh
+- use sane default for exec_shield
+
 * Mon May  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-12jh
 - add 2.6.11.8.patch
 



From svn at tinysofa.org  Mon May  9 17:33:26 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  9 May 2005 13:33:26 -0400 (EDT)
Subject: [tinysofa-svn] r6310 -
	tinysofa/releases/classic/2.0/cdrtools/current/specs
Message-ID: <20050509173326.C21C9344C0F@minbar.tinysofa.org>

Author: jh
Date: 2005-05-09 13:33:20 -0400 (Mon, 09 May 2005)
New Revision: 6310

Modified:
   tinysofa/releases/classic/2.0/cdrtools/current/specs/cdrtools.spec
Log:
- remove %%renames (apt doesn't handle them correctly)


Modified: tinysofa/releases/classic/2.0/cdrtools/current/specs/cdrtools.spec
===================================================================
--- tinysofa/releases/classic/2.0/cdrtools/current/specs/cdrtools.spec	2005-05-09 16:31:52 UTC (rev 6309)
+++ tinysofa/releases/classic/2.0/cdrtools/current/specs/cdrtools.spec	2005-05-09 17:33:20 UTC (rev 6310)
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01
-Release: 2jh
+Release: 3jh
 Epoch: 0
 %define tarversion 2.01
 License: GPL
@@ -37,7 +37,6 @@
 %package -n cdrecord
 Summary: A command line CD/DVD recording program.
 Group: extra
-%rename cdrtools
 
 %description -n cdrecord
 Cdrecord is an application for creating audio and data CDs. Cdrecord
@@ -47,7 +46,6 @@
 %package -n cdrecord-devel
 Summary: The libschily SCSI user level transport library.
 Group: development
-%rename cdrtools-devel
 Requires: cdrecord = %{epoch}:%{version}-%{release}
 
 %description -n cdrecord-devel
@@ -58,7 +56,6 @@
 
 %package -n mkisofs
 Summary: Creates an image of an ISO9660 filesystem.
-%rename cdrtools
 Group: extra
 
 %description -n mkisofs
@@ -222,6 +219,9 @@
 
 
 %changelog
+* Mon May  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.01-3jh
+- remove %%renames (apt doesn't handle them correctly)
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 2.01-1ts
 - current (2.01-1jh) integrated as 2.01-1ts for release 1.1-U3
 



From svn at tinysofa.org  Mon May  9 18:54:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  9 May 2005 14:54:18 -0400 (EDT)
Subject: [tinysofa-svn] r6311 - in
	tinysofa/releases/classic/2.0/anaconda/current: sources specs
Message-ID: <20050509185418.C71813448C5@minbar.tinysofa.org>

Author: jh
Date: 2005-05-09 14:54:10 -0400 (Mon, 09 May 2005)
New Revision: 6311

Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
   tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
Log:
- update modprobe patch to set correct permissions for modprobe.conf


Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-09 17:33:20 UTC (rev 6310)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-09 18:54:10 UTC (rev 6311)
@@ -1,16 +1,18 @@
---- ./packages.py.orig	2005-01-19 21:15:47.158628192 +0200
-+++ ./packages.py	2005-01-19 21:17:09.288591600 +0200
-@@ -674,6 +674,9 @@
+--- ./packages.py.modprobe.conf~	2005-05-09 21:50:12.000000000 +0300
++++ ./packages.py	2005-05-09 21:52:01.000000000 +0300
+@@ -674,6 +674,11 @@
          if os.access("/tmp/modules.conf", os.R_OK):
              iutil.copyFile("/tmp/modules.conf", 
                             instPath + "/etc/modules.conf")
++        os.chmod(instPath + "/etc/modules.conf", 0644)
 +        if os.access("/tmp/modprobe.conf", os.R_OK):
 +            iutil.copyFile("/tmp/modprobe.conf", 
 +                           instPath + "/etc/modprobe.conf")
++        os.chmod(instPath + "/etc/modprobe.conf", 0644)
  
      # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly
      f = open(instPath + "/etc/mtab", "w+")
-@@ -1032,7 +1035,7 @@
+@@ -1032,7 +1037,7 @@
  		    
                  unmountUSB = 0
                  try:

Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-09 17:33:20 UTC (rev 6310)
+++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-09 18:54:10 UTC (rev 6311)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 2jh
+Release: 3jh
 License: GPL
 Summary: installation program
 Group: development



From svn at tinysofa.org  Mon May  9 21:04:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  9 May 2005 17:04:29 -0400 (EDT)
Subject: [tinysofa-svn] r6312 -
	tinysofa/releases/classic/2.0/apt/current/sources
Message-ID: <20050509210429.08F3A344B49@minbar.tinysofa.org>

Author: jh
Date: 2005-05-09 17:04:23 -0400 (Mon, 09 May 2005)
New Revision: 6312

Modified:
   tinysofa/releases/classic/2.0/apt/current/sources/mirror-select.lua
Log:
- disable druid in another error case too


Modified: tinysofa/releases/classic/2.0/apt/current/sources/mirror-select.lua
===================================================================
--- tinysofa/releases/classic/2.0/apt/current/sources/mirror-select.lua	2005-05-09 18:54:10 UTC (rev 6311)
+++ tinysofa/releases/classic/2.0/apt/current/sources/mirror-select.lua	2005-05-09 21:04:23 UTC (rev 6312)
@@ -218,6 +218,7 @@
 local repos = parse_mirrors()
 
 if not repos then
+	disable_druid()
 	apterror(_("Mirror list not found or corrupted."))
 	return 
 end



From svn at tinysofa.org  Tue May 10 12:37:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 08:37:55 -0400 (EDT)
Subject: [tinysofa-svn] r6313 - in contrib/classic/2.0: . ipmitool
	ipmitool/current ipmitool/current/sources ipmitool/current/specs
Message-ID: <20050510123755.DB6F8344C71@minbar.tinysofa.org>

Author: jh
Date: 2005-05-10 08:37:35 -0400 (Tue, 10 May 2005)
New Revision: 6313

Added:
   contrib/classic/2.0/ipmitool/
   contrib/classic/2.0/ipmitool/current/
   contrib/classic/2.0/ipmitool/current/sources/
   contrib/classic/2.0/ipmitool/current/sources/ipmitool-1.8.1.tar.bz2
   contrib/classic/2.0/ipmitool/current/specs/
   contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec
   contrib/classic/2.0/ipmitool/pristine/
   contrib/classic/2.0/ipmitool/releases/
Log:
- add ipmitool


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


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

Added: contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec
===================================================================
--- contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec	2005-05-09 21:04:23 UTC (rev 6312)
+++ contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec	2005-05-10 12:37:35 UTC (rev 6313)
@@ -0,0 +1,173 @@
+Name: ipmitool
+Summary: Intelligent Platform Management Interface (IPMI) userspace tool
+Version: 1.8.1
+Release: 1jh
+License: BSD
+Group: contrib
+Source: %{name}-%{version}.tar.bz2
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: openssl-devel ncurses-devel
+
+%description
+This package contains a utility for interfacing with devices that support
+the Intelligent Platform Management Interface specification. IPMI is
+an open standard for machine health, inventory, and remote power control.
+
+This utility can communicate with IPMI-enabled devices through either a
+kernel driver such as OpenIPMI or over the RMCP LAN protocol defined in
+the IPMI specification. IPMIv2 adds support for encrypted LAN
+communications and remote Serial-over-LAN functionality.
+
+It provides commands for reading the Sensor Data Repository (SDR) and
+displaying sensor values, displaying the contents of the System Event
+Log (SEL), printing Field Replaceable Unit (FRU) information, reading and
+setting LAN configuration, and chassis power control.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure \
+	--enable-intf-open
+%make
+
+
+%install
+%makeinstall_std
+
+%{__rm} -fr %{buildroot}%{_datadir}/doc
+
+
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root)
+%doc README AUTHORS ChangeLog
+%{_bindir}/ipmitool
+%{_sbindir}/ipmievd
+%{_datadir}/ipmitool/*
+%{_mandir}/man1/*
+
+
+%changelog
+* Tue May 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.8.1-1jh
+- tinysofa contrib
+
+* Wed Apr 06 2005 <duncan at iceblink.org>  1.8.1-1
+ - Install ipmievd into /usr/sbin
+
+* Wed Mar 16 2005 <duncan at iceblink.org>  1.8.0-1
+ - Fix IPMIv2.0 issues
+ - Fix chassis boot parameter support
+ - Add support for linear sensors
+ - Update bmc plugin to work with new Solaris bmc driver (new ioctl
+   for interface detection and new STREAMS message-based interface)
+
+* Tue Jan 18 2005 <duncan at iceblink.org>  1.7.0-1
+ - Propogate errors correctly so exit status will be useful
+ - More consistent display of errors including completion code text
+ - Errors and debug is send to stderr now
+ - New "sel get" command that will print details about SEL entry
+   and corresponding SDR records as well as FRUs via entity association
+ - Improved event generator, now supports reading events from text file
+ - New "-o oemtype" option for specifying OEM boards
+   exsting types are "supermicro" and "intelwv2"
+ - New PEF subsystem from Tim Murphy at Dell
+ - New "bmc" plugin for Solaris 10 x86
+ - Many bugfixes and contributed patches
+ - Support for Supermicro BMC OEM authentication method
+ - Fix minor problem with LAN parameter setting
+
+* Wed Aug 18 2004 <duncan at iceblink.org>  1.6.0-1
+ - Add a README
+ - Add support for IPMIv2 and Serial-over-LAN from Newisys
+ - Add Solaris x86 lipmi interface
+ - Add support for building Solaris packages
+ - Add support for building RPMs as non-root user
+ - Fix segfault when doing "sel list" (from Matthew Braithwaite)
+ - Fix "chassis identify" on some BMCs (from ebrower at sourceforge)
+ - Add "bmc info" and related output (from ebrower at sourceforge)
+ - new "shell" and "exec" commands
+ - lots of other contributed patches
+
+* Sat May 27 2004 <duncan at iceblink.org>  1.5.9-1
+ - Add ability to get a particular sensor by name
+ - Add ability to set a particular sensor threshold
+ - Add support for displaying V2 channel authentication levels
+ - Add README for rrdtool scripts in contrib directory
+ - Improve lan interface retry handling
+ - Support prompting for password or reading from environment
+ - Move chaninfo command into channel subcommand
+ - Fix reservation ID handling when two sessions open to BMC
+ - Fix reading of large FRU data
+ - Add configure option for changing binary to ipmiadm for Solaris
+ - Fix compile problem on Solaris 8
+
+* Tue Jan 27 2004 <duncan at iceblink.org>  1.5.8-1
+ - Enable static compilation of interfaces
+ - Fix types to be 64-bit safe
+ - Fix compilation problems on Solaris
+ - Fix multiple big-endian problems for Solaris/SPARC
+ - Fix channel access to save settings to NVRAM
+ - Set channel privilege limit to ADMIN during "access on"
+ - Enable gratuitous ARP in bmcautoconf.sh
+ - Add support for Linux kernel panic messages in SEL output
+ - Add support for type 3 SDR records
+
+* Mon Jan  5 2004 <duncan at iceblink.org>  1.5.7-1
+ - add IPMIv1.5 eratta fixes
+ - additions to FRU printing and FRU multirecords
+ - better handling of SDR printing
+ - contrib scripts for creating rrdtool graphs
+
+* Thu Dec  4 2003 <duncan at iceblink.org>  1.5.6-1
+ - Fix SEL event decoding for generic events
+ - Handle empty SEL gracefully when doing "sel list"
+ - Fix sdr handling of sensors that do not return a reading
+ - Fix for CSV display of sensor readings/units from Fredrik ?hrn
+
+* Tue Nov 25 2003 <duncan at iceblink.org>  1.5.5-1
+ - Add -U option for setting LAN username
+ - Fix -v usage for plugin interfaces
+
+* Fri Nov 14 2003 <duncan at iceblink.org>  1.5.4-1
+ - pull interface plugin api into library
+ - fix ipmievd
+
+* Fri Oct 31 2003 <duncan at iceblink.org>  1.5.3-1
+ - add -g optin for pedantic ipmi-over-lan communication
+
+* Fri Oct 24 2003 <duncan at iceblink.org>  1.5.2-1
+ - add gratuitous arp interval setting
+
+* Wed Oct  8 2003 <duncan at iceblink.org>  1.5.1-1
+ - better SEL support
+ - fix display bug in SDR list
+
+* Fri Sep  5 2003 <duncan at iceblink.org>  1.5.0-1
+ - use automake/autoconf/libtool
+ - dynamic loading interface plugins
+
+* Wed May 28 2003 <duncan at iceblink.org>  1.4.0-1
+ - make UDP packet handling more robust
+ - fix imb driver support
+
+* Thu May 22 2003 <duncan at iceblink.org>  1.3-1
+ - update manpage
+ - rework of low-level network handling
+ - add basic imb driver support
+
+* Wed Apr  2 2003 <duncan at iceblink.org>  1.2-1
+ - change command line option parsing
+ - support for more chassis commands
+
+* Tue Apr  1 2003 <duncan at iceblink.org>  1.1-1
+ - minor fixes.
+
+* Sun Mar 30 2003 <duncan at iceblink.org>  1.0-1
+ - Initial release.
+



From svn at tinysofa.org  Tue May 10 12:41:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 08:41:28 -0400 (EDT)
Subject: [tinysofa-svn] r6314 - contrib/classic/2.0/ipmitool/current/specs
Message-ID: <20050510124128.3CFB1344C7F@minbar.tinysofa.org>

Author: jh
Date: 2005-05-10 08:41:22 -0400 (Tue, 10 May 2005)
New Revision: 6314

Modified:
   contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec
Log:
- own correctly %{_datadir}/ipmitool


Modified: contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec
===================================================================
--- contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec	2005-05-10 12:37:35 UTC (rev 6313)
+++ contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec	2005-05-10 12:41:22 UTC (rev 6314)
@@ -49,7 +49,7 @@
 %doc README AUTHORS ChangeLog
 %{_bindir}/ipmitool
 %{_sbindir}/ipmievd
-%{_datadir}/ipmitool/*
+%{_datadir}/ipmitool
 %{_mandir}/man1/*
 
 



From svn at tinysofa.org  Tue May 10 13:25:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 09:25:53 -0400 (EDT)
Subject: [tinysofa-svn] r6315 - in
	tinysofa/releases/classic/2.0/anaconda/current: sources specs
Message-ID: <20050510132553.CFC5E344CFB@minbar.tinysofa.org>

Author: jh
Date: 2005-05-10 09:25:44 -0400 (Tue, 10 May 2005)
New Revision: 6315

Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
   tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
Log:
- update modprobe patch


Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-10 12:41:22 UTC (rev 6314)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-10 13:25:44 UTC (rev 6315)
@@ -1,18 +1,24 @@
---- ./packages.py.modprobe.conf~	2005-05-09 21:50:12.000000000 +0300
-+++ ./packages.py	2005-05-09 21:52:01.000000000 +0300
-@@ -674,6 +674,11 @@
+--- ./packages.py.modprobe.conf~	2005-05-10 16:22:20.000000000 +0300
++++ ./packages.py	2005-05-10 16:24:24.000000000 +0300
+@@ -674,6 +674,17 @@
          if os.access("/tmp/modules.conf", os.R_OK):
              iutil.copyFile("/tmp/modules.conf", 
                             instPath + "/etc/modules.conf")
-+        os.chmod(instPath + "/etc/modules.conf", 0644)
++        try:
++            os.chmod(instPath + "/etc/modules.conf", 0644)
++        except:
++            pass
 +        if os.access("/tmp/modprobe.conf", os.R_OK):
 +            iutil.copyFile("/tmp/modprobe.conf", 
 +                           instPath + "/etc/modprobe.conf")
-+        os.chmod(instPath + "/etc/modprobe.conf", 0644)
++        try:
++            os.chmod(instPath + "/etc/modprobe.conf", 0644)
++        except:
++            pass
  
      # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly
      f = open(instPath + "/etc/mtab", "w+")
-@@ -1032,7 +1037,7 @@
+@@ -1032,7 +1043,7 @@
  		    
                  unmountUSB = 0
                  try:

Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-10 12:41:22 UTC (rev 6314)
+++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-10 13:25:44 UTC (rev 6315)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 3jh
+Release: 4jh
 License: GPL
 Summary: installation program
 Group: development



From svn at tinysofa.org  Tue May 10 13:29:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 09:29:47 -0400 (EDT)
Subject: [tinysofa-svn] r6316 -
	tinysofa/releases/classic/2.0/anaconda/current/sources
Message-ID: <20050510132947.AE7F5344D0D@minbar.tinysofa.org>

Author: jh
Date: 2005-05-10 09:29:41 -0400 (Tue, 10 May 2005)
New Revision: 6316

Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
Log:
- another anaconda-9.1-modprobe.conf.patch update


Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-10 13:25:44 UTC (rev 6315)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-10 13:29:41 UTC (rev 6316)
@@ -1,20 +1,20 @@
 --- ./packages.py.modprobe.conf~	2005-05-10 16:22:20.000000000 +0300
-+++ ./packages.py	2005-05-10 16:24:24.000000000 +0300
++++ ./packages.py	2005-05-10 16:28:47.000000000 +0300
 @@ -674,6 +674,17 @@
          if os.access("/tmp/modules.conf", os.R_OK):
              iutil.copyFile("/tmp/modules.conf", 
                             instPath + "/etc/modules.conf")
-+        try:
-+            os.chmod(instPath + "/etc/modules.conf", 0644)
-+        except:
-+            pass
++            try:
++                os.chmod(instPath + "/etc/modules.conf", 0644)
++            except:
++                pass
 +        if os.access("/tmp/modprobe.conf", os.R_OK):
 +            iutil.copyFile("/tmp/modprobe.conf", 
 +                           instPath + "/etc/modprobe.conf")
-+        try:
-+            os.chmod(instPath + "/etc/modprobe.conf", 0644)
-+        except:
-+            pass
++            try:
++                os.chmod(instPath + "/etc/modprobe.conf", 0644)
++            except:
++                pass
  
      # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly
      f = open(instPath + "/etc/mtab", "w+")



From svn at tinysofa.org  Tue May 10 16:39:03 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 12:39:03 -0400 (EDT)
Subject: [tinysofa-svn] r6317 - in contrib/classic/2.0: . tnef tnef/current
	tnef/current/sources tnef/current/specs
Message-ID: <20050510163903.BEE40344BB4@minbar.tinysofa.org>

Author: gda
Date: 2005-05-10 12:38:17 -0400 (Tue, 10 May 2005)
New Revision: 6317

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

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


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

Added: contrib/classic/2.0/tnef/current/specs/tnef.spec
===================================================================
--- contrib/classic/2.0/tnef/current/specs/tnef.spec	2005-05-10 13:29:41 UTC (rev 6316)
+++ contrib/classic/2.0/tnef/current/specs/tnef.spec	2005-05-10 16:38:17 UTC (rev 6317)
@@ -0,0 +1,44 @@
+Summary: Decodes MS-TNEF attachments.
+Name: tnef
+Version: 1.3.2
+Release: 1gd
+Group: contrib
+Copyright: GPL
+Source: http://world.std.com/~damned/tnef-%{version}.tar.gz
+BuildRoot: /var/tmp/%{name}-%{version}
+URL: http://tnef.sourceforge.net
+
+%description
+TNEF is a program for unpacking MIME attachments of type
+"application/ms-tnef". This is a Microsoft only attachment.
+
+Due to the proliferation of Microsoft Outlook and Exchange mail servers,
+more and more mail is encapsulated into this format.
+
+The TNEF program allows one to unpack the attachments which were
+encapsulated into the TNEF attachment.  Thus alleviating the need to use
+Microsoft Outlook to view the attachment.
+
+
+%prep
+%setup -q
+
+%build
+%configure
+%make
+
+%install
+%makeinstall
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc README COPYING ChangeLog AUTHORS NEWS TODO BUGS
+%{_bindir}/tnef
+%{_mandir}/man1/tnef.1.gz
+
+%changelog
+* Tue May 10 2005 Gerald Dachs <gda at gedas dash onsite dot de> 1.3.2-1gd
+- first build



From svn at tinysofa.org  Tue May 10 20:43:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 16:43:57 -0400 (EDT)
Subject: [tinysofa-svn] r6318 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050510204357.CEBC2344A9A@minbar.tinysofa.org>

Author: jh
Date: 2005-05-10 16:43:48 -0400 (Tue, 10 May 2005)
New Revision: 6318

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-ext2-corruption.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- add ext2-corruption patch

Added: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-ext2-corruption.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-ext2-corruption.patch	2005-05-10 16:38:17 UTC (rev 6317)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-ext2-corruption.patch	2005-05-10 20:43:48 UTC (rev 6318)
@@ -0,0 +1,65 @@
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ 25-akpm/fs/ext2/ext2.h  |    1 +
+ 25-akpm/fs/ext2/inode.c |   13 +++++++++++++
+ 25-akpm/fs/ext2/super.c |    4 +---
+ 3 files changed, 15 insertions(+), 3 deletions(-)
+
+diff -puN fs/ext2/ext2.h~ext2-corruption-regression-between-269-and-2610 fs/ext2/ext2.h
+--- 25/fs/ext2/ext2.h~ext2-corruption-regression-between-269-and-2610	2005-04-12 03:21:35.004815360 -0700
++++ 25-akpm/fs/ext2/ext2.h	2005-04-12 03:21:35.010814448 -0700
+@@ -116,6 +116,7 @@ extern unsigned long ext2_count_free (st
+ /* inode.c */
+ extern void ext2_read_inode (struct inode *);
+ extern int ext2_write_inode (struct inode *, int);
++extern void ext2_put_inode (struct inode *);
+ extern void ext2_delete_inode (struct inode *);
+ extern int ext2_sync_inode (struct inode *);
+ extern void ext2_discard_prealloc (struct inode *);
+diff -puN fs/ext2/inode.c~ext2-corruption-regression-between-269-and-2610 fs/ext2/inode.c
+--- 25/fs/ext2/inode.c~ext2-corruption-regression-between-269-and-2610	2005-04-12 03:21:35.006815056 -0700
++++ 25-akpm/fs/ext2/inode.c	2005-04-12 03:21:35.011814296 -0700
+@@ -53,6 +53,19 @@ static inline int ext2_inode_is_fast_sym
+ }
+ 
+ /*
++ * Called at each iput().
++ *
++ * The inode may be "bad" if ext2_read_inode() saw an error from
++ * ext2_get_inode(), so we need to check that to avoid freeing random disk
++ * blocks.
++ */
++void ext2_put_inode(struct inode *inode)
++{
++	if (!is_bad_inode(inode))
++		ext2_discard_prealloc(inode);
++}
++
++/*
+  * Called at the last iput() if i_nlink is zero.
+  */
+ void ext2_delete_inode (struct inode * inode)
+diff -puN fs/ext2/super.c~ext2-corruption-regression-between-269-and-2610 fs/ext2/super.c
+--- 25/fs/ext2/super.c~ext2-corruption-regression-between-269-and-2610	2005-04-12 03:21:35.007814904 -0700
++++ 25-akpm/fs/ext2/super.c	2005-04-12 03:21:35.012814144 -0700
+@@ -198,11 +198,8 @@ static void ext2_clear_inode(struct inod
+ 		ei->i_default_acl = EXT2_ACL_NOT_CACHED;
+ 	}
+ #endif
+-	if (!is_bad_inode(inode))
+-		ext2_discard_prealloc(inode);
+ }
+ 
+-
+ #ifdef CONFIG_QUOTA
+ static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, size_t len, loff_t off);
+ static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);
+@@ -213,6 +210,7 @@ static struct super_operations ext2_sops
+ 	.destroy_inode	= ext2_destroy_inode,
+ 	.read_inode	= ext2_read_inode,
+ 	.write_inode	= ext2_write_inode,
++	.put_inode	= ext2_put_inode,
+ 	.delete_inode	= ext2_delete_inode,
+ 	.put_super	= ext2_put_super,
+ 	.write_super	= ext2_write_super,

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-10 16:38:17 UTC (rev 6317)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-10 20:43:48 UTC (rev 6318)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 13jh
+Release: 14jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -91,6 +91,7 @@
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
 Patch103: linux-2.6.11-grsec-gracl-fix.patch
+Patch103: linux-2.6.11-ext2-corruption.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 
@@ -239,6 +240,7 @@
 %patch101 -p1 -b .epoll~
 %patch102 -p1 -b .compile~
 %patch103 -p1 -b .gracl~
+%patch104 -p1 -b .ext2-corruption~
 
 %patch20020 -p1 -b .tinysofa-syslog~
 
@@ -592,6 +594,9 @@
 
 
 %changelog
+* Tue May 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-14jh
+- add ext2-corruption patch
+
 * Mon May  9 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-13jh
 - use sane default for exec_shield
 



From svn at tinysofa.org  Tue May 10 20:45:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 10 May 2005 16:45:28 -0400 (EDT)
Subject: [tinysofa-svn] r6319 -
	tinysofa/releases/classic/2.0/kernel/current/specs
Message-ID: <20050510204528.97E71344B8E@minbar.tinysofa.org>

Author: jh
Date: 2005-05-10 16:45:22 -0400 (Tue, 10 May 2005)
New Revision: 6319

Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- fix patch number


Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-10 20:43:48 UTC (rev 6318)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-10 20:45:22 UTC (rev 6319)
@@ -91,7 +91,7 @@
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
 Patch103: linux-2.6.11-grsec-gracl-fix.patch
-Patch103: linux-2.6.11-ext2-corruption.patch
+Patch104: linux-2.6.11-ext2-corruption.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 



From svn at tinysofa.org  Wed May 11 06:51:52 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 02:51:52 -0400 (EDT)
Subject: [tinysofa-svn] r6320 - contrib/classic/2.0/ipmitool/current/specs
Message-ID: <20050511065152.21A15344CCC@minbar.tinysofa.org>

Author: jh
Date: 2005-05-11 02:51:45 -0400 (Wed, 11 May 2005)
New Revision: 6320

Modified:
   contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec
Log:
- BuildRequires: gcc-c++


Modified: contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec
===================================================================
--- contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec	2005-05-10 20:45:22 UTC (rev 6319)
+++ contrib/classic/2.0/ipmitool/current/specs/ipmitool.spec	2005-05-11 06:51:45 UTC (rev 6320)
@@ -6,7 +6,7 @@
 Group: contrib
 Source: %{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel ncurses-devel
+BuildRequires: openssl-devel ncurses-devel gcc-c++
 
 %description
 This package contains a utility for interfacing with devices that support



From svn at tinysofa.org  Wed May 11 18:12:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 14:12:36 -0400 (EDT)
Subject: [tinysofa-svn] r6321 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050511181236.0B12D344A5B@minbar.tinysofa.org>

Author: jh
Date: 2005-05-11 14:12:24 -0400 (Wed, 11 May 2005)
New Revision: 6321

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- add some mm patches
- add linux-2.6.11-elf-coredump.patch (CAN-2005-1263)


Added: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch	2005-05-11 06:51:45 UTC (rev 6320)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch	2005-05-11 18:12:24 UTC (rev 6321)
@@ -0,0 +1,11 @@
+--- ./fs/binfmt_elf.c.orig	2005-05-11 21:02:15.000000000 +0300
++++ ./fs/binfmt_elf.c	2005-05-11 21:06:20.000000000 +0300
+@@ -1366,7 +1366,7 @@
+ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
+ 		       struct mm_struct *mm)
+ {
+-	int i, len;
++	unsigned int i, len;
+ 	
+ 	/* first copy the parameters from user space */
+ 	memset(psinfo, 0, sizeof(struct elf_prpsinfo));

Added: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-05-11 06:51:45 UTC (rev 6320)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-05-11 18:12:24 UTC (rev 6321)
@@ -0,0 +1,395 @@
+
+From: Jeffrey Mahoney <jeffm at suse.com>
+
+This patch fixes a race between mount and umount in set_blocksize.  The
+results can vary between buffer errors and infinite loops in __getblk_slow,
+and possibly others.
+
+The patch makes set_blocksize run under the bdev_lock if it is the sole
+holder of the block device.
+
+Changes:
+    - Added missing sync_blockdev in kill_block_super, lost in the shuffle.
+
+Signed-off-by: Jeff Mahoney <jeffm at suse.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ 25-akpm/fs/block_dev.c     |   24 ++++++++++++------------
+ 25-akpm/fs/super.c         |    4 ++--
+ 25-akpm/include/linux/fs.h |   31 +++++++++++++++++++++++++++----
+ 3 files changed, 41 insertions(+), 18 deletions(-)
+
+diff -puN fs/block_dev.c~blockdev-fixes-race-between-mount-umount fs/block_dev.c
+--- 25/fs/block_dev.c~blockdev-fixes-race-between-mount-umount	Thu Mar 10 15:34:19 2005
++++ 25-akpm/fs/block_dev.c	Thu Mar 10 15:34:19 2005
+@@ -62,7 +62,7 @@ static void kill_bdev(struct block_devic
+ 	truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
+ }	
+ 
+-int set_blocksize(struct block_device *bdev, int size)
++int __set_blocksize(struct block_device *bdev, int size, int sync)
+ {
+ 	/* Size must be a power of two, and between 512 and PAGE_SIZE */
+ 	if (size > PAGE_SIZE || size < 512 || (size & (size-1)))
+@@ -74,15 +74,15 @@ int set_blocksize(struct block_device *b
+ 
+ 	/* Don't change the size if it is same as current */
+ 	if (bdev->bd_block_size != size) {
+-		sync_blockdev(bdev);
++		if (sync)
++			sync_blockdev(bdev);
+ 		bdev->bd_block_size = size;
+ 		bdev->bd_inode->i_blkbits = blksize_bits(size);
+ 		kill_bdev(bdev);
+ 	}
+ 	return 0;
+ }
+-
+-EXPORT_SYMBOL(set_blocksize);
++EXPORT_SYMBOL(__set_blocksize);
+ 
+ int sb_set_blocksize(struct super_block *sb, int size)
+ {
+@@ -477,20 +477,20 @@ int bd_claim(struct block_device *bdev, 
+ 	spin_unlock(&bdev_lock);
+ 	return res;
+ }
+-
+ EXPORT_SYMBOL(bd_claim);
+ 
+-void bd_release(struct block_device *bdev)
++void __bd_release(struct block_device *bdev, int size)
+ {
+ 	spin_lock(&bdev_lock);
+ 	if (!--bdev->bd_contains->bd_holders)
+ 		bdev->bd_contains->bd_holder = NULL;
+-	if (!--bdev->bd_holders)
++	if (!--bdev->bd_holders) {
+ 		bdev->bd_holder = NULL;
++		set_blocksize_nosync (bdev, size);
++	}
+ 	spin_unlock(&bdev_lock);
+ }
+-
+-EXPORT_SYMBOL(bd_release);
++EXPORT_SYMBOL(__bd_release);
+ 
+ /*
+  * Tries to open block device by device number.  Use it ONLY if you
+@@ -914,10 +914,10 @@ EXPORT_SYMBOL(open_bdev_excl);
+  *
+  * This is the counterpart to open_bdev_excl().
+  */
+-void close_bdev_excl(struct block_device *bdev)
++void __close_bdev_excl(struct block_device *bdev, int size)
+ {
+-	bd_release(bdev);
++	__bd_release(bdev, size);
+ 	blkdev_put(bdev);
+ }
+ 
+-EXPORT_SYMBOL(close_bdev_excl);
++EXPORT_SYMBOL(__close_bdev_excl);
+diff -puN fs/super.c~blockdev-fixes-race-between-mount-umount fs/super.c
+--- 25/fs/super.c~blockdev-fixes-race-between-mount-umount	Thu Mar 10 15:34:19 2005
++++ 25-akpm/fs/super.c	Thu Mar 10 15:34:19 2005
+@@ -732,8 +732,8 @@ void kill_block_super(struct super_block
+ 
+ 	bdev_uevent(bdev, KOBJ_UMOUNT);
+ 	generic_shutdown_super(sb);
+-	set_blocksize(bdev, sb->s_old_blocksize);
+-	close_bdev_excl(bdev);
++	sync_blockdev(bdev);
++	__close_bdev_excl(bdev, sb->s_old_blocksize);
+ }
+ 
+ EXPORT_SYMBOL(kill_block_super);
+diff -puN include/linux/fs.h~blockdev-fixes-race-between-mount-umount include/linux/fs.h
+--- 25/include/linux/fs.h~blockdev-fixes-race-between-mount-umount	Thu Mar 10 15:34:19 2005
++++ 25-akpm/include/linux/fs.h	Thu Mar 10 15:34:21 2005
+@@ -1292,7 +1292,12 @@ extern long compat_blkdev_ioctl(struct f
+ extern int blkdev_get(struct block_device *, mode_t, unsigned);
+ extern int blkdev_put(struct block_device *);
+ extern int bd_claim(struct block_device *, void *);
+-extern void bd_release(struct block_device *);
++extern void __bd_release(struct block_device *, int);
++
++static inline void bd_release(struct block_device *bdev)
++{
++	__bd_release (bdev, bdev->bd_block_size);
++}
+ 
+ /* fs/char_dev.c */
+ extern int alloc_chrdev_region(dev_t *, unsigned, unsigned, const char *);
+@@ -1309,7 +1314,12 @@ extern const char *__bdevname(dev_t, cha
+ extern const char *bdevname(struct block_device *bdev, char *buffer);
+ extern struct block_device *lookup_bdev(const char *);
+ extern struct block_device *open_bdev_excl(const char *, int, void *);
+-extern void close_bdev_excl(struct block_device *);
++extern void __close_bdev_excl(struct block_device *, int);
++
++static inline void close_bdev_excl(struct block_device *bdev)
++{
++	__close_bdev_excl(bdev, bdev->bd_block_size);
++}
+ 
+ extern void init_special_inode(struct inode *, umode_t, dev_t);
+ 
+@@ -1439,7 +1449,9 @@ extern struct semaphore iprune_sem;
+ 
+ extern void __insert_inode_hash(struct inode *, unsigned long hashval);
+ extern void remove_inode_hash(struct inode *);
+-static inline void insert_inode_hash(struct inode *inode) {
++
++static inline void insert_inode_hash(struct inode *inode)
++{
+ 	__insert_inode_hash(inode, inode->i_ino);
+ }
+ 
+@@ -1449,7 +1461,18 @@ extern void file_kill(struct file *f);
+ struct bio;
+ extern void submit_bio(int, struct bio *);
+ extern int bdev_read_only(struct block_device *);
+-extern int set_blocksize(struct block_device *, int);
++extern int __set_blocksize(struct block_device *, int, int);
++
++static inline int set_blocksize(struct block_device *bdev, int size)
++{
++	return __set_blocksize (bdev, size, 1);
++}
++
++static inline int set_blocksize_nosync(struct block_device *bdev, int size)
++{
++	return __set_blocksize (bdev, size, 0);
++}
++
+ extern int sb_set_blocksize(struct super_block *, int);
+ extern int sb_min_blocksize(struct super_block *, int);
+ 
+_
+
+From: Miklos Szeredi <miklos at szeredi.hu>
+
+This patch fixes a problem when a inode which is the root of a mount
+becomes bad (make_bad_inode()).  In this case follow_link will return
+-EIO, so the name resolution fails, and umount won't work.  The
+solution is just to remove the follow_link method from bad_inode_ops.
+Any filesystem operation (other than unmount) will still fail, since
+every other method returns -EIO.
+
+A test case for this is:
+
+ 1) export an smbfs on host A and mount the share on host B
+
+ 2) create directory X on A under the exported directory
+
+ 3) bind mount X to Y on B (Y need not be under the share)
+
+ 4) remove directory X, and create regular file X (same name) on A
+
+ 5) stat X on B, this will make X a bad inode (file type changed)
+
+ 6) umount Y
+
+Without the patch applied, umount won't succeed, and a reboot is
+necessary to get rid of the mount.
+
+With the patch applied, umount will succeed.
+
+The same is true for any filesystem which uses make_bad_inode() to
+mark an existing inode bad (NFS, SMBFS, FUSE, etc...).
+
+Signed-off-by: Miklos Szeredi <miklos at szeredi.hu>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ 25-akpm/fs/bad_inode.c |   14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
+
+diff -puN fs/bad_inode.c~cant-unmount-bad-inode fs/bad_inode.c
+--- 25/fs/bad_inode.c~cant-unmount-bad-inode	Mon Jan 24 14:06:32 2005
++++ 25-akpm/fs/bad_inode.c	Mon Jan 24 14:06:32 2005
+@@ -15,17 +15,6 @@
+ #include <linux/smp_lock.h>
+ #include <linux/namei.h>
+ 
+-/*
+- * The follow_link operation is special: it must behave as a no-op
+- * so that a bad root inode can at least be unmounted. To do this
+- * we must dput() the base and return the dentry with a dget().
+- */
+-static int bad_follow_link(struct dentry *dent, struct nameidata *nd)
+-{
+-	nd_set_link(nd, ERR_PTR(-EIO));
+-	return 0;
+-}
+-
+ static int return_EIO(void)
+ {
+ 	return -EIO;
+@@ -70,7 +59,8 @@ struct inode_operations bad_inode_ops =
+ 	.mknod		= EIO_ERROR,
+ 	.rename		= EIO_ERROR,
+ 	.readlink	= EIO_ERROR,
+-	.follow_link	= bad_follow_link,
++	/* follow_link must be no-op, otherwise unmounting this inode
++	   won't work */
+ 	.truncate	= EIO_ERROR,
+ 	.permission	= EIO_ERROR,
+ 	.getattr	= EIO_ERROR,
+_
+
+From: Manfred Spraul <manfred at colorfullife.com>
+
+Use kmem_bufctl_t instead of int for the loop counters in check_slabp.
+
+Signed-of-by: Manfred Spraul <manfred at colorfullife.com>
+
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ 25-akpm/mm/slab.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff -puN mm/slab.c~slab-64bit-fix mm/slab.c
+--- 25/mm/slab.c~slab-64bit-fix	2005-03-13 13:07:52.000000000 -0800
++++ 25-akpm/mm/slab.c	2005-03-13 13:07:52.000000000 -0800
+@@ -1966,18 +1966,17 @@ static void *cache_free_debugcheck (kmem
+ 
+ static void check_slabp(kmem_cache_t *cachep, struct slab *slabp)
+ {
+-	int i;
++	kmem_bufctl_t i;
+ 	int entries = 0;
+ 	
+ 	check_spinlock_acquired(cachep);
+ 	/* Check slab's freelist to see if this obj is there. */
+ 	for (i = slabp->free; i != BUFCTL_END; i = slab_bufctl(slabp)[i]) {
+ 		entries++;
+-		if (entries > cachep->num || i < 0 || i >= cachep->num)
++		if (entries > cachep->num || i >= cachep->num)
+ 			goto bad;
+ 	}
+ 	if (entries != cachep->num - slabp->inuse) {
+-		int i;
+ bad:
+ 		printk(KERN_ERR "slab: Internal list corruption detected in cache '%s'(%d), slabp %p(%d). Hexdump:\n",
+ 				cachep->name, cachep->num, slabp, slabp->inuse);
+_
+
+From: Paolo 'Blaisorblade' Giarrusso <blaisorblade at yahoo.it>
+
+Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade at yahoo.it>
+Cc: Andi Kleen <ak at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ 25-akpm/arch/x86_64/kernel/sys_x86_64.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+diff -puN arch/x86_64/kernel/sys_x86_64.c~x86-64-forgot-asmlinkage-on-sys_mmap arch/x86_64/kernel/sys_x86_64.c
+--- 25/arch/x86_64/kernel/sys_x86_64.c~x86-64-forgot-asmlinkage-on-sys_mmap	2005-03-09 15:50:27.000000000 -0800
++++ 25-akpm/arch/x86_64/kernel/sys_x86_64.c	2005-03-09 15:50:27.000000000 -0800
+@@ -38,7 +38,7 @@ asmlinkage long sys_pipe(int __user *fil
+ 	return error;
+ }
+ 
+-long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
++asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
+ 	unsigned long fd, unsigned long off)
+ {
+ 	long error;
+_
+
+From: Zwane Mwaikambo <zwane at arm.linux.org.uk>
+
+Andi noted that during normal runtime cpu_idle_map is bounced around a lot,
+and occassionally at a higher frequency than the timer interrupt wakeup
+which we normally exit pm_idle from.  So switch to a percpu variable.
+
+I didn't move things to the slow path because it would involve adding
+scheduler code to wakeup the idle thread on the cpus we're waiting for.
+
+Signed-off-by: Zwane Mwaikambo <zwane at arm.linux.org.uk>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ 25-akpm/arch/x86_64/kernel/process.c |   39 +++++++++++++++++++++++------------
+ 1 files changed, 26 insertions(+), 13 deletions(-)
+
+diff -puN arch/x86_64/kernel/process.c~x86_64-reduce-cacheline-bouncing-in-cpu_idle_wait arch/x86_64/kernel/process.c
+--- 25/arch/x86_64/kernel/process.c~x86_64-reduce-cacheline-bouncing-in-cpu_idle_wait	2005-03-11 23:21:40.000000000 -0800
++++ 25-akpm/arch/x86_64/kernel/process.c	2005-03-11 23:22:43.000000000 -0800
+@@ -62,7 +62,7 @@ EXPORT_SYMBOL(boot_option_idle_override)
+  * Powermanagement idle function, if any..
+  */
+ void (*pm_idle)(void);
+-static cpumask_t cpu_idle_map;
++static DEFINE_PER_CPU(unsigned int, cpu_idle_state);
+ 
+ void disable_hlt(void)
+ {
+@@ -125,20 +125,31 @@ static void poll_idle (void)
+ 	}
+ }
+ 
+-
+ void cpu_idle_wait(void)
+ {
+-        int cpu;
+-        cpumask_t map;
++	unsigned int cpu, this_cpu = get_cpu();
++	cpumask_t map;
+ 
+-        for_each_online_cpu(cpu)
+-                cpu_set(cpu, cpu_idle_map);
++	set_cpus_allowed(current, cpumask_of_cpu(this_cpu));
++	put_cpu();
+ 
+-        wmb();
+-        do {
+-                ssleep(1);
+-                cpus_and(map, cpu_idle_map, cpu_online_map);
+-        } while (!cpus_empty(map));
++	cpus_clear(map);
++	for_each_online_cpu(cpu) {
++		per_cpu(cpu_idle_state, cpu) = 1;
++		cpu_set(cpu, map);
++	}
++
++	__get_cpu_var(cpu_idle_state) = 0;
++
++	wmb();
++	do {
++		ssleep(1);
++		for_each_online_cpu(cpu) {
++			if (cpu_isset(cpu, map) && !per_cpu(cpu_idle_state, cpu))
++				cpu_clear(cpu, map);
++		}
++		cpus_and(map, map, cpu_online_map);
++	} while (!cpus_empty(map));
+ }
+ EXPORT_SYMBOL_GPL(cpu_idle_wait);
+ 
+@@ -157,14 +168,16 @@ void cpu_idle (void)
+ 		while (!need_resched()) {
+ 			void (*idle)(void);
+ 
+-			if (cpu_isset(cpu, cpu_idle_map))
+-				cpu_clear(cpu, cpu_idle_map);
++			if (__get_cpu_var(cpu_idle_state))
++				__get_cpu_var(cpu_idle_state) = 0;
++
+ 			rmb();
+ 			idle = pm_idle;
+ 			if (!idle)
+ 				idle = default_idle;
+ 			idle();
+ 		}
++
+ 		schedule();
+ 	}
+ }
+_
+

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-11 06:51:45 UTC (rev 6320)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-11 18:12:24 UTC (rev 6321)
@@ -92,6 +92,8 @@
 Patch102: linux-2.6.11-compile.patch
 Patch103: linux-2.6.11-grsec-gracl-fix.patch
 Patch104: linux-2.6.11-ext2-corruption.patch
+Patch105: linux-2.6.11-mm-selected-bits.patch
+Patch106: linux-2.6.11-mm-selected-bits.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 
@@ -241,6 +243,8 @@
 %patch102 -p1 -b .compile~
 %patch103 -p1 -b .gracl~
 %patch104 -p1 -b .ext2-corruption~
+%patch105 -p1 -b .mm-selected-bits~
+%patch105 -p1 -b .elf-coredump~
 
 %patch20020 -p1 -b .tinysofa-syslog~
 
@@ -594,6 +598,10 @@
 
 
 %changelog
+* Wed May 11 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- add some mm patches
+- add linux-2.6.11-elf-coredump.patch (CAN-2005-1263)
+
 * Tue May 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6.11-14jh
 - add ext2-corruption patch
 



From svn at tinysofa.org  Wed May 11 18:26:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 14:26:59 -0400 (EDT)
Subject: [tinysofa-svn] r6322 - in
	tinysofa/releases/classic/2.0/squid/current: sources specs
Message-ID: <20050511182659.31EB9344CC4@minbar.tinysofa.org>

Author: jh
Date: 2005-05-11 14:26:49 -0400 (Wed, 11 May 2005)
New Revision: 6322

Added:
   tinysofa/releases/classic/2.0/squid/current/sources/squid-2.5.STABLE9-dns_query-2.patch
Modified:
   tinysofa/releases/classic/2.0/squid/current/specs/squid.spec
Log:
- fix DNS lookup spoofing vulnerability

Added: tinysofa/releases/classic/2.0/squid/current/sources/squid-2.5.STABLE9-dns_query-2.patch
===================================================================
--- tinysofa/releases/classic/2.0/squid/current/sources/squid-2.5.STABLE9-dns_query-2.patch	2005-05-11 18:12:24 UTC (rev 6321)
+++ tinysofa/releases/classic/2.0/squid/current/sources/squid-2.5.STABLE9-dns_query-2.patch	2005-05-11 18:26:49 UTC (rev 6322)
@@ -0,0 +1,977 @@
+Index: squid/include/rfc1035.h
+diff -c squid/include/rfc1035.h:1.6.2.1 squid/include/rfc1035.h:1.6.2.2
+*** squid/include/rfc1035.h:1.6.2.1	Wed Dec 17 18:04:22 2003
+--- squid/include/rfc1035.h	Tue May 10 05:48:20 2005
+***************
+*** 56,73 ****
+      unsigned short rdlength;
+      char *rdata;
+  };
+! extern unsigned short rfc1035BuildAQuery(const char *hostname,
+      char *buf,
+!     size_t * szp);
+! extern unsigned short rfc1035BuildPTRQuery(const struct in_addr,
+      char *buf,
+-     size_t * szp);
+- extern unsigned short rfc1035RetryQuery(char *);
+- extern int rfc1035AnswersUnpack(const char *buf,
+      size_t sz,
+!     rfc1035_rr ** records,
+!     unsigned short *id);
+! extern void rfc1035RRDestroy(rfc1035_rr * rr, int n);
+  extern int rfc1035_errno;
+  extern const char *rfc1035_error_message;
+  
+--- 56,101 ----
+      unsigned short rdlength;
+      char *rdata;
+  };
+! typedef struct _rfc1035_query rfc1035_query;
+! struct _rfc1035_query {
+!     char name[RFC1035_MAXHOSTNAMESZ];
+!     unsigned short qtype;
+!     unsigned short qclass;
+! };
+! typedef struct _rfc1035_message rfc1035_message;
+! struct _rfc1035_message {
+!     unsigned short id;
+!     unsigned int qr:1;
+!     unsigned int opcode:4;
+!     unsigned int aa:1;
+!     unsigned int tc:1;
+!     unsigned int rd:1;
+!     unsigned int ra:1;
+!     unsigned int rcode:4;
+!     unsigned short qdcount;
+!     unsigned short ancount;
+!     unsigned short nscount;
+!     unsigned short arcount;
+!     rfc1035_query *query;
+!     rfc1035_rr *answer;
+! };
+! 
+! extern ssize_t rfc1035BuildAQuery(const char *hostname,
+      char *buf,
+!     size_t sz,
+!     unsigned short qid,
+!     rfc1035_query * query);
+! extern ssize_t rfc1035BuildPTRQuery(const struct in_addr,
+      char *buf,
+      size_t sz,
+!     unsigned short qid,
+!     rfc1035_query * query);
+! extern void rfc1035SetQueryID(char *, unsigned short qid);
+! extern int rfc1035MessageUnpack(const char *buf,
+!     size_t sz,
+!     rfc1035_message ** answer);
+! extern int rfc1035QueryCompare(const rfc1035_query *, const rfc1035_query *);
+! extern void rfc1035MessageDestroy(rfc1035_message * message);
+  extern int rfc1035_errno;
+  extern const char *rfc1035_error_message;
+  
+Index: squid/lib/rfc1035.c
+diff -c squid/lib/rfc1035.c:1.22.2.8 squid/lib/rfc1035.c:1.22.2.9
+*** squid/lib/rfc1035.c:1.22.2.8	Fri Mar 25 19:50:50 2005
+--- squid/lib/rfc1035.c	Tue May 10 05:48:21 2005
+***************
+*** 40,45 ****
+--- 40,46 ----
+   */
+  
+  #include "config.h"
++ #include "util.h"
+  
+  #if HAVE_STDIO_H
+  #include <stdio.h>
+***************
+*** 82,111 ****
+  #endif
+  
+  
+- typedef struct _rfc1035_header rfc1035_header;
+  
+  int rfc1035_errno;
+  const char *rfc1035_error_message;
+- struct _rfc1035_header {
+-     unsigned short id;
+-     unsigned int qr:1;
+-     unsigned int opcode:4;
+-     unsigned int aa:1;
+-     unsigned int tc:1;
+-     unsigned int rd:1;
+-     unsigned int ra:1;
+-     unsigned int rcode:4;
+-     unsigned short qdcount;
+-     unsigned short ancount;
+-     unsigned short nscount;
+-     unsigned short arcount;
+- };
+- 
+- static const char *Alphanum =
+- "abcdefghijklmnopqrstuvwxyz"
+- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+- "0123456789";
+- 
+  
+  /*
+   * rfc1035HeaderPack()
+--- 83,91 ----
+***************
+*** 114,120 ****
+   * Returns number of octets packed (should always be 12)
+   */
+  static int
+! rfc1035HeaderPack(char *buf, size_t sz, rfc1035_header * hdr)
+  {
+      int off = 0;
+      unsigned short s;
+--- 94,100 ----
+   * Returns number of octets packed (should always be 12)
+   */
+  static int
+! rfc1035HeaderPack(char *buf, size_t sz, rfc1035_message * hdr)
+  {
+      int off = 0;
+      unsigned short s;
+***************
+*** 187,200 ****
+  rfc1035NamePack(char *buf, size_t sz, const char *name)
+  {
+      int off = 0;
+!     char *copy = strdup(name);
+      char *t;
+      /*
+       * NOTE: use of strtok here makes names like foo....com valid.
+       */
+      for (t = strtok(copy, "."); t; t = strtok(NULL, "."))
+  	off += rfc1035LabelPack(buf + off, sz - off, t);
+!     free(copy);
+      off += rfc1035LabelPack(buf + off, sz - off, NULL);
+      assert(off <= sz);
+      return off;
+--- 167,180 ----
+  rfc1035NamePack(char *buf, size_t sz, const char *name)
+  {
+      int off = 0;
+!     char *copy = xstrdup(name);
+      char *t;
+      /*
+       * NOTE: use of strtok here makes names like foo....com valid.
+       */
+      for (t = strtok(copy, "."); t; t = strtok(NULL, "."))
+  	off += rfc1035LabelPack(buf + off, sz - off, t);
+!     xfree(copy);
+      off += rfc1035LabelPack(buf + off, sz - off, NULL);
+      assert(off <= sz);
+      return off;
+***************
+*** 229,236 ****
+  /*
+   * rfc1035HeaderUnpack()
+   * 
+!  * Unpacks a RFC1035 message header buffer into a rfc1035_header
+!  * structure.
+   *
+   * Updates the buffer offset, which is the same as number of
+   * octects unpacked since the header starts at offset 0.
+--- 209,216 ----
+  /*
+   * rfc1035HeaderUnpack()
+   * 
+!  * Unpacks a RFC1035 message header buffer into the header fields
+!  * of the rfc1035_message structure.
+   *
+   * Updates the buffer offset, which is the same as number of
+   * octects unpacked since the header starts at offset 0.
+***************
+*** 238,244 ****
+   * Returns 0 (success) or 1 (error)
+   */
+  static int
+! rfc1035HeaderUnpack(const char *buf, size_t sz, int *off, rfc1035_header * h)
+  {
+      unsigned short s;
+      unsigned short t;
+--- 218,224 ----
+   * Returns 0 (success) or 1 (error)
+   */
+  static int
+! rfc1035HeaderUnpack(const char *buf, size_t sz, int *off, rfc1035_message * h)
+  {
+      unsigned short s;
+      unsigned short t;
+***************
+*** 411,436 ****
+      RR->rdlength = rdlength;
+      switch (RR->type) {
+      case RFC1035_TYPE_PTR:
+! 	RR->rdata = malloc(RFC1035_MAXHOSTNAMESZ);
+  	rdata_off = *off;
+  	RR->rdlength = 0;	/* Filled in by rfc1035NameUnpack */
+  	if (rfc1035NameUnpack(buf, sz, &rdata_off, &RR->rdlength, RR->rdata, RFC1035_MAXHOSTNAMESZ, 0))
+  	    return 1;
+! 	if (rdata_off != ((*off) + rdlength)) {
+  	    /*
+  	     * This probably doesn't happen for valid packets, but
+  	     * I want to make sure that NameUnpack doesn't go beyond
+  	     * the RDATA area.
+  	     */
+  	    RFC1035_UNPACK_DEBUG;
+! 	    free(RR->rdata);
+  	    memset(RR, '\0', sizeof(*RR));
+  	    return 1;
+  	}
+  	break;
+      case RFC1035_TYPE_A:
+      default:
+! 	RR->rdata = malloc(rdlength);
+  	memcpy(RR->rdata, buf + (*off), rdlength);
+  	break;
+      }
+--- 391,416 ----
+      RR->rdlength = rdlength;
+      switch (RR->type) {
+      case RFC1035_TYPE_PTR:
+! 	RR->rdata = xmalloc(RFC1035_MAXHOSTNAMESZ);
+  	rdata_off = *off;
+  	RR->rdlength = 0;	/* Filled in by rfc1035NameUnpack */
+  	if (rfc1035NameUnpack(buf, sz, &rdata_off, &RR->rdlength, RR->rdata, RFC1035_MAXHOSTNAMESZ, 0))
+  	    return 1;
+! 	if (rdata_off > ((*off) + rdlength)) {
+  	    /*
+  	     * This probably doesn't happen for valid packets, but
+  	     * I want to make sure that NameUnpack doesn't go beyond
+  	     * the RDATA area.
+  	     */
+  	    RFC1035_UNPACK_DEBUG;
+! 	    xfree(RR->rdata);
+  	    memset(RR, '\0', sizeof(*RR));
+  	    return 1;
+  	}
+  	break;
+      case RFC1035_TYPE_A:
+      default:
+! 	RR->rdata = xmalloc(rdlength);
+  	memcpy(RR->rdata, buf + (*off), rdlength);
+  	break;
+      }
+***************
+*** 439,453 ****
+      return 0;
+  }
+  
+- static unsigned short
+- rfc1035Qid(void)
+- {
+-     static unsigned short qid = 0x0001;
+-     if (++qid == 0xFFFF)
+- 	qid = 0x0001;
+-     return qid;
+- }
+- 
+  static void
+  rfc1035SetErrno(int n)
+  {
+--- 419,424 ----
+***************
+*** 485,491 ****
+      }
+  }
+  
+! void
+  rfc1035RRDestroy(rfc1035_rr * rr, int n)
+  {
+      if (rr == NULL)
+--- 456,462 ----
+      }
+  }
+  
+! static void
+  rfc1035RRDestroy(rfc1035_rr * rr, int n)
+  {
+      if (rr == NULL)
+***************
+*** 493,505 ****
+      assert(n > 0);
+      while (n--) {
+  	if (rr[n].rdata)
+! 	    free(rr[n].rdata);
+      }
+!     free(rr);
+  }
+  
+  /*
+!  * rfc1035AnswersUnpack()
+   *
+   * Takes the contents of a DNS reply and fills in an array
+   * of resource record structures.  The records array is allocated
+--- 464,537 ----
+      assert(n > 0);
+      while (n--) {
+  	if (rr[n].rdata)
+! 	    xfree(rr[n].rdata);
+      }
+!     xfree(rr);
+  }
+  
+  /*
+!  * rfc1035QueryUnpack()
+!  * 
+!  * Unpacks a RFC1035 Query Record into 'query' from a message buffer.
+!  *
+!  * Updates the new message buffer offset.
+!  *
+!  * Returns 0 (success) or 1 (error)
+!  */
+! static int
+! rfc1035QueryUnpack(const char *buf, size_t sz, int *off, rfc1035_query * query)
+! {
+!     unsigned short s;
+!     if (rfc1035NameUnpack(buf, sz, off, NULL, query->name, RFC1035_MAXHOSTNAMESZ, 0)) {
+! 	RFC1035_UNPACK_DEBUG;
+! 	memset(query, '\0', sizeof(*query));
+! 	return 1;
+!     }
+!     if (*off + 4 > sz) {
+! 	RFC1035_UNPACK_DEBUG;
+! 	memset(query, '\0', sizeof(*query));
+! 	return 1;
+!     }
+!     memcpy(&s, buf + *off, 2);
+!     *off += 2;
+!     query->qtype = ntohs(s);
+!     memcpy(&s, buf + *off, 2);
+!     *off += 2;
+!     query->qclass = ntohs(s);
+!     return 0;
+! }
+! 
+! void
+! rfc1035MessageDestroy(rfc1035_message * msg)
+! {
+!     if (!msg)
+! 	return;
+!     if (msg->query)
+! 	xfree(msg->query);
+!     if (msg->answer)
+! 	rfc1035RRDestroy(msg->answer, msg->ancount);
+!     xfree(msg);
+! }
+! 
+! /*
+!  * rfc1035QueryCompare()
+!  * 
+!  * Compares two rfc1035_query entries
+!  *
+!  * Returns 0 (equal) or !=0 (different)
+!  */
+! int
+! rfc1035QueryCompare(const rfc1035_query * a, const rfc1035_query * b)
+! {
+!     if (a->qtype != b->qtype)
+! 	return 1;
+!     if (a->qclass != b->qclass)
+! 	return 1;
+!     return strcmp(a->name, b->name);
+! }
+! 
+! /*
+!  * rfc1035MessageUnpack()
+   *
+   * Takes the contents of a DNS reply and fills in an array
+   * of resource record structures.  The records array is allocated
+***************
+*** 510,569 ****
+   */
+  
+  int
+! rfc1035AnswersUnpack(const char *buf,
+      size_t sz,
+!     rfc1035_rr ** records,
+!     unsigned short *id)
+  {
+      int off = 0;
+-     int l;
+      int i;
+      int nr = 0;
+!     rfc1035_header hdr;
+      rfc1035_rr *recs;
+!     memset(&hdr, '\0', sizeof(hdr));
+!     if (rfc1035HeaderUnpack(buf + off, sz - off, &off, &hdr)) {
+  	RFC1035_UNPACK_DEBUG;
+  	rfc1035SetErrno(rfc1035_unpack_error);
+  	return -rfc1035_unpack_error;
+      }
+-     *id = hdr.id;
+      rfc1035_errno = 0;
+      rfc1035_error_message = NULL;
+!     if (hdr.rcode) {
+  	RFC1035_UNPACK_DEBUG;
+! 	rfc1035SetErrno((int) hdr.rcode);
+  	return -rfc1035_errno;
+      }
+!     i = (int) hdr.qdcount;
+!     /* skip question */
+!     while (i--) {
+! 	do {
+! 	    l = (int) (unsigned char) *(buf + off);
+! 	    off++;
+! 	    if (l > 191) {	/* compression */
+! 		off++;
+! 		break;
+! 	    } else if (l > RFC1035_MAXLABELSZ) {
+! 		/* illegal combination of compression bits */
+! 		RFC1035_UNPACK_DEBUG;
+! 		rfc1035SetErrno(rfc1035_unpack_error);
+! 		return -rfc1035_unpack_error;
+! 	    } else {
+! 		off += l;
+! 	    }
+! 	} while (l > 0);	/* a zero-length label terminates */
+! 	off += 4;		/* qtype, qclass */
+! 	if (off > sz) {
+  	    RFC1035_UNPACK_DEBUG;
+  	    rfc1035SetErrno(rfc1035_unpack_error);
+  	    return -rfc1035_unpack_error;
+  	}
+      }
+!     if (hdr.ancount == 0)
+  	return 0;
+!     recs = calloc((int) hdr.ancount, sizeof(*recs));
+!     for (i = 0; i < (int) hdr.ancount; i++) {
+  	if (off >= sz) {	/* corrupt packet */
+  	    RFC1035_UNPACK_DEBUG;
+  	    break;
+--- 542,594 ----
+   */
+  
+  int
+! rfc1035MessageUnpack(const char *buf,
+      size_t sz,
+!     rfc1035_message ** answer)
+  {
+      int off = 0;
+      int i;
+      int nr = 0;
+!     rfc1035_message *msg;
+      rfc1035_rr *recs;
+!     rfc1035_query *querys;
+!     msg = xcalloc(1, sizeof(*msg));
+!     if (rfc1035HeaderUnpack(buf + off, sz - off, &off, msg)) {
+  	RFC1035_UNPACK_DEBUG;
+  	rfc1035SetErrno(rfc1035_unpack_error);
++ 	xfree(msg);
+  	return -rfc1035_unpack_error;
+      }
+      rfc1035_errno = 0;
+      rfc1035_error_message = NULL;
+!     if (msg->rcode) {
+  	RFC1035_UNPACK_DEBUG;
+! 	rfc1035SetErrno((int) msg->rcode);
+! 	xfree(msg);
+  	return -rfc1035_errno;
+      }
+!     i = (int) msg->qdcount;
+!     if (i != 1) {
+! 	/* This can not be an answer to our queries.. */
+! 	RFC1035_UNPACK_DEBUG;
+! 	rfc1035SetErrno(rfc1035_unpack_error);
+! 	xfree(msg);
+! 	return -rfc1035_unpack_error;
+!     }
+!     querys = msg->query = xcalloc((int) msg->qdcount, sizeof(*querys));
+!     for (i = 0; i < (int) msg->qdcount; i++) {
+! 	if (rfc1035QueryUnpack(buf, sz, &off, &querys[i])) {
+  	    RFC1035_UNPACK_DEBUG;
+  	    rfc1035SetErrno(rfc1035_unpack_error);
++ 	    rfc1035MessageDestroy(msg);
+  	    return -rfc1035_unpack_error;
+  	}
+      }
+!     *answer = msg;
+!     if (msg->ancount == 0)
+  	return 0;
+!     recs = msg->answer = xcalloc((int) msg->ancount, sizeof(*recs));
+!     for (i = 0; i < (int) msg->ancount; i++) {
+  	if (off >= sz) {	/* corrupt packet */
+  	    RFC1035_UNPACK_DEBUG;
+  	    break;
+***************
+*** 579,589 ****
+  	 * we expected to unpack some answers (ancount != 0), but
+  	 * didn't actually get any.
+  	 */
+! 	free(recs);
+  	rfc1035SetErrno(rfc1035_unpack_error);
+  	return -rfc1035_unpack_error;
+      }
+-     *records = recs;
+      return nr;
+  }
+  
+--- 604,614 ----
+  	 * we expected to unpack some answers (ancount != 0), but
+  	 * didn't actually get any.
+  	 */
+! 	rfc1035MessageDestroy(msg);
+! 	*answer = NULL;
+  	rfc1035SetErrno(rfc1035_unpack_error);
+  	return -rfc1035_unpack_error;
+      }
+      return nr;
+  }
+  
+***************
+*** 595,615 ****
+   * probably be at least 512 octets.  The 'szp' initially
+   * specifies the size of the buffer, on return it contains
+   * the size of the message (i.e. how much to write).
+!  * Return value is the query ID.
+   */
+! unsigned short
+! rfc1035BuildAQuery(const char *hostname, char *buf, size_t * szp)
+  {
+!     static rfc1035_header h;
+      size_t offset = 0;
+-     size_t sz = *szp;
+      memset(&h, '\0', sizeof(h));
+!     /* the first char of hostname must be alphanmeric */
+!     if (NULL == strchr(Alphanum, *hostname)) {
+! 	rfc1035SetErrno(3);
+! 	return 0;
+!     }
+!     h.id = rfc1035Qid();
+      h.qr = 0;
+      h.rd = 1;
+      h.opcode = 0;		/* QUERY */
+--- 620,634 ----
+   * probably be at least 512 octets.  The 'szp' initially
+   * specifies the size of the buffer, on return it contains
+   * the size of the message (i.e. how much to write).
+!  * Returns the size of the query
+   */
+! ssize_t
+! rfc1035BuildAQuery(const char *hostname, char *buf, size_t sz, unsigned short qid, rfc1035_query * query)
+  {
+!     static rfc1035_message h;
+      size_t offset = 0;
+      memset(&h, '\0', sizeof(h));
+!     h.id = qid;
+      h.qr = 0;
+      h.rd = 1;
+      h.opcode = 0;		/* QUERY */
+***************
+*** 620,628 ****
+  	hostname,
+  	RFC1035_TYPE_A,
+  	RFC1035_CLASS_IN);
+      assert(offset <= sz);
+!     *szp = (size_t) offset;
+!     return h.id;
+  }
+  
+  /*
+--- 639,651 ----
+  	hostname,
+  	RFC1035_TYPE_A,
+  	RFC1035_CLASS_IN);
++     if (query) {
++ 	query->qtype = RFC1035_TYPE_A;
++ 	query->qclass = RFC1035_CLASS_IN;
++ 	xstrncpy(query->name, hostname, sizeof(query->name));
++     }
+      assert(offset <= sz);
+!     return offset;
+  }
+  
+  /*
+***************
+*** 633,646 ****
+   * probably be at least 512 octets.  The 'szp' initially
+   * specifies the size of the buffer, on return it contains
+   * the size of the message (i.e. how much to write).
+!  * Return value is the query ID.
+   */
+! unsigned short
+! rfc1035BuildPTRQuery(const struct in_addr addr, char *buf, size_t * szp)
+  {
+!     static rfc1035_header h;
+      size_t offset = 0;
+-     size_t sz = *szp;
+      static char rev[32];
+      unsigned int i;
+      memset(&h, '\0', sizeof(h));
+--- 656,668 ----
+   * probably be at least 512 octets.  The 'szp' initially
+   * specifies the size of the buffer, on return it contains
+   * the size of the message (i.e. how much to write).
+!  * Returns the size of the query
+   */
+! ssize_t
+! rfc1035BuildPTRQuery(const struct in_addr addr, char *buf, size_t sz, unsigned short qid, rfc1035_query * query)
+  {
+!     static rfc1035_message h;
+      size_t offset = 0;
+      static char rev[32];
+      unsigned int i;
+      memset(&h, '\0', sizeof(h));
+***************
+*** 650,656 ****
+  	(i >> 8) & 255,
+  	(i >> 16) & 255,
+  	(i >> 24) & 255);
+!     h.id = rfc1035Qid();
+      h.qr = 0;
+      h.rd = 1;
+      h.opcode = 0;		/* QUERY */
+--- 672,678 ----
+  	(i >> 8) & 255,
+  	(i >> 16) & 255,
+  	(i >> 24) & 255);
+!     h.id = qid;
+      h.qr = 0;
+      h.rd = 1;
+      h.opcode = 0;		/* QUERY */
+***************
+*** 661,669 ****
+  	rev,
+  	RFC1035_TYPE_PTR,
+  	RFC1035_CLASS_IN);
+      assert(offset <= sz);
+!     *szp = offset;
+!     return h.id;
+  }
+  
+  /*
+--- 683,695 ----
+  	rev,
+  	RFC1035_TYPE_PTR,
+  	RFC1035_CLASS_IN);
++     if (query) {
++ 	query->qtype = RFC1035_TYPE_PTR;
++ 	query->qclass = RFC1035_CLASS_IN;
++ 	xstrncpy(query->name, rev, sizeof(query->name));
++     }
+      assert(offset <= sz);
+!     return offset;
+  }
+  
+  /*
+***************
+*** 671,683 ****
+   * just need a new ID for it.  Lucky for us ID
+   * is the first field in the message buffer.
+   */
+! unsigned short
+! rfc1035RetryQuery(char *buf)
+  {
+-     unsigned short qid = rfc1035Qid();
+      unsigned short s = htons(qid);
+      memcpy(buf, &s, sizeof(s));
+-     return qid;
+  }
+  
+  #if DRIVER
+--- 697,707 ----
+   * just need a new ID for it.  Lucky for us ID
+   * is the first field in the message buffer.
+   */
+! void
+! rfc1035SetQueryID(char *buf, unsigned short qid)
+  {
+      unsigned short s = htons(qid);
+      memcpy(buf, &s, sizeof(s));
+  }
+  
+  #if DRIVER
+Index: squid/src/dns_internal.c
+diff -c squid/src/dns_internal.c:1.45.2.6 squid/src/dns_internal.c:1.45.2.8
+*** squid/src/dns_internal.c:1.45.2.6	Mon Mar  7 06:31:35 2005
+--- squid/src/dns_internal.c	Tue May 10 10:06:56 2005
+***************
+*** 55,61 ****
+  
+  struct _idns_query {
+      hash_link hash;
+!     char query[RFC1035_MAXHOSTNAMESZ + 1];
+      char buf[512];
+      size_t sz;
+      unsigned short id;
+--- 55,61 ----
+  
+  struct _idns_query {
+      hash_link hash;
+!     rfc1035_query query;
+      char buf[512];
+      size_t sz;
+      unsigned short id;
+***************
+*** 442,447 ****
+--- 442,464 ----
+      return NULL;
+  }
+  
++ static unsigned short
++ idnsQueryID(void)
++ {
++     unsigned short id = squid_random() & 0xFFFF;
++     unsigned short first_id = id;
++ 
++     while (idnsFindQuery(id)) {
++ 	id++;
++ 
++ 	if (id == first_id)
++ 	    break;
++     }
++ 
++     return squid_random() & 0xFFFF;
++ }
++ 
++ 
+  static void
+  idnsCallback(idns_query * q, rfc1035_rr * answers, int n, const char *error)
+  {
+***************
+*** 469,498 ****
+  idnsGrokReply(const char *buf, size_t sz)
+  {
+      int n;
+!     rfc1035_rr *answers = NULL;
+!     unsigned short rid = 0xFFFF;
+      idns_query *q;
+!     n = rfc1035AnswersUnpack(buf,
+  	sz,
+! 	&answers,
+! 	&rid);
+!     debug(78, 3) ("idnsGrokReply: ID %#hx, %d answers\n", rid, n);
+!     if (rid == 0xFFFF) {
+! 	debug(78, 1) ("idnsGrokReply: Unknown error\n");
+! 	/* XXX leak answers? */
+  	return;
+      }
+!     q = idnsFindQuery(rid);
+      if (q == NULL) {
+  	debug(78, 3) ("idnsGrokReply: Late response\n");
+! 	rfc1035RRDestroy(answers, n);
+  	return;
+      }
+      dlinkDelete(&q->lru, &lru_list);
+      idnsRcodeCount(n, q->attempt);
+      q->error = NULL;
+      if (n < 0) {
+! 	debug(78, 3) ("idnsGrokReply: error %d\n", rfc1035_errno);
+  	q->error = rfc1035_error_message;
+  	q->rcode = -n;
+  	if (q->rcode == 2 && ++q->attempt < MAX_ATTEMPT) {
+--- 486,519 ----
+  idnsGrokReply(const char *buf, size_t sz)
+  {
+      int n;
+!     rfc1035_message *message = NULL;
+      idns_query *q;
+!     n = rfc1035MessageUnpack(buf,
+  	sz,
+! 	&message);
+!     if (message == NULL) {
+! 	debug(78, 2) ("idnsGrokReply: Malformed DNS response\n");
+  	return;
+      }
+!     debug(78, 3) ("idnsGrokReply: ID %#hx, %d answers\n", message->id, n);
+! 
+!     q = idnsFindQuery(message->id);
+! 
+      if (q == NULL) {
+  	debug(78, 3) ("idnsGrokReply: Late response\n");
+! 	rfc1035MessageDestroy(message);
+! 	return;
+!     }
+!     if (rfc1035QueryCompare(&q->query, message->query) != 0) {
+! 	debug(78, 3) ("idnsGrokReply: Query mismatch (%s != %s)\n", q->query.name, message->query->name);
+! 	rfc1035MessageDestroy(message);
+  	return;
+      }
+      dlinkDelete(&q->lru, &lru_list);
+      idnsRcodeCount(n, q->attempt);
+      q->error = NULL;
+      if (n < 0) {
+! 	debug(78, 3) ("idnsGrokReply: error %s (%d)\n", rfc1035_error_message, rfc1035_errno);
+  	q->error = rfc1035_error_message;
+  	q->rcode = -n;
+  	if (q->rcode == 2 && ++q->attempt < MAX_ATTEMPT) {
+***************
+*** 501,515 ****
+  	     * unable to process this query due to a problem with
+  	     * the name server."
+  	     */
+! 	    assert(NULL == answers);
+  	    q->start_t = current_time;
+! 	    q->id = rfc1035RetryQuery(q->buf);
+  	    idnsSendQuery(q);
+  	    return;
+  	}
+      }
+!     idnsCallback(q, answers, n, q->error);
+!     rfc1035RRDestroy(answers, n);
+      memFree(q, MEM_IDNS_QUERY);
+  }
+  
+--- 522,538 ----
+  	     * unable to process this query due to a problem with
+  	     * the name server."
+  	     */
+! 	    rfc1035MessageDestroy(message);
+  	    q->start_t = current_time;
+! 	    q->id = idnsQueryID();
+! 	    rfc1035SetQueryID(q->buf, q->id);
+  	    idnsSendQuery(q);
+  	    return;
+  	}
+      }
+!     idnsCallback(q, message->answer, n, q->error);
+!     rfc1035MessageDestroy(message);
+! 
+      memFree(q, MEM_IDNS_QUERY);
+  }
+  
+***************
+*** 527,533 ****
+  	from_len = sizeof(from);
+  	memset(&from, '\0', from_len);
+  	statCounter.syscalls.sock.recvfroms++;
+! 	len = recvfrom(fd, rbuf, 512, 0, (struct sockaddr *) &from, &from_len);
+  	if (len == 0)
+  	    break;
+  	if (len < 0) {
+--- 550,556 ----
+  	from_len = sizeof(from);
+  	memset(&from, '\0', from_len);
+  	statCounter.syscalls.sock.recvfroms++;
+! 	len = recvfrom(fd, rbuf, sizeof(rbuf), 0, (struct sockaddr *) &from, &from_len);
+  	if (len == 0)
+  	    break;
+  	if (len < 0) {
+***************
+*** 563,585 ****
+  	    }
+  	    continue;
+  	}
+- 	if (len > 512) {
+- 	    /*
+- 	     * Check for non-conforming replies.  RFC 1035 says
+- 	     * DNS/UDP messages must be 512 octets or less.  If we
+- 	     * get one that is too large, we generate a warning
+- 	     * and then pretend that we only got 512 octets.  This
+- 	     * should prevent the rfc1035.c code from reading past
+- 	     * the end of our buffer.
+- 	     */
+- 	    static int other_large_pkts = 0;
+- 	    int x;
+- 	    x = (ns < 0) ? ++other_large_pkts : ++nameservers[ns].large_pkts;
+- 	    if (isPowTen(x))
+- 		debug(78, 1) ("WARNING: Got %d large DNS replies from %s\n",
+- 		    x, inet_ntoa(from.sin_addr));
+- 	    len = 512;
+- 	}
+  	idnsGrokReply(rbuf, len);
+      }
+      if (lru_list.head)
+--- 586,591 ----
+***************
+*** 722,731 ****
+  }
+  
+  static void
+! idnsCacheQuery(idns_query * q, const char *key)
+  {
+!     xstrncpy(q->query, key, sizeof(q->query));
+!     q->hash.key = q->query;
+      hash_join(idns_lookup_hash, &q->hash);
+  }
+  
+--- 728,736 ----
+  }
+  
+  static void
+! idnsCacheQuery(idns_query * q)
+  {
+!     q->hash.key = q->query.name;
+      hash_join(idns_lookup_hash, &q->hash);
+  }
+  
+***************
+*** 736,744 ****
+      if (idnsCachedLookup(name, callback, data))
+  	return;
+      q = memAllocate(MEM_IDNS_QUERY);
+!     q->sz = sizeof(q->buf);
+!     q->id = rfc1035BuildAQuery(name, q->buf, &q->sz);
+!     if (0 == q->id) {
+  	/* problem with query data -- query not sent */
+  	callback(data, NULL, 0, "Internal error");
+  	memFree(q, MEM_IDNS_QUERY);
+--- 741,749 ----
+      if (idnsCachedLookup(name, callback, data))
+  	return;
+      q = memAllocate(MEM_IDNS_QUERY);
+!     q->id = idnsQueryID();
+!     q->sz = rfc1035BuildAQuery(name, q->buf, sizeof(q->buf), q->id, &q->query);
+!     if (q->sz < 0) {
+  	/* problem with query data -- query not sent */
+  	callback(data, NULL, 0, "Internal error");
+  	memFree(q, MEM_IDNS_QUERY);
+***************
+*** 750,756 ****
+      q->callback_data = data;
+      cbdataLock(q->callback_data);
+      q->start_t = current_time;
+!     idnsCacheQuery(q, name);
+      idnsSendQuery(q);
+  }
+  
+--- 755,761 ----
+      q->callback_data = data;
+      cbdataLock(q->callback_data);
+      q->start_t = current_time;
+!     idnsCacheQuery(q);
+      idnsSendQuery(q);
+  }
+  
+***************
+*** 762,776 ****
+      if (idnsCachedLookup(ip, callback, data))
+  	return;
+      q = memAllocate(MEM_IDNS_QUERY);
+!     q->sz = sizeof(q->buf);
+!     q->id = rfc1035BuildPTRQuery(addr, q->buf, &q->sz);
+      debug(78, 3) ("idnsPTRLookup: buf is %d bytes for %s, id = %#hx\n",
+  	(int) q->sz, ip, q->id);
+      q->callback = callback;
+      q->callback_data = data;
+      cbdataLock(q->callback_data);
+      q->start_t = current_time;
+!     idnsCacheQuery(q, ip);
+      idnsSendQuery(q);
+  }
+  
+--- 767,787 ----
+      if (idnsCachedLookup(ip, callback, data))
+  	return;
+      q = memAllocate(MEM_IDNS_QUERY);
+!     q->id = idnsQueryID();
+!     q->sz = rfc1035BuildPTRQuery(addr, q->buf, sizeof(q->buf), q->id, &q->query);
+      debug(78, 3) ("idnsPTRLookup: buf is %d bytes for %s, id = %#hx\n",
+  	(int) q->sz, ip, q->id);
++     if (q->sz < 0) {
++ 	/* problem with query data -- query not sent */
++ 	callback(data, NULL, 0, "Internal error");
++ 	memFree(q, MEM_IDNS_QUERY);
++ 	return;
++     }
+      q->callback = callback;
+      q->callback_data = data;
+      cbdataLock(q->callback_data);
+      q->start_t = current_time;
+!     idnsCacheQuery(q);
+      idnsSendQuery(q);
+  }
+  

Modified: tinysofa/releases/classic/2.0/squid/current/specs/squid.spec
===================================================================
--- tinysofa/releases/classic/2.0/squid/current/specs/squid.spec	2005-05-11 18:12:24 UTC (rev 6321)
+++ tinysofa/releases/classic/2.0/squid/current/specs/squid.spec	2005-05-11 18:26:49 UTC (rev 6322)
@@ -4,7 +4,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE9
-Release: 2jh
+Release: 3jh
 Epoch: 0
 License: GPL
 Group: extra
@@ -47,9 +47,9 @@
 Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-transparent_port.patch
 Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-squid_k_nohostname.patch
 Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_CRLF.patch
+Patch130: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dns_query-2.patch
 
 
-
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
@@ -113,6 +113,7 @@
 %patch127 -p1
 %patch128 -p1
 %patch129 -p1
+%patch130 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -337,6 +338,9 @@
 
 
 %changelog
+* Wed May 11 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE9-3jh
+- fix DNS lookup spoofing vulnerability
+
 * Tue Apr 26 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.5.STABLE9-2jh
 - add upstream patches
 



From svn at tinysofa.org  Wed May 11 18:57:19 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 14:57:19 -0400 (EDT)
Subject: [tinysofa-svn] r6323 - in
	contrib/classic/2.0/perl-convert-uulib/current: sources specs
Message-ID: <20050511185719.A0FAD344C6A@minbar.tinysofa.org>

Author: gda
Date: 2005-05-11 14:57:05 -0400 (Wed, 11 May 2005)
New Revision: 6323

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

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

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


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

Modified: contrib/classic/2.0/perl-convert-uulib/current/specs/perl-convert-uulib.spec
===================================================================
--- contrib/classic/2.0/perl-convert-uulib/current/specs/perl-convert-uulib.spec	2005-05-11 18:26:49 UTC (rev 6322)
+++ contrib/classic/2.0/perl-convert-uulib/current/specs/perl-convert-uulib.spec	2005-05-11 18:57:05 UTC (rev 6323)
@@ -2,7 +2,7 @@
 
 Summary:The Perl module Convert-UUlib.
 Name: perl-convert-uulib
-Version: 1.04
+Version: 1.051
 Release: 1gd
 License: Artistic, GPL
 Group: contrib
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 1.051-1gd
+- new upstream version
+
 * Wed Feb  9 2005 Gerald Dachs <gda at tinysofa dot org> 1.04-1gd
 - new upstream version
 



From svn at tinysofa.org  Wed May 11 19:10:31 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 15:10:31 -0400 (EDT)
Subject: [tinysofa-svn] r6324 - in contrib/classic/2.0/amavisd-new/current:
	sources specs
Message-ID: <20050511191031.7BB4F344C20@minbar.tinysofa.org>

Author: gda
Date: 2005-05-11 15:10:02 -0400 (Wed, 11 May 2005)
New Revision: 6324

Added:
   contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.1.tar.gz
Removed:
   contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.2.1.tar.gz
Modified:
   contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf
   contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec
Log:
new upstream

Deleted: contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.2.1.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/amavisd-new/current/sources/amavisd-new-2.3.1.tar.gz
===================================================================
(Binary files differ)


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

Modified: contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf
===================================================================
--- contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf	2005-05-11 18:57:05 UTC (rev 6323)
+++ contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf	2005-05-11 19:10:02 UTC (rev 6324)
@@ -20,10 +20,11 @@
 $mydomain = 'example.com';   # a convenient default for other settings
 
 #$MYHOME   = '/var/amavis';   # a convenient default for other settings
-$TEMPBASE = "$MYHOME";   
+$TEMPBASE = "$MYHOME";
 #$TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
 $QUARANTINEDIR = "$MYHOME/virusmails";
+# $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
 
 # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
 
@@ -34,7 +35,8 @@
 #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
 
 @local_domains_maps = ( [".$mydomain"] );
-# @mynetworks = qw( 127.0.0.0/8 ::1 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
+# @mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
+#                   10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
 
 $log_level = 0;              # verbosity 0..5
 $log_recip_templ = undef;    # disable by-recipient level-0 log entries
@@ -50,7 +52,8 @@
 $sa_tag_level_deflt  = 2.0;  # add spam info headers if at, or above that level
 $sa_tag2_level_deflt = 6.31; # add 'spam detected' headers at that level
 $sa_kill_level_deflt = 6.31; # triggers spam evasive actions
-$sa_dsn_cutoff_level = 10;   # spam level beyond which a DSN is not sent
+$sa_dsn_cutoff_level = 9;    # spam level beyond which a DSN is not sent
+$sa_quarantine_cutoff_level = 20;  # spam level beyond which quarantine is off
 
 $sa_mail_body_size_limit = 200*1024; # don't waste time on SA if mail is larger
 $sa_local_tests_only = 0;    # only tests which do not require internet access?
@@ -59,7 +62,9 @@
 
 # @lookup_sql_dsn =
 #   ( ['DBI:mysql:database=mail;host=127.0.0.1;port=3306', 'user1', 'passwd1'],
-#     ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'] );
+#     ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'],
+#     ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] );
+# @storage_sql_dsn = @lookup_sql_dsn;  # none, same, or separate database
 
 $virus_admin               = "virusalert\@$mydomain";  # notifications recip.
 
@@ -76,24 +81,7 @@
 # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
 
 $path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
-$file   = 'file';   # file(1) utility; use recent versions
-$gzip   = 'gzip';
-$bzip2  = 'bzip2';
-$lzop   = 'lzop';
-$rpm2cpio   = ['rpm2cpio.pl','rpm2cpio'];
-$cabextract = 'cabextract';
-$uncompress = ['uncompress', 'gzip -d', 'zcat'];
-$unfreeze   = ['unfreeze', 'freeze -d', 'melt', 'fcat'];
-$arc        = ['nomarch', 'arc'];
-$unarj      = ['arj', 'unarj'];
-$unrar      = ['rar', 'unrar'];
-$zoo    = 'zoo';
-$lha    = 'lha';
-$pax    = 'pax';
-$cpio   = ['gcpio','cpio'];
-$ar     = 'ar';
-$ripole = 'ripole';
-$dspam  = 'dspam';
+# $dspam = 'dspam';
 
 $MAXLEVELS = 14;
 $MAXFILES = 1500;
@@ -142,7 +130,7 @@
 @viruses_that_fake_sender_maps = (new_RE(
 # [qr'\bEICAR\b'i => 0],            # av test pattern name
 # [qr'^(WM97|OF97|Joke\.)'i => 0],  # adjust names to match your AV scanner
-  [qr/.*/ => 1],  # true for everything else
+  [qr/^/ => 1],  # true for everything else
 ));
 
 @keep_decoded_original_maps = (new_RE(
@@ -159,15 +147,16 @@
 # qr'^UNDECIPHERABLE$',  # is or contains any undecipherable components
 
   # block certain double extensions anywhere in the base name
-  qr'\.[^./]*\.(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)\.?$'i,
+  qr'\.[^./]*[A-Za-z][^./]*\.(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)\.?$'i,
 
-# qr'[{}]',      # curly braces in names (serve as Class ID extensions - CLSID)
+# qr'\{[0-9a-z]{4,}(-[0-9a-z]{4,}){0,7}\}?'i,  # Class ID extensions - CLSID
 
   qr'^application/x-msdownload$'i,                  # block these MIME types
   qr'^application/x-msdos-program$'i,
   qr'^application/hta$'i,
 
-# qr'^message/partial$'i, qr'^message/external-body$'i, # rfc2046 MIME types
+# qr'^message/partial$'i,         # rfc2046 MIME type
+# qr'^message/external-body$'i,   # rfc2046 MIME type
 
 # [ qr'^\.(Z|gz|bz2)$'           => 0 ],  # allow any in Unix-compressed
   [ qr'^\.(rpm|cpio|tar)$'       => 0 ],  # allow any in Unix-type archives
@@ -254,6 +243,38 @@
 });
 
 
+ at decoders = (
+  ['mail', \&do_mime_decode],
+  ['asc',  \&do_ascii],
+  ['uue',  \&do_ascii],
+  ['hqx',  \&do_ascii],
+  ['ync',  \&do_ascii],
+  ['F',    \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
+  ['Z',    \&do_uncompress, ['uncompress','gzip -d','zcat'] ],
+  ['gz',   \&do_gunzip],
+  ['gz',   \&do_uncompress,  'gzip -d'],
+  ['bz2',  \&do_uncompress,  'bzip2 -d'],
+  ['lzo',  \&do_uncompress,  'lzop -d'],
+  ['rpm',  \&do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ],
+  ['cpio', \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
+  ['tar',  \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
+  ['tar',  \&do_tar],
+  ['deb',  \&do_ar,          'ar'],
+# ['a',    \&do_ar,          'ar'],  # unpacking .a seems an overkill
+  ['zip',  \&do_unzip],
+  ['rar',  \&do_unrar,      ['rar','unrar'] ],
+  ['arj',  \&do_unarj,      ['arj','unarj'] ],
+  ['arc',  \&do_arc,        ['nomarch','arc'] ],
+  ['zoo',  \&do_zoo,         'zoo'],
+  ['lha',  \&do_lha,         'lha'],
+# ['doc',  \&do_ole,         'ripole'],
+  ['cab',  \&do_cabextract,  'cabextract'],
+  ['tnef', \&do_tnef_ext,    'tnef'],
+  ['tnef', \&do_tnef],
+  ['exe',  \&do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ],
+);
+
+
 @av_scanners = (
 
 # ### http://www.vanja.com/tools/sophie/
@@ -360,16 +381,28 @@
     # cp AvpDaemonClient /opt/AVP/
     # su - vscan -c "${PREFIX}/kavdaemon ${DPARMS}"
 
-  ### http://www.hbedv.com/ or http://www.centralcommand.com/
-  ['H+BEDV AntiVir or CentralCommand Vexira Antivirus',
+  ### http://www.centralcommand.com/
+  ['CentralCommand Vexira (new) vascan',
+    ['vascan','/usr/lib/Vexira/vascan'],
+    "-a s --timeout=60 --temp=$TEMPBASE -y $QUARANTINEDIR ".
+    "--vdb=/usr/lib/Vexira/vexira8.vdb --log=/var/log/vascan.log {}",
+    [0,3], [1,2,5],
+    qr/(?x)^\s* (?:virus|iworm|macro|mutant|sequence|trojan)\ found:\ ( [^\]\s']+ )\ \.\.\.\ / ],
+    # Adjust the path of the binary and the virus database as needed.
+    # 'vascan' does not allow to have the temp directory to be the same as
+    # the quarantine directory, and the quarantine option can not be disabled.
+    # If $QUARANTINEDIR is not used, then another directory must be specified
+    # to appease 'vascan'. Move status 3 to the second list if password
+    # protected files are to be considered infected.
+
+  ### http://www.hbedv.com/
+  ['H+BEDV AntiVir or the (old) CentralCommand Vexira Antivirus',
     ['antivir','vexira'],
     '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/,
     qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) |
          (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/ ],
     # NOTE: if you only have a demo version, remove -z and add 214, as in:
     #  '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/,
-    # According to the documentations, the new version of Vexira has
-    # reasonable defaults, one may consider: "--timeout=60 --temp=$TEMPBASE {}"
 
   ### http://www.commandsoftware.com/
   ['Command AntiVirus for Linux', 'csav',
@@ -409,7 +442,7 @@
   ### http://mks.com.pl/english.html
   ['MkS_Vir for Linux (beta)', ['mks32','mks'],
     '-s {}/*', [0], [1,2],
-    qr/--[ \t]*(.+)/ ], 
+    qr/--[ \t]*(.+)/ ],
 
   ### http://mks.com.pl/english.html
   ['MkS_Vir daemon', 'mksscan',
@@ -477,18 +510,19 @@
 
   ### http://www.virusbuster.hu/en/
   ['VirusBuster', ['vbuster', 'vbengcl'],
-    # VirusBuster Ltd. does not support the daemon version for the workstation 
-    # engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of
-    # binaries, some parameters AND return codes have changed (from 3 to 1).
     "{} -ss -i '*' -log=$MYHOME/vbuster.log", [0], [1],
     qr/: '(.*)' - Virus/ ],
+  # VirusBuster Ltd. does not support the daemon version for the workstation
+  # engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of
+  # binaries, some parameters AND return codes have changed (from 3 to 1).
+  # See also the new Vexira entry 'vascan' which is possibly related.
 
 # ### http://www.virusbuster.hu/en/
 # ['VirusBuster (Client + Daemon)', 'vbengd',
-#   # HINT: for an infected file it always returns 3,
-#   # although the man-page tells a different story
 #   '-f -log scandir {}', [0], [3],
 #   qr/Virus found = (.*);/ ],
+# # HINT: for an infected file it always returns 3,
+# # although the man-page tells a different story
 
   ### http://www.cyber.com/
   ['CyberSoft VFind', 'vfind',
@@ -534,7 +568,7 @@
   ### http://www.f-prot.com/   - backs up F-Prot Daemon
   ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
     '-dumb -archive -packed {}', [0,8], [3,6],
-    qr/Infection: (.+)/ ],
+    qr/Infection: (.+)|\s+contains\s+(.+)$/ ],
 
   ### http://www.trendmicro.com/   - backs up Trophie
   ['Trend Micro FileScanner', ['/etc/iscan/vscan','vscan'],

Modified: contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec
===================================================================
--- contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec	2005-05-11 18:57:05 UTC (rev 6323)
+++ contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec	2005-05-11 19:10:02 UTC (rev 6324)
@@ -1,6 +1,6 @@
 Name:      amavisd-new
-Version:   2.2.1
-Release:   3gd
+Version:   2.3.1
+Release:   1gd
 Summary:   AMaViSd-new - A Mail Virus Scanner
 URL:       http://www.ijs.si/software/amavisd/
 License:   GPL
@@ -20,7 +20,7 @@
 Requires: perl-archive-zip >= 1.0
 Requires: perl-compress-zlib
 Requires: perl-convert-tnef >= 0.06
-Requires: perl-convert-uulib
+Requires: perl-convert-uulib >= 1.05
 Requires: perl-digest-perl-md5
 Requires: perl-io-multiplex
 Requires: perl-io-socket-ssl
@@ -123,6 +123,9 @@
 %perl_vendorlib/JpegTester.pm
 
 %changelog
+* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 2.3.1-3gd
+- 2.3.1
+
 * Sun Mar 13 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.1-3gd
 - added JpegTester.pm to installed files
 



From svn at tinysofa.org  Wed May 11 21:05:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 17:05:50 -0400 (EDT)
Subject: [tinysofa-svn] r6325 - in contrib/classic/2.0: . perl-net-cidr-lite
	perl-net-cidr-lite/current perl-net-cidr-lite/current/sources
	perl-net-cidr-lite/current/specs
Message-ID: <20050511210550.A34B7344C4B@minbar.tinysofa.org>

Author: gda
Date: 2005-05-11 17:05:41 -0400 (Wed, 11 May 2005)
New Revision: 6325

Added:
   contrib/classic/2.0/perl-net-cidr-lite/
   contrib/classic/2.0/perl-net-cidr-lite/current/
   contrib/classic/2.0/perl-net-cidr-lite/current/sources/
   contrib/classic/2.0/perl-net-cidr-lite/current/sources/Net-CIDR-Lite-0.15.tar.gz
   contrib/classic/2.0/perl-net-cidr-lite/current/specs/
   contrib/classic/2.0/perl-net-cidr-lite/current/specs/perl-net-cidr-lite.spec
   contrib/classic/2.0/perl-net-cidr-lite/pristine/
   contrib/classic/2.0/perl-net-cidr-lite/releases/
Log:
new in contrib

Added: contrib/classic/2.0/perl-net-cidr-lite/current/sources/Net-CIDR-Lite-0.15.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/perl-net-cidr-lite/current/sources/Net-CIDR-Lite-0.15.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/perl-net-cidr-lite/current/specs/perl-net-cidr-lite.spec
===================================================================
--- contrib/classic/2.0/perl-net-cidr-lite/current/specs/perl-net-cidr-lite.spec	2005-05-11 19:10:02 UTC (rev 6324)
+++ contrib/classic/2.0/perl-net-cidr-lite/current/specs/perl-net-cidr-lite.spec	2005-05-11 21:05:41 UTC (rev 6325)
@@ -0,0 +1,51 @@
+%define perlname Net-CIDR-Lite
+
+Summary:The Perl module Net-CIDR-Lite.
+Name: perl-net-cidr-lite
+Version: 0.15
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module Net-CIDR-Lite.
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc Changes MANIFEST README
+
+
+%changelog
+* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 0.15-1gd
+- new in tinysofa contrib



From svn at tinysofa.org  Wed May 11 21:06:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 11 May 2005 17:06:25 -0400 (EDT)
Subject: [tinysofa-svn] r6326 - in contrib/classic/2.0: .
	perl-mail-spf-query perl-mail-spf-query/current
	perl-mail-spf-query/current/sources
	perl-mail-spf-query/current/specs
Message-ID: <20050511210625.ECE14344B89@minbar.tinysofa.org>

Author: gda
Date: 2005-05-11 17:06:15 -0400 (Wed, 11 May 2005)
New Revision: 6326

Added:
   contrib/classic/2.0/perl-mail-spf-query/
   contrib/classic/2.0/perl-mail-spf-query/current/
   contrib/classic/2.0/perl-mail-spf-query/current/sources/
   contrib/classic/2.0/perl-mail-spf-query/current/sources/Mail-SPF-Query-1.997.tar.gz
   contrib/classic/2.0/perl-mail-spf-query/current/specs/
   contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec
   contrib/classic/2.0/perl-mail-spf-query/pristine/
   contrib/classic/2.0/perl-mail-spf-query/releases/
Log:
new in contrib

Added: contrib/classic/2.0/perl-mail-spf-query/current/sources/Mail-SPF-Query-1.997.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/perl-mail-spf-query/current/sources/Mail-SPF-Query-1.997.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec
===================================================================
--- contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec	2005-05-11 21:05:41 UTC (rev 6325)
+++ contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec	2005-05-11 21:06:15 UTC (rev 6326)
@@ -0,0 +1,53 @@
+%define perlname Mail-SPF-Query
+
+Summary:The Perl module Mail-SPF-Query.
+Name: perl-mail-spf-query
+Version: 1.997
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRequires: perl-net-cidr-lite perl-net-dns
+Requires: perl-net-cidr-lite perl-net-dns
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+
+%description
+The Perl module Mail-SPF-Query.
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc Changes MANIFEST README
+
+
+%changelog
+* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 1.997-1gd
+- new in tinysofa contrib



From svn at tinysofa.org  Thu May 12 06:19:59 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 12 May 2005 02:19:59 -0400 (EDT)
Subject: [tinysofa-svn] r6327 -
	tinysofa/releases/classic/2.0/kernel/current/specs
Message-ID: <20050512061959.CDA52344B45@minbar.tinysofa.org>

Author: jh
Date: 2005-05-12 02:19:53 -0400 (Thu, 12 May 2005)
New Revision: 6327

Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- correctly appy linux-2.6.11-elf-coredump.patch


Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-11 21:06:15 UTC (rev 6326)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-12 06:19:53 UTC (rev 6327)
@@ -93,7 +93,7 @@
 Patch103: linux-2.6.11-grsec-gracl-fix.patch
 Patch104: linux-2.6.11-ext2-corruption.patch
 Patch105: linux-2.6.11-mm-selected-bits.patch
-Patch106: linux-2.6.11-mm-selected-bits.patch
+Patch106: linux-2.6.11-elf-coredump.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 
@@ -244,7 +244,7 @@
 %patch103 -p1 -b .gracl~
 %patch104 -p1 -b .ext2-corruption~
 %patch105 -p1 -b .mm-selected-bits~
-%patch105 -p1 -b .elf-coredump~
+%patch106 -p1 -b .elf-coredump~
 
 %patch20020 -p1 -b .tinysofa-syslog~
 



From svn at tinysofa.org  Thu May 12 09:44:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 12 May 2005 05:44:35 -0400 (EDT)
Subject: [tinysofa-svn] r6328 - in
	tinysofa/releases/classic/2.0/bash/current: sources specs
Message-ID: <20050512094435.2CA57344C26@minbar.tinysofa.org>

Author: jh
Date: 2005-05-12 05:44:20 -0400 (Thu, 12 May 2005)
New Revision: 6328

Added:
   tinysofa/releases/classic/2.0/bash/current/sources/bash-afs.patch
   tinysofa/releases/classic/2.0/bash/current/sources/bash-crash.patch
   tinysofa/releases/classic/2.0/bash/current/sources/bash-pwd.patch
   tinysofa/releases/classic/2.0/bash/current/sources/bash-wrap.patch
Modified:
   tinysofa/releases/classic/2.0/bash/current/specs/bash.spec
Log:
- require texinfo to get manual page installed
- add patches from Fedora


Added: tinysofa/releases/classic/2.0/bash/current/sources/bash-afs.patch
===================================================================
--- tinysofa/releases/classic/2.0/bash/current/sources/bash-afs.patch	2005-05-12 06:19:53 UTC (rev 6327)
+++ tinysofa/releases/classic/2.0/bash/current/sources/bash-afs.patch	2005-05-12 09:44:20 UTC (rev 6328)
@@ -0,0 +1,13 @@
+--- bash-3.0/redir.c.afs	2005-04-20 09:16:15.000000000 +0100
++++ bash-3.0/redir.c	2005-04-20 09:16:58.000000000 +0100
+@@ -596,7 +596,9 @@
+       fd = open (filename, flags, mode);
+ #if defined (AFS)
+       if ((fd < 0) && (errno == EACCES))
+-	fd = open (filename, flags & ~O_CREAT, mode);
++	if ((fd = open (filename, flags & ~O_CREAT, mode)) < 0)
++	  /* Restore previous errno. */
++	  errno = EACCES;
+ #endif /* AFS */
+     }
+ 

Added: tinysofa/releases/classic/2.0/bash/current/sources/bash-crash.patch
===================================================================
--- tinysofa/releases/classic/2.0/bash/current/sources/bash-crash.patch	2005-05-12 06:19:53 UTC (rev 6327)
+++ tinysofa/releases/classic/2.0/bash/current/sources/bash-crash.patch	2005-05-12 09:44:20 UTC (rev 6328)
@@ -0,0 +1,46 @@
+> Machine Type: i686-pc-linux-gnu
+> 
+> Bash Version: 3.0
+> Patch Level: 0
+> Release Status: release
+> 
+> Description:
+>         GNU bash, version 3.00.0(1)-release (i686-pc-linux-gnu)
+>         (and
+>         GNU bash, version 2.05b.0(1)-release (i386-redhat-linux-gnu)
+> 
+>         dumps a core because of a null pointer "in make_bare_word 
+>         at make_cmd.c:90" (see gdb output below)
+
+Thanks for the report.  Here's a quick fix:
+
+*** arrayfunc.c~	Sat Nov  6 15:08:29 2004
+--- arrayfunc.c	Mon Jan 31 11:56:21 2005
+***************
+*** 709,713 ****
+  	  return ((char *)NULL);
+  	}
+!       else if (var == 0)
+  	return ((char *)NULL);
+        else if (array_p (var) == 0)
+--- 709,713 ----
+  	  return ((char *)NULL);
+  	}
+!       else if (var == 0 || value_cell (var) == 0)
+  	return ((char *)NULL);
+        else if (array_p (var) == 0)
+
+
+Chet
+
+-- 
+``The lyf so short, the craft so long to lerne.'' - Chaucer
+( ``Discere est Dolere'' -- chet )
+						Live...Laugh...Love
+Chet Ramey, ITS, CWRU    chet at po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
+
+
+_______________________________________________
+Bug-bash mailing list
+Bug-bash at gnu.org
+http://lists.gnu.org/mailman/listinfo/bug-bash

Added: tinysofa/releases/classic/2.0/bash/current/sources/bash-pwd.patch
===================================================================
--- tinysofa/releases/classic/2.0/bash/current/sources/bash-pwd.patch	2005-05-12 06:19:53 UTC (rev 6327)
+++ tinysofa/releases/classic/2.0/bash/current/sources/bash-pwd.patch	2005-05-12 09:44:20 UTC (rev 6328)
@@ -0,0 +1,11 @@
+--- bash-3.0/parse.y.pwd	2005-03-15 14:22:36.000000000 +0000
++++ bash-3.0/parse.y	2005-03-15 14:22:37.000000000 +0000
+@@ -4103,7 +4103,7 @@
+ #define ROOT_PATH(x)	((x)[0] == '/' && (x)[1] == 0)
+ #define DOUBLE_SLASH_ROOT(x)	((x)[0] == '/' && (x)[1] == '/' && (x)[2] == 0)
+ 		/* Abbreviate \W as ~ if $PWD == $HOME */
+-		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, temp) == 0))
++		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, t_string) == 0))
+ 		  {
+ 		    if (ROOT_PATH (t_string) == 0 && DOUBLE_SLASH_ROOT (t_string) == 0)
+ 		      {

Added: tinysofa/releases/classic/2.0/bash/current/sources/bash-wrap.patch
===================================================================
--- tinysofa/releases/classic/2.0/bash/current/sources/bash-wrap.patch	2005-05-12 06:19:53 UTC (rev 6327)
+++ tinysofa/releases/classic/2.0/bash/current/sources/bash-wrap.patch	2005-05-12 09:44:20 UTC (rev 6328)
@@ -0,0 +1,28 @@
+--- bash-3.0/jobs.c.wrap	2005-01-27 15:48:45.000000000 +0000
++++ bash-3.0/jobs.c	2005-01-27 18:17:34.078141310 +0000
+@@ -759,6 +759,25 @@
+   t->command = name;
+   the_pipeline = t;
+ 
++  /* Sanity check */
++  {
++    PROCESS *p;
++    int job;
++    job = find_job (pid, 0);
++    if (job != NO_JOB)
++      {
++	p = jobs[job]->pipe;
++	do
++	  {
++	    if (p->pid == pid)
++	      break;
++	    p = p->next;
++	  } while (p != jobs[job]->pipe);
++	jobs[job]->flags |= J_NOTIFIED;
++	p->pid = 0; /* avoid confusion with the new process we just forked */
++      }
++  }
++
+   if (t->next == 0)
+     t->next = t;
+   else

Modified: tinysofa/releases/classic/2.0/bash/current/specs/bash.spec
===================================================================
--- tinysofa/releases/classic/2.0/bash/current/specs/bash.spec	2005-05-12 06:19:53 UTC (rev 6327)
+++ tinysofa/releases/classic/2.0/bash/current/specs/bash.spec	2005-05-12 09:44:20 UTC (rev 6328)
@@ -2,7 +2,7 @@
 Epoch: 1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 2jh
+Release: 3jh
 Group: main
 License: GPL
 Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
@@ -52,6 +52,10 @@
 Patch119: bash-sigpipe.patch
 Patch120: bash-read-e-segfault.patch
 Patch121: bash-manpage.patch
+Patch122: bash-wrap.patch
+Patch123: bash-crash.patch
+Patch124: bash-pwd.patch
+Patch125: bash-afs.patch
 Prefix: %{_prefix}
 Requires: mktemp
 Prereq: coreutils setup
@@ -59,7 +63,7 @@
 Obsoletes: bash-static <= 2.05.b-15ts
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: perl byacc autoconf
+BuildRequires: perl byacc bison gettext autoconf texinfo
 BuildRequires: libtermcap-devel
 
 %description
@@ -125,6 +129,10 @@
 %patch119 -p1 -b .sigpipe
 %patch120 -p0 -b .read-e-segfault
 %patch121 -p1 -b .manpage
+%patch122 -p1 -b .wrap
+%patch123 -p0 -b .crash
+%patch124 -p1 -b .pwd
+%patch125 -p1 -b .afs
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -262,6 +270,10 @@
 
 
 %changelog
+* Thu May 12 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.0-3jh
+- require texinfo to get manual page installed
+- add patches from Fedora
+
 * Mon Jan 10 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.0-1jh
 - 3.0 with Fedora patches
 - move more docs to doc subpackage



From svn at tinysofa.org  Thu May 12 18:54:56 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 12 May 2005 14:54:56 -0400 (EDT)
Subject: [tinysofa-svn] r6329 - in contrib/classic/2.0/firefox/current:
	sources specs
Message-ID: <20050512185456.640FD344B46@minbar.tinysofa.org>

Author: gda
Date: 2005-05-12 14:43:05 -0400 (Thu, 12 May 2005)
New Revision: 6329

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

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

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


Property changes on: contrib/classic/2.0/firefox/current/sources/firefox-1.0.4-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-05-12 09:44:20 UTC (rev 6328)
+++ contrib/classic/2.0/firefox/current/specs/firefox.spec	2005-05-12 18:43:05 UTC (rev 6329)
@@ -8,8 +8,8 @@
 
 Summary: Mozilla Firefox web browser
 Name: firefox
-Version: 1.0.3
-Release: 2gd
+Version: 1.0.4
+Release: 1gd
 License: MPL/LGPL
 Group: contrib
 URL: http://www.mozilla.org/projects/firefox/
@@ -236,6 +236,9 @@
 %endif
 
 %changelog
+* Thu May 12 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.4-1gd
+- 1.0.4
+
 * Sun Apr 17 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.3-2gd
 - gtk2 support only
 



From svn at tinysofa.org  Thu May 12 19:24:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 12 May 2005 15:24:48 -0400 (EDT)
Subject: [tinysofa-svn] r6330 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050512192448.48D4D344BDD@minbar.tinysofa.org>

Author: gda
Date: 2005-05-12 15:23:10 -0400 (Thu, 12 May 2005)
New Revision: 6330

Added:
   contrib/classic/2.0/clamav/current/sources/clamav-0.85.tar.gz
Removed:
   contrib/classic/2.0/clamav/current/sources/clamav-0.84.tar.gz
Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
0.85

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

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


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

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-12 18:43:05 UTC (rev 6329)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-12 19:23:10 UTC (rev 6330)
@@ -1,7 +1,7 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.84
-Release: 4jh
+Version: 0.85
+Release: 1gd
 License: GPL
 Group: contrib
 URL:     http://www.clamav.net
@@ -68,7 +68,6 @@
 # fi
 
 %configure \
-    --enable-debug \
     --program-prefix=%{?_program_prefix} \
     --enable-id-check \
     --disable-clamav \
@@ -178,6 +177,10 @@
 
 
 %changelog
+* Thu May 12 2005 Gerald Dachs <gda at tinysofa dot org> 0.85-1gd
+- 0.85
+- removed --enable-debug, debug code is broken
+
 * Sat May  7 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.84-4jh
 - add bzip2 support
 



From svn at tinysofa.org  Fri May 13 08:45:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 04:45:48 -0400 (EDT)
Subject: [tinysofa-svn] r6331 - in
	tinysofa/releases/classic/2.0/anaconda/current: sources specs
Message-ID: <20050513084548.6696F344C4B@minbar.tinysofa.org>

Author: jh
Date: 2005-05-13 04:45:34 -0400 (Fri, 13 May 2005)
New Revision: 6331

Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch
   tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
Log:
- boot screen cleanups on x86_64
- driver disk fixes
- hopefully fix a multiple raid array creation bug


Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-05-12 19:23:10 UTC (rev 6330)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-05-13 08:45:34 UTC (rev 6331)
@@ -94,7 +94,7 @@
 -                                     '--configfile', 
 -                                     raidtab, node),
 +
-+            args = ["/usr/sbin/mdadm", "--create", "/dev/%s" %(self.device,),
++            args = ["/usr/sbin/mdadm", "--create", node,
 +                    "--run", "--chunk=%s" %(self.chunksize,),
 +                    "--level=%s" %(self.level,),
 +                    "--raid-devices=%s" %(self.numDisks,)]

Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-12 19:23:10 UTC (rev 6330)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-modprobe.conf.patch	2005-05-13 08:45:34 UTC (rev 6331)
@@ -1,5 +1,5 @@
---- ./packages.py.modprobe.conf~	2005-05-10 16:22:20.000000000 +0300
-+++ ./packages.py	2005-05-10 16:28:47.000000000 +0300
+--- ./packages.py.modprobe.conf~	2005-05-10 19:55:34.000000000 +0300
++++ ./packages.py	2005-05-11 09:58:59.000000000 +0300
 @@ -674,6 +674,17 @@
          if os.access("/tmp/modules.conf", os.R_OK):
              iutil.copyFile("/tmp/modules.conf", 
@@ -27,3 +27,35 @@
                      unmountUSB = 1
                  except:
                      log("Mount of /proc/bus/usb in chroot failed")
+@@ -1208,10 +1219,10 @@
+                 pkg = "kernel-%s" %(tag,)
+             arch = grpset.hdrlist[pkg][rpm.RPMTAG_ARCH]
+             # version 1 path
+-            pattern = pattern + " %s/%s/%s.o " % (n, arch, name)
++            pattern = pattern + " %s/%s/%s.ko " % (n, arch, name)
+             # version 0 path
+-            pattern = pattern + " %s/%s.o " % (n, name)
+-            names = names + " %s.o" % (name,)
++            pattern = pattern + " %s/%s.ko " % (n, name)
++            names = names + " %s.ko" % (name,)
+ 	command = ("cd %s/lib/modules; gunzip < %s | "
+                    "%s/bin/cpio --quiet -iumd %s" % 
+                    (instPath, path, instPath, pattern))
+@@ -1226,7 +1237,7 @@
+             
+ 	    toDir = "%s/lib/modules/%s/updates" % \
+ 		    (instPath, n)
+-	    to = "%s/%s.o" % (toDir, name)
++	    to = "%s/%s.ko" % (toDir, name)
+ 
+             if (os.path.isdir("%s/lib/modules/%s" %(instPath, n)) and not
+                 os.path.isdir("%s/lib/modules/%s/updates" %(instPath, n))):
+@@ -1235,7 +1246,7 @@
+                 continue
+ 
+             arch = grpset.hdrlist[pkg][rpm.RPMTAG_ARCH]
+-            for p in ("%s/%s.o" %(arch, name), "%s.o" %(name,)):
++            for p in ("%s/%s.ko" %(arch, name), "%s.ko" %(name,)):
+                 fromFile = "%s/lib/modules/%s/%s" % (instPath, n, p)
+ 
+                 if (os.access(fromFile, os.R_OK)):

Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-05-12 19:23:10 UTC (rev 6330)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-05-13 08:45:34 UTC (rev 6331)
@@ -426,6 +426,25 @@
   -  Use the function keys listed below for more information.
  
  02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
+--- anaconda-9.1/bootdisk/x86_64/general.msg.tinysofa~	2005-05-10 19:49:07.000000000 +0300
++++ anaconda-9.1/bootdisk/x86_64/general.msg	2005-05-10 19:49:38.000000000 +0300
+@@ -6,15 +6,9 @@
+ You are now ready to begin the installation process.  In most cases, 
+ the best way to get started is to simply press the 0f<ENTER>07 key.
+ 
+-If you are having problems with the graphical installer, you can use the 
+-'resolution=<width>x<height>' option to try and force a particular resolution.
+-For example, boot with '0flinux resolution=1024x76807'. You may also want to
+-try '0flinux lowres07'.
+-
+ Certain hardware configurations may have trouble with the automatic hardware
+ detection done during the installation.  If you experience problems during the 
+-installation, restart the installation adding the 'noprobe' option.  The
+-'skipddc' option will also skip monitor probing which hangs some systems.
++installation, restart the installation adding the 'noprobe' option.
+ 
+ There are a number of parameters that can be passed to the Linux kernel
+ at boot time.  Press 0f<F4>07 for more information. 
 --- anaconda-9.1/anaconda.spec.tinysofa~	2003-10-07 23:46:32.000000000 +0300
 +++ anaconda-9.1/anaconda.spec	2005-01-26 21:07:36.000000000 +0200
 @@ -1,9 +1,9 @@

Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-12 19:23:10 UTC (rev 6330)
+++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-13 08:45:34 UTC (rev 6331)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 4jh
+Release: 5jh
 License: GPL
 Summary: installation program
 Group: development



From svn at tinysofa.org  Fri May 13 16:51:45 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 12:51:45 -0400 (EDT)
Subject: [tinysofa-svn] r6332 -
	contrib/classic/2.0/amavisd-new/current/sources
Message-ID: <20050513165145.99271344B4E@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 12:51:40 -0400 (Fri, 13 May 2005)
New Revision: 6332

Modified:
   contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf
Log:
fixed path to clamd socket

Modified: contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf
===================================================================
--- contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf	2005-05-13 08:45:34 UTC (rev 6331)
+++ contrib/classic/2.0/amavisd-new/current/sources/amavisd.conf	2005-05-13 16:51:40 UTC (rev 6332)
@@ -288,7 +288,7 @@
 
 # ### http://www.clamav.net/
 # ['ClamAV-clamd',
-#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
+#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
 #   qr/\bOK$/, qr/\bFOUND$/,
 #   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
 # # NOTE: the easiest is to run clamd under the same user as amavisd; match the



From svn at tinysofa.org  Fri May 13 16:54:50 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 12:54:50 -0400 (EDT)
Subject: [tinysofa-svn] r6333 - contrib/classic/2.0/gpgme/current/specs
Message-ID: <20050513165450.A35123447E7@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 12:54:45 -0400 (Fri, 13 May 2005)
New Revision: 6333

Modified:
   contrib/classic/2.0/gpgme/current/specs/gpgme.spec
Log:
gpgme-devel requires libgpg-error-devel

Modified: contrib/classic/2.0/gpgme/current/specs/gpgme.spec
===================================================================
--- contrib/classic/2.0/gpgme/current/specs/gpgme.spec	2005-05-13 16:51:40 UTC (rev 6332)
+++ contrib/classic/2.0/gpgme/current/specs/gpgme.spec	2005-05-13 16:54:45 UTC (rev 6333)
@@ -21,6 +21,7 @@
 Summary: Development files for the %{name} package
 Group: contrib
 Requires: %{name} = %{version}-%{release}
+Requires: libgpg-error-devel
 
 %description devel
 This package contains files necessary to develop applications using %{name}



From svn at tinysofa.org  Fri May 13 17:41:17 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 13:41:17 -0400 (EDT)
Subject: [tinysofa-svn] r6334 - contrib/classic/2.0/amavisd-new/current/specs
Message-ID: <20050513174117.8F3193448A3@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 13:41:12 -0400 (Fri, 13 May 2005)
New Revision: 6334

Modified:
   contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec
Log:
bump up relase

Modified: contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec
===================================================================
--- contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec	2005-05-13 16:54:45 UTC (rev 6333)
+++ contrib/classic/2.0/amavisd-new/current/specs/amavisd-new.spec	2005-05-13 17:41:12 UTC (rev 6334)
@@ -1,6 +1,6 @@
 Name:      amavisd-new
 Version:   2.3.1
-Release:   1gd
+Release:   2gd
 Summary:   AMaViSd-new - A Mail Virus Scanner
 URL:       http://www.ijs.si/software/amavisd/
 License:   GPL
@@ -123,7 +123,10 @@
 %perl_vendorlib/JpegTester.pm
 
 %changelog
-* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 2.3.1-3gd
+* Fri May 13 2005 Gerald Dachs <gda at tinysofa dot org> 2.3.1-2gd
+- fixed path to clamd socket 
+
+* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 2.3.1-1gd
 - 2.3.1
 
 * Sun Mar 13 2005 Gerald Dachs <gda at tinysofa dot org> 2.2.1-3gd



From svn at tinysofa.org  Fri May 13 17:49:08 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 13:49:08 -0400 (EDT)
Subject: [tinysofa-svn] r6335 - in contrib/classic/2.0: .
	perl-sys-hostname-long perl-sys-hostname-long/current
	perl-sys-hostname-long/current/sources
	perl-sys-hostname-long/current/specs
Message-ID: <20050513174908.2D890344A01@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 13:48:58 -0400 (Fri, 13 May 2005)
New Revision: 6335

Added:
   contrib/classic/2.0/perl-sys-hostname-long/
   contrib/classic/2.0/perl-sys-hostname-long/current/
   contrib/classic/2.0/perl-sys-hostname-long/current/sources/
   contrib/classic/2.0/perl-sys-hostname-long/current/sources/Sys-Hostname-Long-1.2.tar.gz
   contrib/classic/2.0/perl-sys-hostname-long/current/specs/
   contrib/classic/2.0/perl-sys-hostname-long/current/specs/perl-sys-hostname-long.spec
   contrib/classic/2.0/perl-sys-hostname-long/pristine/
   contrib/classic/2.0/perl-sys-hostname-long/releases/
Log:
new in contrib

Added: contrib/classic/2.0/perl-sys-hostname-long/current/sources/Sys-Hostname-Long-1.2.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/perl-sys-hostname-long/current/sources/Sys-Hostname-Long-1.2.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/classic/2.0/perl-sys-hostname-long/current/specs/perl-sys-hostname-long.spec
===================================================================
--- contrib/classic/2.0/perl-sys-hostname-long/current/specs/perl-sys-hostname-long.spec	2005-05-13 17:41:12 UTC (rev 6334)
+++ contrib/classic/2.0/perl-sys-hostname-long/current/specs/perl-sys-hostname-long.spec	2005-05-13 17:48:58 UTC (rev 6335)
@@ -0,0 +1,62 @@
+%define perlname Sys-Hostname-Long
+
+Summary:The Perl module Sys-Hostname-Long
+Name: perl-sys-hostname-long
+Version: 1.2
+Release: 1gd
+License: Artistic, GPL
+Group: contrib
+Source: %{perlname}-%{version}.tar.gz
+URL: http://www.cpan.org/
+Requires: perl = %{perl_version}
+BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}
+
+%define _requires_exceptions perl(Win32::TieRegistry)
+
+%description
+The Perl module Sys-Hostname-Long
+
+%prep
+%setup -q -n %{perlname}-%{version}
+
+
+%build
+%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor </dev/null
+%{__make} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__make} test
+
+
+%install
+%{__make} install
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/File/Spec/.packlist
+%{__rm} -f %{buildroot}%{perl_archlib}/perllocal.pod
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+find %{buildroot} -type d -print |\
+%{__sed} "s|%{buildroot}|%dir |g" >%{name}-%{version}-filelist
+find %{buildroot} -type f -print |\
+%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist
+
+# Kludge to remove bogus Win32::TieRegistry requirement
+%{__cat} <<EOF >%{_builddir}/%{perlname}-%{version}/find_requires
+#! /bin/sh
+exec %{__find_requires} | /bin/egrep -v '^perl[(]Win32::TieRegistry[)]$'
+exit 0
+EOF
+chmod +x %{_builddir}/%{perlname}-%{version}/find_requires
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_builddir}/%{perlname}-%{version}/find_requires
+
+%clean
+%clean_buildroot
+
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)
+%doc Changes MANIFEST README
+
+
+%changelog
+* Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 0.15-1gd
+- new in tinysofa contrib



From svn at tinysofa.org  Fri May 13 18:16:55 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 14:16:55 -0400 (EDT)
Subject: [tinysofa-svn] r6336 - contrib/classic/2.0/gpgme/current/specs
Message-ID: <20050513181655.57D043448B8@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 14:16:50 -0400 (Fri, 13 May 2005)
New Revision: 6336

Modified:
   contrib/classic/2.0/gpgme/current/specs/gpgme.spec
Log:
bump up release

Modified: contrib/classic/2.0/gpgme/current/specs/gpgme.spec
===================================================================
--- contrib/classic/2.0/gpgme/current/specs/gpgme.spec	2005-05-13 17:48:58 UTC (rev 6335)
+++ contrib/classic/2.0/gpgme/current/specs/gpgme.spec	2005-05-13 18:16:50 UTC (rev 6336)
@@ -2,7 +2,7 @@
 Summary: GPGME - GnuPG Made Easy
 Name: gpgme
 Version: 0.9.0
-Release: 1gd
+Release: 2gd
 URL: http://www.gnupg.org/gpgme.html
 Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz
 Group: contrib
@@ -60,6 +60,9 @@
 %{_datadir}/aclocal/gpgme.m4
 
 %changelog
+* Fri May 13 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.0-2gd
+- gpgme-devel requires libgpg-error-devel
+
 * Mon Apr 18 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.0-1gd
 - 0.9.0
 



From svn at tinysofa.org  Fri May 13 19:46:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 15:46:06 -0400 (EDT)
Subject: [tinysofa-svn] r6337 -
	contrib/classic/2.0/perl-mail-spf-query/current/specs
Message-ID: <20050513194606.695483448BF@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 15:46:01 -0400 (Fri, 13 May 2005)
New Revision: 6337

Modified:
   contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec
Log:
fixed requirements

Modified: contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec
===================================================================
--- contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec	2005-05-13 18:16:50 UTC (rev 6336)
+++ contrib/classic/2.0/perl-mail-spf-query/current/specs/perl-mail-spf-query.spec	2005-05-13 19:46:01 UTC (rev 6337)
@@ -3,15 +3,15 @@
 Summary:The Perl module Mail-SPF-Query.
 Name: perl-mail-spf-query
 Version: 1.997
-Release: 1gd
+Release: 2gd
 License: Artistic, GPL
 Group: contrib
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
 Requires: perl = %{perl_version}
 BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
-BuildRequires: perl-net-cidr-lite perl-net-dns
-Requires: perl-net-cidr-lite perl-net-dns
+BuildRequires: perl-net-cidr-lite perl-net-dns perl-uri perl-sys-hostname-long
+Requires: perl-net-cidr-lite perl-net-dns perl-uri perl-sys-hostname-long
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
 
@@ -49,5 +49,8 @@
 
 
 %changelog
+* Fri May 13 2005 Gerald Dachs <gda at tinysofa dot org> 1.997-2gd
+- requires oerl-uri perl-sys-hostname-long
+
 * Wed May 11 2005 Gerald Dachs <gda at tinysofa dot org> 1.997-1gd
 - new in tinysofa contrib



From svn at tinysofa.org  Fri May 13 20:31:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 16:31:18 -0400 (EDT)
Subject: [tinysofa-svn] r6338 -
	tinysofa/releases/classic/2.0/anaconda/current/sources
Message-ID: <20050513203118.603B7344190@minbar.tinysofa.org>

Author: jh
Date: 2005-05-13 16:31:12 -0400 (Fri, 13 May 2005)
New Revision: 6338

Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch
Log:
- slightly update i386 boot help


Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-05-13 19:46:01 UTC (rev 6337)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-tinysofa.patch	2005-05-13 20:31:12 UTC (rev 6338)
@@ -319,7 +319,7 @@
              try:
 --- anaconda-9.1/bootdisk/i386/general.msg.tinysofa~	2003-06-21 01:56:26.000000000 +0300
 +++ anaconda-9.1/bootdisk/i386/general.msg	2005-01-26 21:08:12.000000000 +0200
-@@ -4,13 +4,7 @@
+@@ -4,21 +4,14 @@
                          09General Boot Help07
  
  You are now ready to begin the installation process.  In most cases, 
@@ -334,8 +334,9 @@
  
  Certain hardware configurations may have trouble with the automatic hardware
  detection done during the installation.  If you experience problems during the 
-@@ -18,7 +12,7 @@
- 'skipddc' option will also skip monitor probing which hangs some systems.
+-installation, restart the installation adding the 'noprobe' option.  The
+-'skipddc' option will also skip monitor probing which hangs some systems.
++installation, restart the installation adding the 'noprobe' option.
  
  There are a number of parameters that can be passed to the Linux kernel
 -at boot time.  Press 0f<F4>07 for more information. 



From svn at tinysofa.org  Fri May 13 20:42:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 13 May 2005 16:42:01 -0400 (EDT)
Subject: [tinysofa-svn] r6339 - in contrib/classic/2.0/sylpheed/current:
	sources specs
Message-ID: <20050513204201.4E847344B40@minbar.tinysofa.org>

Author: gda
Date: 2005-05-13 16:41:00 -0400 (Fri, 13 May 2005)
New Revision: 6339

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

Added: contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.9.10-headerview.patch
===================================================================
--- contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.9.10-headerview.patch	2005-05-13 20:31:12 UTC (rev 6338)
+++ contrib/classic/2.0/sylpheed/current/sources/sylpheed-1.9.10-headerview.patch	2005-05-13 20:41:00 UTC (rev 6339)
@@ -0,0 +1,10 @@
+--- sylpheed-1.9.10/src/headerview.c.orig	2005-05-13 21:54:12.000000000 +0200
++++ sylpheed-1.9.10/src/headerview.c	2005-05-13 21:54:54.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkpixmap.h>
++#include <gtk/gtkimage.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>

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


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

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

Modified: contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec
===================================================================
--- contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec	2005-05-13 20:31:12 UTC (rev 6338)
+++ contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec	2005-05-13 20:41:00 UTC (rev 6339)
@@ -1,9 +1,10 @@
 Summary: a GTK+ based, lightweight, and fast e-mail client
 Name: sylpheed
 Epoch: 1
-Version: 1.9.9
+Version: 1.9.10
 Release: 1gd
 Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
+Patch: sylpheed-1.9.10-headerview.patch
 Copyright: GPL
 URL: http://sylpheed.good-day.net/
 Group: contrib
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .hv
 
 %build
 %configure --enable-ldap --enable-ssl --enable-gpgme
@@ -56,6 +58,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri May 13 2005 Gerald Dachs <gda at tinysofa dot org> 1.9.10-1gd
+- 1.9.10
+
 * Tue Apr 19 2005 Gerald Dachs <gda at tinysofa dot org> 1.9.9-1gd
 - 1.9.9
 



From svn at tinysofa.org  Sat May 14 10:40:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 14 May 2005 06:40:53 -0400 (EDT)
Subject: [tinysofa-svn] r6340 - contrib/classic/2.0/sylpheed/current/specs
Message-ID: <20050514104053.33B92344BE4@minbar.tinysofa.org>

Author: jh
Date: 2005-05-14 06:40:18 -0400 (Sat, 14 May 2005)
New Revision: 6340

Modified:
   contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec
Log:
- BuildRequires: gettext


Modified: contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec
===================================================================
--- contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec	2005-05-13 20:41:00 UTC (rev 6339)
+++ contrib/classic/2.0/sylpheed/current/specs/sylpheed.spec	2005-05-14 10:40:18 UTC (rev 6340)
@@ -12,6 +12,7 @@
 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
+BuildRequires: gettext
 Requires: xorg-x11-libs gtk gtk-devel imlib
 Requires: openldap-libs openssl gpgme >= 0.4.5 compface glib
 



From svn at tinysofa.org  Sat May 14 11:08:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 14 May 2005 07:08:00 -0400 (EDT)
Subject: [tinysofa-svn] r6341 - contrib/classic/2.0/unrar/current/specs
Message-ID: <20050514110800.85763344B5A@minbar.tinysofa.org>

Author: jh
Date: 2005-05-14 07:07:54 -0400 (Sat, 14 May 2005)
New Revision: 6341

Modified:
   contrib/classic/2.0/unrar/current/specs/unrar.spec
Log:
- build with correct CXXFLAGS


Modified: contrib/classic/2.0/unrar/current/specs/unrar.spec
===================================================================
--- contrib/classic/2.0/unrar/current/specs/unrar.spec	2005-05-14 10:40:18 UTC (rev 6340)
+++ contrib/classic/2.0/unrar/current/specs/unrar.spec	2005-05-14 11:07:54 UTC (rev 6341)
@@ -21,7 +21,7 @@
 %patch -p1
 
 %build
-CXXFLAGS="%{optflags}" make -f makefile.unix
+make -f makefile.unix CXXFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}



From svn at tinysofa.org  Sun May 15 17:39:07 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 15 May 2005 13:39:07 -0400 (EDT)
Subject: [tinysofa-svn] r6342 - in
	tinysofa/releases/classic/2.0/initscripts/current: sources specs
Message-ID: <20050515173907.E40B9344A7B@minbar.tinysofa.org>

Author: jh
Date: 2005-05-15 13:38:58 -0400 (Sun, 15 May 2005)
New Revision: 6342

Modified:
   tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.grsec
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- change default kernel.grsecurity.chroot_findtask sysctl value to 0

Modified: tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.grsec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.grsec	2005-05-14 11:07:54 UTC (rev 6341)
+++ tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.grsec	2005-05-15 17:38:58 UTC (rev 6342)
@@ -16,7 +16,7 @@
 kernel.grsecurity.linking_restrictions = 1
 
 # hide processes from outside of the chroot
-kernel.grsecurity.chroot_findtask = 1
+kernel.grsecurity.chroot_findtask = 0
 
 # deny sysctl in chroot
 kernel.grsecurity.chroot_deny_sysctl = 1

Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-14 11:07:54 UTC (rev 6341)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-15 17:38:58 UTC (rev 6342)
@@ -3,7 +3,7 @@
 Version: 7.31.9
 License: GPL
 Group: main
-Release: 13gd
+Release: 14jh
 Source: initscripts-%{version}.tar.bz2
 Source1: sysctl.grsec
 URL: http://rhlinux.redhat.com/initscripts/
@@ -217,6 +217,9 @@
 
 
 %changelog
+* Sun May 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-14jh
+- change default kernel.grsecurity.chroot_findtask sysctl value to 0
+
 * Sun Mar  6 2005 Gerald Dachs <gda at tinysofa dot org> 7.31.9-13gd
 - udev support
 



From svn at tinysofa.org  Mon May 16 10:38:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 16 May 2005 06:38:22 -0400 (EDT)
Subject: [tinysofa-svn] r6343 - contrib/classic/2.0
Message-ID: <20050516103822.AF06B3449D0@minbar.tinysofa.org>

Author: jh
Date: 2005-05-16 06:38:18 -0400 (Mon, 16 May 2005)
New Revision: 6343

Removed:
   contrib/classic/2.0/smartmontools/
Log:
- not needed with 2.0 (tools are in base)




From svn at tinysofa.org  Mon May 16 14:00:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 16 May 2005 10:00:18 -0400 (EDT)
Subject: [tinysofa-svn] r6344 - in
	tinysofa/releases/classic/2.0/rpm/current: sources specs
Message-ID: <20050516140018.44109344C2E@minbar.tinysofa.org>

Author: jh
Date: 2005-05-16 09:57:25 -0400 (Mon, 16 May 2005)
New Revision: 6344

Added:
   tinysofa/releases/classic/2.0/rpm/current/sources/ld_assume_kernel_bypass_rhel4.patch
   tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.3-pythondeps.patch
   tinysofa/releases/classic/2.0/rpm/current/sources/rpm-execcon.patch
   tinysofa/releases/classic/2.0/rpm/current/sources/rpm-ldconfig.patch
   tinysofa/releases/classic/2.0/rpm/current/sources/rpm-sparse.patch
Modified:
   tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.3.tar.gz
   tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec
Log:
- switch to RHEL4 version
- backport python ABI dependency system
- disable aptctrlc patch for now


Added: tinysofa/releases/classic/2.0/rpm/current/sources/ld_assume_kernel_bypass_rhel4.patch
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/sources/ld_assume_kernel_bypass_rhel4.patch	2005-05-16 10:38:18 UTC (rev 6343)
+++ tinysofa/releases/classic/2.0/rpm/current/sources/ld_assume_kernel_bypass_rhel4.patch	2005-05-16 13:57:25 UTC (rev 6344)
@@ -0,0 +1,575 @@
+diff -ur rpm-4.3.2/build/build.c rpm-4.3.2.new/build/build.c
+--- rpm-4.3.2/build/build.c	2004-09-04 12:58:14.000000000 -0400
++++ rpm-4.3.2.new/build/build.c	2004-11-15 12:59:05.000000000 -0500
+@@ -223,6 +223,40 @@
+ 	/*@-mods@*/
+ 	errno = 0;
+ 	/*@=mods@*/
++
++#if defined(__GLIBC__)
++    /**
++     * Block to do LD_ASSUME_KERNEL restoration before execs.
++     * jaredj at us.ibm.com 
++     */
++     {
++        char* bypassVar = (char*) malloc(1024*sizeof(char));
++        if (bypassVar != NULL)
++        {
++           snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++           bypassVar[1023] = '\0';
++           if (getenv(bypassVar) != NULL)
++           {
++              char* bypassVal = (char*) malloc(1024*sizeof(char));
++              if (bypassVal != NULL)
++              {
++                 rpmMessage(RPMMESS_DEBUG, _("Restoring LD_ASSUME_KERNEL for child scripts.\n"));
++                 snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                 unsetenv(bypassVar);
++                 snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                 bypassVar[1023] = '\0';
++                 putenv(bypassVar);
++                 free(bypassVal);
++              }
++              else
++              {
++                 free(bypassVar);
++              }
++           }
++        }
++     }
++#endif
++
+ /*@-boundsread@*/
+ 	(void) execvp(argv[0], (char *const *)argv);
+ /*@=boundsread@*/
+diff -ur rpm-4.3.2/build/rpmfc.c rpm-4.3.2.new/build/rpmfc.c
+--- rpm-4.3.2/build/rpmfc.c	2004-09-04 12:58:14.000000000 -0400
++++ rpm-4.3.2.new/build/rpmfc.c	2004-11-16 09:27:54.513922456 -0500
+@@ -93,6 +93,40 @@
+                         argv[0], (unsigned)getpid());
+ 
+ 	unsetenv("MALLOC_CHECK_");
++
++#if defined(__GLIBC__)
++    /**
++     * Block to do LD_ASSUME_KERNEL restoration before execs.
++     * jaredj at us.ibm.com
++     */
++     {
++        char* bypassVar = (char*) malloc(1024*sizeof(char));
++        if (bypassVar != NULL)
++        {
++           snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++           bypassVar[1023] = '\0';
++           if (getenv(bypassVar) != NULL)
++           {
++              char* bypassVal = (char*) malloc(1024*sizeof(char));
++              if (bypassVal != NULL)
++              {
++                 rpmMessage(RPMMESS_DEBUG, _("Restoring LD_ASSUME_KERNEL for child scripts.\n"));
++                 snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                 unsetenv(bypassVar);
++                 snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                 bypassVar[1023] = '\0';
++                 putenv(bypassVar);
++                 free(bypassVal);
++              }
++              else
++              {
++                 free(bypassVar);
++              }
++           }
++        }
++     }
++#endif
++
+ 	(void) execvp(argv[0], (char *const *)argv);
+ 	/* XXX this error message is probably not seen. */
+ 	rpmError(RPMERR_EXEC, _("Couldn't exec %s: %s\n"),
+Only in rpm-4.3.2.new/build: rpmfc.c.orig
+diff -ur rpm-4.3.2/db/mutex/tm.c rpm-4.3.2.new/db/mutex/tm.c
+--- rpm-4.3.2/db/mutex/tm.c	2004-09-04 12:58:20.000000000 -0400
++++ rpm-4.3.2.new/db/mutex/tm.c	2004-11-16 09:40:05.015869280 -0500
+@@ -236,6 +236,39 @@
+ 		*ap++ = "-v";
+ 
+ 	*ap = NULL;
++
++#if defined(__GLIBC__)
++       /**
++         * Block to do LD_ASSUME_KERNEL restoration before execs.
++         * jaredj at us.ibm.com
++         */
++        {
++           char* bypassVar = (char*) malloc(1024*sizeof(char));
++           if (bypassVar != NULL)
++           {
++              snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++              bypassVar[1023] = '\0';
++              if (getenv(bypassVar) != NULL)
++              {
++                 char* bypassVal = (char*) malloc(1024*sizeof(char));
++                 if (bypassVal != NULL)
++                 {
++                    snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                    unsetenv(bypassVar);
++                    snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                    bypassVar[1023] = '\0';
++                    putenv(bypassVar);
++                    free(bypassVal);
++                 }
++                 else
++                 {
++                    free(bypassVar);
++                 }
++              }
++           }
++        }
++#endif
++
+ 	execvp(tmpath, argv);
+ 
+ 	fprintf(stderr, "%s: %s\n", tmpath, strerror(errno));
+diff -ur rpm-4.3.2/file/src/compress.c rpm-4.3.2.new/file/src/compress.c
+--- rpm-4.3.2/file/src/compress.c	2004-09-04 12:58:23.000000000 -0400
++++ rpm-4.3.2.new/file/src/compress.c	2004-11-16 09:29:36.259454784 -0500
+@@ -263,6 +263,37 @@
+ 		if (compr[method].silent)
+ 			(void) close(2);
+ 
++#if defined(__GLIBC__)
++               /**
++                * Block to do LD_ASSUME_KERNEL restoration before execs.
++                * jaredj at us.ibm.com
++                */
++                {
++                   char* bypassVar = (char*) malloc(1024*sizeof(char));
++                   if (bypassVar != NULL)
++                   {
++                      snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++                      bypassVar[1023] = '\0';
++                      if (getenv(bypassVar) != NULL)
++                      {
++                         char* bypassVal = (char*) malloc(1024*sizeof(char));
++                         if (bypassVal != NULL)
++                         {
++                            snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                            unsetenv(bypassVar);
++                            snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                            bypassVar[1023] = '\0';
++                            putenv(bypassVar);
++                            free(bypassVal);
++                         }
++                         else
++                         {
++                            free(bypassVar);
++                         }
++                      }
++                   }
++                }
++#endif
+ 		(void) execvp(compr[method].argv[0],
+ 		       (char *const *)compr[method].argv);
+ 		exit(EXIT_FAILURE);
+diff -ur rpm-4.3.2/lib/psm.c rpm-4.3.2.new/lib/psm.c
+--- rpm-4.3.2/lib/psm.c	2004-10-08 13:23:08.000000000 -0400
++++ rpm-4.3.2.new/lib/psm.c	2004-11-15 12:59:05.000000000 -0500
+@@ -865,6 +865,39 @@
+ 	    }
+ 
+ /*@-nullstate@*/
++
++#if defined(__GLIBC__)
++           /**
++            * Block to do LD_ASSUME_KERNEL restoration before execs.
++            * jaredj at us.ibm.com
++            */
++            {
++               char* bypassVar = (char*) malloc(1024*sizeof(char));
++               if (bypassVar != NULL)
++               {
++                  snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++                  bypassVar[1023] = '\0';
++                  if (getenv(bypassVar) != NULL)
++                  {
++                     char* bypassVal = (char*) malloc(1024*sizeof(char));
++                     if (bypassVal != NULL)
++                     {
++                        rpmMessage(RPMMESS_DEBUG, _("Restoring LD_ASSUME_KERNEL for child scripts.\n"));
++                        snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                        unsetenv(bypassVar);
++                        snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                        bypassVar[1023] = '\0';
++                        putenv(bypassVar);
++                        free(bypassVal);
++                     }
++                     else
++                     {
++                        free(bypassVar);
++                     }
++                  }
++               }
++            }
++#endif
+ 	    xx = execv(argv[0], (char *const *)argv);
+ /*@=nullstate@*/
+ 	    break;
+Only in rpm-4.3.2.new/lib: psm.c.orig
+diff -ur rpm-4.3.2/lib/signature.c rpm-4.3.2.new/lib/signature.c
+--- rpm-4.3.2/lib/signature.c	2004-09-04 12:58:23.000000000 -0400
++++ rpm-4.3.2.new/lib/signature.c	2004-11-16 09:38:20.185805872 -0500
+@@ -419,6 +419,38 @@
+ 	/* dosetenv("PGPPASS", passPhrase, 1); */
+ 
+ 	unsetenv("MALLOC_CHECK_");
++#if defined(__GLIBC__)
++       /**
++        * Block to do LD_ASSUME_KERNEL restoration before execs.
++        * jaredj at us.ibm.com
++        */
++        {
++           char* bypassVar = (char*) malloc(1024*sizeof(char));
++           if (bypassVar != NULL)
++           {
++              snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++              bypassVar[1023] = '\0';
++              if (getenv(bypassVar) != NULL)
++              {
++                 char* bypassVal = (char*) malloc(1024*sizeof(char));
++                 if (bypassVal != NULL)
++                 {
++                    rpmMessage(RPMMESS_DEBUG, _("Restoring LD_ASSUME_KERNEL for child scripts.\n"));
++                    snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                    unsetenv(bypassVar);
++                    snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                    bypassVar[1023] = '\0';
++                    putenv(bypassVar);
++                    free(bypassVal);
++                 }
++                 else
++                 {
++                    free(bypassVar);
++                 }
++              }
++           }
++        }
++#endif
+ 	if ((path = rpmDetectPGPVersion(&pgpVer)) != NULL) {
+ 	    switch(pgpVer) {
+ 	    case PGP_2:
+@@ -550,6 +582,39 @@
+ /*@=boundsread@*/
+ 
+ 	unsetenv("MALLOC_CHECK_");
++
++#if defined(__GLIBC__)
++        /**
++         * Block to do LD_ASSUME_KERNEL restoration before execs.
++         * jaredj at us.ibm.com
++         */
++        {
++           char* bypassVar = (char*) malloc(1024*sizeof(char));
++           if (bypassVar != NULL)
++           {
++              snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++              bypassVar[1023] = '\0';
++              if (getenv(bypassVar) != NULL)
++              {
++                 char* bypassVal = (char*) malloc(1024*sizeof(char));
++                 if (bypassVal != NULL)
++                 {
++                    rpmMessage(RPMMESS_DEBUG, _("Restoring LD_ASSUME_KERNEL for child scripts.\n"));
++                    snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                    unsetenv(bypassVar);
++                    snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                    bypassVar[1023] = '\0';
++                    putenv(bypassVar);
++                    free(bypassVal);
++                 }
++                 else
++                 {
++                    free(bypassVar);
++                 }
++              }
++           }
++        }
++#endif
+ 	cmd = rpmExpand("%{?__gpg_sign_cmd}", NULL);
+ 	rc = poptParseArgvString(cmd, NULL, (const char ***)&av);
+ /*@-boundsread@*/
+@@ -815,6 +880,38 @@
+ 	xx = dup2(passPhrasePipe[0], 3);
+ 
+ 	unsetenv("MALLOC_CHECK_");
++#if defined(__GLIBC__)
++       /**
++        * Block to do LD_ASSUME_KERNEL restoration before execs.
++        * jaredj at us.ibm.com
++        */
++        {
++           char* bypassVar = (char*) malloc(1024*sizeof(char));
++           if (bypassVar != NULL)
++           {
++              snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++              bypassVar[1023] = '\0';
++              if (getenv(bypassVar) != NULL)
++              {
++                 char* bypassVal = (char*) malloc(1024*sizeof(char));
++                 if (bypassVal != NULL)
++                 {
++                    rpmMessage(RPMMESS_DEBUG, _("Restoring LD_ASSUME_KERNEL for child scripts.\n"));
++                    snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                    unsetenv(bypassVar);
++                    snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                    bypassVar[1023] = '\0';
++                    putenv(bypassVar);
++                    free(bypassVal);
++                 }
++                 else
++                 {
++                    free(bypassVar);
++                 }
++              }
++           }
++        }
++#endif
+ 	switch (sigTag) {
+ 	case RPMSIGTAG_DSA:
+ 	case RPMSIGTAG_GPG:
+diff -ur rpm-4.3.2/lua/local/lposix.c rpm-4.3.2.new/lua/local/lposix.c
+--- rpm-4.3.2/lua/local/lposix.c	2004-09-04 12:58:27.000000000 -0400
++++ rpm-4.3.2.new/lua/local/lposix.c	2004-11-16 09:33:05.877587984 -0500
+@@ -360,6 +360,39 @@
+ 	argv[0] = (char*)path;
+ 	for (i=1; i<n; i++) argv[i] = (char*)luaL_checkstring(L, i+1);
+ 	argv[i] = NULL;
++
++#if defined(__GLIBC__)
++       /**
++        * Block to do LD_ASSUME_KERNEL restoration before execs.
++        * jaredj at us.ibm.com
++        */
++        {
++           char* bypassVar = (char*) malloc(1024*sizeof(char));
++           if (bypassVar != NULL)
++           {
++              snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++              bypassVar[1023] = '\0';
++              if (getenv(bypassVar) != NULL)
++              {
++                 char* bypassVal = (char*) malloc(1024*sizeof(char));
++                 if (bypassVal != NULL)
++                 {
++                    snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                    unsetenv(bypassVar);
++                    snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                    bypassVar[1023] = '\0';
++                    putenv(bypassVar);
++                    free(bypassVal);
++                 }
++                 else
++                 {
++                    free(bypassVar);
++                 }
++              }
++           }
++        }
++#endif
++
+ 	execvp(path,argv);
+ 	return pusherror(L, path);
+ }
+diff -ur rpm-4.3.2/popt/popt.c rpm-4.3.2.new/popt/popt.c
+--- rpm-4.3.2/popt/popt.c	2004-09-04 12:58:24.000000000 -0400
++++ rpm-4.3.2.new/popt/popt.c	2004-11-16 09:31:27.642521984 -0500
+@@ -461,6 +461,37 @@
+     }
+ #endif
+ 
++#if defined(__GLIBC__)
++   /**
++    * Block to do LD_ASSUME_KERNEL restoration before execs.
++    * jaredj at us.ibm.com
++    */
++    {
++       char* bypassVar = (char*) malloc(1024*sizeof(char));
++       if (bypassVar != NULL)
++       {
++          snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++          bypassVar[1023] = '\0';
++          if (getenv(bypassVar) != NULL)
++          {
++             char* bypassVal = (char*) malloc(1024*sizeof(char));
++             if (bypassVal != NULL)
++             {
++                snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                unsetenv(bypassVar);
++                snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                bypassVar[1023] = '\0';
++                putenv(bypassVar);
++                free(bypassVal);
++             }
++             else
++             {
++                free(bypassVar);
++             }
++          }
++       }
++    }
++#endif
+     rc = execvp(argv[0], (char *const *)argv);
+ 
+     return POPT_ERROR_ERRNO;
+diff -ur rpm-4.3.2/rpm.c rpm-4.3.2.new/rpm.c
+--- rpm-4.3.2/rpm.c	2004-09-04 12:58:14.000000000 -0400
++++ rpm-4.3.2.new/rpm.c	2004-11-15 12:59:05.000000000 -0500
+@@ -604,7 +604,30 @@
+     int upgrade = 0;
+     int freshen = 0;
+     int probFilter = 0;
+-	
++
++#if defined(__GLIBC__)
++    /**
++     * Bypass block to avoid running against LT unless explicitly told to.
++     * This is to avoid intermixing problems with LT and the need for posix mutex support.
++     * jaredj at us.ibm.com
++     */
++    {
++       if (getenv("LD_ASSUME_KERNEL") != NULL && getenv("RPM_ALLOW_LD_ASSUME_KERNEL") == NULL)
++       {
++          char* bypassVar = (char*)malloc(1024*sizeof(char));
++          if (bypassVar != NULL)
++          {
++             rpmMessage(RPMMESS_DEBUG, _("Enabling bypass of LD_ASSUME_KERNEL.\n"));
++             snprintf(bypassVar, 1024, "__PASSTHROUGH_LD_ASSUME_KERNEL_%d=%s", getpid(), getenv("LD_ASSUME_KERNEL"));
++             bypassVar[1023] = '\0';
++             unsetenv("LD_ASSUME_KERNEL");
++             putenv(bypassVar);
++             execvp(argv[0], argv);
++          }
++       }
++    }	
++#endif
++
+ #if HAVE_MCHECK_H && HAVE_MTRACE
+     mtrace();	/* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+ #endif
+diff -ur rpm-4.3.2/rpmdb/legacy.c rpm-4.3.2.new/rpmdb/legacy.c
+--- rpm-4.3.2/rpmdb/legacy.c	2004-09-04 12:58:25.000000000 -0400
++++ rpm-4.3.2.new/rpmdb/legacy.c	2004-11-16 09:42:12.407502808 -0500
+@@ -127,6 +127,38 @@
+ 		av[ac-1] = path;
+ 		av[ac] = NULL;
+ 		unsetenv("MALLOC_CHECK_");
++
++#if defined(__GLIBC__)
++                /**
++                 * Block to do LD_ASSUME_KERNEL restoration before execs.
++                 * jaredj at us.ibm.com
++                 */
++                {
++                   char* bypassVar = (char*) malloc(1024*sizeof(char));
++                   if (bypassVar != NULL)
++                   {
++                      snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++                      bypassVar[1023] = '\0';
++                      if (getenv(bypassVar) != NULL)
++                      {
++                         char* bypassVal = (char*) malloc(1024*sizeof(char));
++                         if (bypassVal != NULL)
++                         {
++                            snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                            unsetenv(bypassVar);
++                            snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                            bypassVar[1023] = '\0';
++                            putenv(bypassVar);
++                            free(bypassVal);
++                         }
++                         else
++                         {
++                            free(bypassVar);
++                         }
++                      }
++                   }
++                }
++#endif
+ 		xx = execve(av[0], (char *const *)av+1, environ);
+ 	    }
+ 	    _exit(127);
+diff -ur rpm-4.3.2/rpmio/rpmsq.c rpm-4.3.2.new/rpmio/rpmsq.c
+--- rpm-4.3.2/rpmio/rpmsq.c	2004-10-15 11:25:05.000000000 -0400
++++ rpm-4.3.2.new/rpmio/rpmsq.c	2004-11-15 12:59:05.000000000 -0500
+@@ -641,6 +641,38 @@
+ 	/* Reset rpmsigTbl lock and refcnt. */
+ 	INIT_LOCK ();
+ 
++#if defined(__GLIBC__)
++       /**
++        * Block to do LD_ASSUME_KERNEL restoration before execs.
++        * jaredj at us.ibm.com
++        */
++        {
++           char* bypassVar = (char*) malloc(1024*sizeof(char));
++           if (bypassVar != NULL)
++           {
++              snprintf(bypassVar,1024*sizeof(char), "__PASSTHROUGH_LD_ASSUME_KERNEL_%d", getppid());
++              bypassVar[1023] = '\0';
++              if (getenv(bypassVar) != NULL)
++              {
++                 char* bypassVal = (char*) malloc(1024*sizeof(char));
++                 if (bypassVal != NULL)
++                 {
++                    snprintf(bypassVal, 1024*sizeof(char), "%s", getenv(bypassVar));
++                    unsetenv(bypassVar);
++                    snprintf(bypassVar, 1024*sizeof(char), "LD_ASSUME_KERNEL=%s", bypassVal);
++                    bypassVar[1023] = '\0';
++                    putenv(bypassVar);
++                    free(bypassVal);
++                 }
++                 else
++                 {
++                    free(bypassVar);
++                 }
++              }
++           }
++        }
++#endif
++
+ 	(void) execve (argv[0], (char *const *) argv, environ);
+ 	_exit (127);
+     } else {				/* Parent. */
+Only in rpm-4.3.2.new/rpmio: rpmsq.c.orig
+diff -ur rpm-4.3.2/rpmqv.c rpm-4.3.2.new/rpmqv.c
+--- rpm-4.3.2/rpmqv.c	2004-09-04 12:58:14.000000000 -0400
++++ rpm-4.3.2.new/rpmqv.c	2004-11-15 12:59:05.000000000 -0500
+@@ -202,6 +202,29 @@
+ #ifdef	IAM_RPMEIU
+     int i;
+ #endif
++
++#if defined(__GLIBC__)
++    /**
++     * Bypass block to avoid running against LT unless explicitly told to.
++     * This is to avoid intermixing problems with LT and the need for posix mutex support.
++     * jaredj at us.ibm.com
++     */
++    {
++       if (getenv("LD_ASSUME_KERNEL") != NULL && getenv("RPM_ALLOW_LD_ASSUME_KERNEL") == NULL)
++       {
++          char* bypassVar = (char*)malloc(1024*sizeof(char));
++          if (bypassVar != NULL)
++          {
++             rpmMessage(RPMMESS_DEBUG, _("Enabling bypass of LD_ASSUME_KERNEL.\n"));
++             snprintf(bypassVar, 1024, "__PASSTHROUGH_LD_ASSUME_KERNEL_%d=%s", getpid(), getenv("LD_ASSUME_KERNEL"));
++             bypassVar[1023] = '\0';
++             unsetenv("LD_ASSUME_KERNEL");
++             putenv(bypassVar);
++             execvp(argv[0], argv);
++          }
++       }
++    }
++#endif
+ 	
+ #if HAVE_MCHECK_H && HAVE_MTRACE
+     /*@-noeffect@*/

Added: tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.3-pythondeps.patch
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.3-pythondeps.patch	2005-05-16 10:38:18 UTC (rev 6343)
+++ tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.3-pythondeps.patch	2005-05-16 13:57:25 UTC (rev 6344)
@@ -0,0 +1,101 @@
+diff -urN rpm-4.3.3_rhel/macros.in rpm-4.3.3/macros.in
+--- rpm-4.3.3_rhel/macros.in	2004-11-11 23:35:30.000000000 +0200
++++ rpm-4.3.3/macros.in	2004-12-06 00:07:48.000000000 +0200
+@@ -1,7 +1,7 @@
+ #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
+ # \verbatim
+ #
+-# $Id: macros.in,v 1.145.2.5 2004/10/01 14:46:59 jbj Exp $
++# $Id: macros.in,v 1.145.2.6 2004/12/05 22:07:48 jbj Exp $
+ #
+ # This is a global RPM configuration file. All changes made here will
+ # be lost when the rpm package is upgraded. Any per-system configuration
+@@ -385,6 +385,9 @@
+ %__perl_provides	@RPMCONFIGDIR@/perl.prov
+ %__perl_requires	@RPMCONFIGDIR@/perl.req
+ 
++%__python_provides	@RPMCONFIGDIR@/pythondeps.sh --provides
++%__python_requires	@RPMCONFIGDIR@/pythondeps.sh --requires
++
+ #
+ # fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
+ # These macros are necessary only for legacy compatibility, and have moved
+ diff -urN rpm-4.3.3_rhel/scripts/Makefile.am rpm-4.3.3/scripts/Makefile.am
+--- rpm-4.3.3_rhel/scripts/Makefile.am	2004-11-11 23:35:48.000000000 +0200
++++ rpm-4.3.3/scripts/Makefile.am	2004-12-06 00:05:49.000000000 +0200
+@@ -10,7 +10,7 @@
+ 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ 	cpanflute cpanflute2 Specfile.pm find-provides.perl \
+ 	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \
+-	magic.prov magic.req perldeps.pl perl.prov perl.req \
++	magic.prov magic.req perldeps.pl perl.prov perl.req pythondeps.sh \
+ 	rpmdb_loadcvt rpmdiff rpmdiff.cgi \
+ 	rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
+ 	sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
+@@ -31,7 +31,7 @@
+ 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ 	cpanflute cpanflute2 Specfile.pm find-provides.perl \
+ 	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \
+-	magic.prov magic.req perldeps.pl perl.prov perl.req \
++	magic.prov magic.req perldeps.pl perl.prov perl.req pythondeps.sh \
+ 	rpmdb_loadcvt rpmdiff rpmdiff.cgi \
+ 	rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
+ 	sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
+diff -urN rpm-4.3.3_rhel/scripts/Makefile.in rpm-4.3.3/scripts/Makefile.in
+--- rpm-4.3.3_rhel/scripts/Makefile.in	2004-11-11 23:35:48.000000000 +0200
++++ rpm-4.3.3/scripts/Makefile.in	2004-12-07 02:17:34.000000000 +0200
+@@ -102,6 +102,10 @@
+ GLIBC21 = @GLIBC21@
+ GMSGFMT = @GMSGFMT@
+ GZIPBIN = @GZIPBIN@
++HAVE_ASPRINTF = @HAVE_ASPRINTF@
++HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
++HAVE_SNPRINTF = @HAVE_SNPRINTF@
++HAVE_WPRINTF = @HAVE_WPRINTF@
+ INCPATH = @INCPATH@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -287,7 +291,7 @@
+ 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ 	cpanflute cpanflute2 Specfile.pm find-provides.perl \
+ 	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \
+-	magic.prov magic.req perldeps.pl perl.prov perl.req \
++	magic.prov magic.req perldeps.pl perl.prov perl.req pythondeps.sh \
+ 	rpmdb_loadcvt rpmdiff rpmdiff.cgi \
+ 	rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
+ 	sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
+@@ -305,7 +309,7 @@
+ 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ 	cpanflute cpanflute2 Specfile.pm find-provides.perl \
+ 	find-requires.perl freshen.sh get_magic.pl getpo.sh http.req \
+-	magic.prov magic.req perldeps.pl perl.prov perl.req \
++	magic.prov magic.req perldeps.pl perl.prov perl.req pythondeps.sh \
+ 	rpmdb_loadcvt rpmdiff rpmdiff.cgi \
+ 	rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
+ 	sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
+diff -urN rpm-4.3.3_rhel/scripts/pythondeps.sh rpm-4.3.3/scripts/pythondeps.sh
+--- rpm-4.3.3_rhel/scripts/pythondeps.sh	1970-01-01 02:00:00.000000000 +0200
++++ rpm-4.3.3/scripts/pythondeps.sh	2004-12-07 02:33:08.000000000 +0200
+@@ -0,0 +1,22 @@
++#!/bin/bash
++
++[ $# -ge 1 ] || {
++    cat > /dev/null
++    exit 0
++}
++
++PYVER=`python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v"`
++case $1 in
++-P|--provides)
++    shift
++    grep "/usr/bin/python\*\$" >& /dev/null && echo "python(abi) = ${PYVER}"
++    exit 0
++    ;;
++-R|--requires)
++    shift
++    grep "/usr/lib[^/]*/python${PYVER}/" >& /dev/null && echo "python(abi) = ${PYVER}"
++    exit 0
++    ;;
++esac
++
++exit 0

Modified: tinysofa/releases/classic/2.0/rpm/current/sources/rpm-4.3.3.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/classic/2.0/rpm/current/sources/rpm-execcon.patch
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/sources/rpm-execcon.patch	2005-05-16 10:38:18 UTC (rev 6343)
+++ tinysofa/releases/classic/2.0/rpm/current/sources/rpm-execcon.patch	2005-05-16 13:57:25 UTC (rev 6344)
@@ -0,0 +1,31 @@
+--- rpm-4.3.3/lib/psm.c.execcon	2004-11-29 11:14:47.000000000 -0500
++++ rpm-4.3.3/lib/psm.c	2004-11-29 11:16:10.000000000 -0500
+@@ -783,13 +783,6 @@
+ 	    /* XXX Don't mtrace into children. */
+ 	    unsetenv("MALLOC_CHECK_");
+ 
+-	    /* Permit libselinux to do the scriptlet exec. */
+-	    if (rpmtsSELinuxEnabled(ts) == 1) {
+-		xx = rpm_execcon(0, argv[0], argv, environ);
+-		if (xx != 0)
+-		    break;
+-	    }
+-
+ /*@-nullstate@*/
+ 
+ #if defined(__GLIBC__)
+@@ -824,6 +817,14 @@
+                }
+             }
+ #endif
++
++	    /* Permit libselinux to do the scriptlet exec. */
++	    if (rpmtsSELinuxEnabled(ts) == 1) {
++		xx = rpm_execcon(0, argv[0], argv, environ);
++		if (xx != 0)
++		    break;
++	    }
++
+ 	    xx = execv(argv[0], (char *const *)argv);
+ /*@=nullstate@*/
+ 	    break;

Added: tinysofa/releases/classic/2.0/rpm/current/sources/rpm-ldconfig.patch
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/sources/rpm-ldconfig.patch	2005-05-16 10:38:18 UTC (rev 6343)
+++ tinysofa/releases/classic/2.0/rpm/current/sources/rpm-ldconfig.patch	2005-05-16 13:57:25 UTC (rev 6344)
@@ -0,0 +1,19 @@
+Index: lib/psm.c
+===================================================================
+RCS file: /cvs/devel/rpm/lib/psm.c,v
+retrieving revision 2.171.2.11
+diff -u -r2.171.2.11 psm.c
+--- lib/psm.c	11 Nov 2004 06:09:26 -0000	2.171.2.11
++++ lib/psm.c	23 Nov 2004 17:37:20 -0000
+@@ -483,7 +483,11 @@
+ static int ldconfig_done = 0;
+ 
+ /*@unchecked@*/ /*@observer@*/ /*@null@*/
++#if 0
+ static const char * ldconfig_path = "/sbin/ldconfig";
++#else
++static const char * ldconfig_path = NULL;
++#endif
+ 
+ /**
+  * Run scriptlet with args.

Added: tinysofa/releases/classic/2.0/rpm/current/sources/rpm-sparse.patch
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/sources/rpm-sparse.patch	2005-05-16 10:38:18 UTC (rev 6343)
+++ tinysofa/releases/classic/2.0/rpm/current/sources/rpm-sparse.patch	2005-05-16 13:57:25 UTC (rev 6344)
@@ -0,0 +1,31 @@
+Index: lib/rpmfi.c
+===================================================================
+RCS file: /cvs/devel/rpm/lib/rpmfi.c,v
+retrieving revision 2.54.2.2
+diff -u -u -r2.54.2.2 rpmfi.c
+--- lib/rpmfi.c	5 Jul 2004 19:20:37 -0000	2.54.2.2
++++ lib/rpmfi.c	23 Nov 2004 17:31:50 -0000
+@@ -592,6 +592,8 @@
+      */
+     if (dbWhat == REG) {
+ 	const unsigned char * omd5, * nmd5;
++	/* XXX avoid md5 on sparse /var/log/lastlog file. */
++	if (strcmp(fn, "/var/log/lastlog"))
+ 	if (domd5(fn, buffer, 0, NULL))
+ 	    return FA_CREATE;	/* assume file has been removed */
+ 	omd5 = rpmfiMD5(ofi);
+Index: lib/transaction.c
+===================================================================
+RCS file: /cvs/devel/rpm/lib/transaction.c,v
+retrieving revision 1.302.2.5
+diff -u -u -r1.302.2.5 transaction.c
+--- lib/transaction.c	29 Sep 2004 18:28:29 -0000	1.302.2.5
++++ lib/transaction.c	23 Nov 2004 17:31:50 -0000
+@@ -613,6 +613,7 @@
+ 	    }
+ 		
+ 	    /* Here is a pre-existing modified config file that needs saving. */
++	    if (strcmp(fn, "/var/log/lastlog"))	/* XXX sparse file avoidance */
+ 	    {	char md5sum[50];
+ 		const unsigned char * MD5 = rpmfiMD5(fi);
+ 		if (!domd5(fn, md5sum, 0, NULL) && memcmp(MD5, md5sum, 16)) {

Modified: tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec	2005-05-16 10:38:18 UTC (rev 6343)
+++ tinysofa/releases/classic/2.0/rpm/current/specs/rpm.spec	2005-05-16 13:57:25 UTC (rev 6344)
@@ -21,7 +21,7 @@
 %define version 4.3.3
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 6jh
+Release: 7jh
 Group: main
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Source1: GROUPS
@@ -32,6 +32,12 @@
 Patch4: rpm-4.3.3-lkey.patch
 Patch5: rpm-4.3.3-msglvl.patch
 Patch6: rpm-4.3.2-python.patch
+Patch7: rpm-4.3.3-pythondeps.patch
+# patches frpm RHEL4
+Patch10: ld_assume_kernel_bypass_rhel4.patch
+Patch11: rpm-sparse.patch
+Patch12: rpm-ldconfig.patch
+Patch13: rpm-execcon.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -138,13 +144,19 @@
 %patch1 -p1
 %endif
 %patch2 -p1
-%patch3 -p1 -b .aptctrlc~
+#%patch3 -p1 -b .aptctrlc~
 %patch4 -p1 -b .lkey~
 #%patch5 -p1 -b .msglvl~
 %patch6 -p1 -b .python~
+%patch7 -p1 -b .pythondeps~
+%patch10 -p1 -b .nonptl
+%patch11 -p0 -b .sparse
+%patch12 -p0 -b .ldconfig
+%patch13 -p1 -b .execcon
 
 cp -f %{SOURCE1} .
 
+
 %build
 %{__libtoolize} --force
 %{__aclocal} --force
@@ -528,6 +540,11 @@
 %{__includedir}/popt.h
 
 %changelog
+* Mon May 16 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.3.3-7jh
+- switch to RHEL4 version
+- backport python ABI dependency system
+- disable aptctrlc patch for now
+
 * Fri Apr 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 4.3.3-6jh
 - add support for readHeaderFromFD (python module)
 



From svn at tinysofa.org  Mon May 16 17:28:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 16 May 2005 13:28:54 -0400 (EDT)
Subject: [tinysofa-svn] r6345 - in
	tinysofa/releases/classic/2.0/apt/current: sources specs
Message-ID: <20050516172854.B235E344B55@minbar.tinysofa.org>

Author: jh
Date: 2005-05-16 13:28:45 -0400 (Mon, 16 May 2005)
New Revision: 6345

Added:
   tinysofa/releases/classic/2.0/apt/current/sources/apt-0.5.15cnc6-ctrlc-free.patch
Modified:
   tinysofa/releases/classic/2.0/apt/current/specs/apt.spec
Log:
- add ctrlc-free patch to work around crashes on ctrl-c

Added: tinysofa/releases/classic/2.0/apt/current/sources/apt-0.5.15cnc6-ctrlc-free.patch
===================================================================
--- tinysofa/releases/classic/2.0/apt/current/sources/apt-0.5.15cnc6-ctrlc-free.patch	2005-05-16 13:57:25 UTC (rev 6344)
+++ tinysofa/releases/classic/2.0/apt/current/sources/apt-0.5.15cnc6-ctrlc-free.patch	2005-05-16 17:28:45 UTC (rev 6345)
@@ -0,0 +1,13 @@
+--- ./apt-pkg/rpm/rpmhandler.cc	(revision 320)
++++ ./apt-pkg/rpm/rpmhandler.cc	(revision 321)
+@@ -424,7 +424,9 @@
+ 
+    if (Handler != NULL) {
+ #if RPM_VERSION >= 0x040100
+-      rpmtsFree(Handler);
++      // This is segfaulting APT on CTRL-C. RPM seems to return
++      // something invalid during rpmtsCreate() in this situation.
++      //rpmtsFree(Handler);
+ #else
+       rpmdbClose(Handler);
+ #endif

Modified: tinysofa/releases/classic/2.0/apt/current/specs/apt.spec
===================================================================
--- tinysofa/releases/classic/2.0/apt/current/specs/apt.spec	2005-05-16 13:57:25 UTC (rev 6344)
+++ tinysofa/releases/classic/2.0/apt/current/specs/apt.spec	2005-05-16 17:28:45 UTC (rev 6345)
@@ -4,7 +4,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 9jh
+Release: 10jh
 Epoch: 0
 Group: main
 URL: https://moin.conectiva.com.br/AptRpm
@@ -99,6 +99,7 @@
 Patch107: apt-0.5.15cnc6-tinysofa-build.patch
 Patch108: apt-0.5.15cnc6-tinysofa-list-nodeps.patch
 Patch109: apt-0.5.15cnc6-gpgpath.patch
+Patch110: apt-0.5.15cnc6-ctrlc-free.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
@@ -154,6 +155,7 @@
 #%patch107 -p1 -b .tinysofa-build
 %patch108 -p1 -b .tinysofa-list-nodeps
 %patch109 -p1 -b .gpgpath
+%patch110 -p1 -b .ctrlc-free
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -364,6 +366,9 @@
 exit 0
 
 %changelog
+* Mon May 16 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.5.15cnc6-10jh
+- add ctrlc-free patch to work around crashes on ctrl-c
+
 * Sun Mar 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.5.15cnc6-9jh
 - disable mirror selector if it fails to fetch the list
 



From svn at tinysofa.org  Mon May 16 17:46:15 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 16 May 2005 13:46:15 -0400 (EDT)
Subject: [tinysofa-svn] r6346 -
	tinysofa/releases/classic/2.0/release/current/specs
Message-ID: <20050516174615.7F5A7344BBA@minbar.tinysofa.org>

Author: jh
Date: 2005-05-16 13:45:55 -0400 (Mon, 16 May 2005)
New Revision: 6346

Modified:
   tinysofa/releases/classic/2.0/release/current/specs/release.spec
Log:
- prepare for 2.0-U1


Modified: tinysofa/releases/classic/2.0/release/current/specs/release.spec
===================================================================
--- tinysofa/releases/classic/2.0/release/current/specs/release.spec	2005-05-16 17:28:45 UTC (rev 6345)
+++ tinysofa/releases/classic/2.0/release/current/specs/release.spec	2005-05-16 17:45:55 UTC (rev 6346)
@@ -1,11 +1,12 @@
 %define release_name Ceara
 %define vendor tinysofa
 %define product classic server
+%define update update 1
 
 Summary: tinysofa release file
 Name: release
 Version: 2.0
-Release: 0jh
+Release: 1jh
 Epoch: 2
 License: GPL
 Group: main
@@ -23,7 +24,7 @@
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}
-echo "%{vendor} %{product} release %{version} (%{release_name})" \
+echo "%{vendor} %{product} release %{version} (%{release_name}) %{?update}" \
      > %{buildroot}%{_sysconfdir}/release
 
 cat <<__EOF__ > %{buildroot}%{_sysconfdir}/issue
@@ -51,6 +52,9 @@
 
 
 %changelog
+* Mon May 16 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.0-1jh
+- 2.0-U1
+
 * Wed Mar 16 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - 2.0
 



From svn at tinysofa.org  Mon May 16 20:54:57 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 16 May 2005 16:54:57 -0400 (EDT)
Subject: [tinysofa-svn] r6347 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050516205457.A6867344802@minbar.tinysofa.org>

Author: jh
Date: 2005-05-16 16:54:46 -0400 (Mon, 16 May 2005)
New Revision: 6347

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.10.patch
   tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.9.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- 2.6.11.10


Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.10.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.10.patch	2005-05-16 17:45:55 UTC (rev 6346)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.10.patch	2005-05-16 20:54:46 UTC (rev 6347)
@@ -0,0 +1,42 @@
+diff -Naur linux-2.6.11.9/drivers/block/ioctl.c linux-2.6.11.10/drivers/block/ioctl.c
+--- linux-2.6.11.9/drivers/block/ioctl.c	2005-05-11 15:41:10.000000000 -0700
++++ linux-2.6.11.10/drivers/block/ioctl.c	2005-05-16 10:50:31.000000000 -0700
+@@ -237,3 +237,5 @@
+ 	}
+ 	return ret;
+ }
++
++EXPORT_SYMBOL_GPL(blkdev_ioctl);
+diff -Naur linux-2.6.11.9/drivers/block/pktcdvd.c linux-2.6.11.10/drivers/block/pktcdvd.c
+--- linux-2.6.11.9/drivers/block/pktcdvd.c	2005-05-11 15:41:09.000000000 -0700
++++ linux-2.6.11.10/drivers/block/pktcdvd.c	2005-05-16 10:50:31.000000000 -0700
+@@ -2400,7 +2400,7 @@
+ 	case CDROM_LAST_WRITTEN:
+ 	case CDROM_SEND_PACKET:
+ 	case SCSI_IOCTL_SEND_COMMAND:
+-		return ioctl_by_bdev(pd->bdev, cmd, arg);
++		return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+ 
+ 	case CDROMEJECT:
+ 		/*
+@@ -2408,7 +2408,7 @@
+ 		 * have to unlock it or else the eject command fails.
+ 		 */
+ 		pkt_lock_door(pd, 0);
+-		return ioctl_by_bdev(pd->bdev, cmd, arg);
++		return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+ 
+ 	default:
+ 		printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd);
+diff -Naur linux-2.6.11.9/drivers/char/raw.c linux-2.6.11.10/drivers/char/raw.c
+--- linux-2.6.11.9/drivers/char/raw.c	2005-05-11 15:42:19.000000000 -0700
++++ linux-2.6.11.10/drivers/char/raw.c	2005-05-16 10:50:31.000000000 -0700
+@@ -122,7 +122,7 @@
+ {
+ 	struct block_device *bdev = filp->private_data;
+ 
+-	return ioctl_by_bdev(bdev, command, arg);
++	return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
+ }
+ 
+ static void bind_device(struct raw_config_request *rq)

Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.9.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.9.patch	2005-05-16 17:45:55 UTC (rev 6346)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.9.patch	2005-05-16 20:54:46 UTC (rev 6347)
@@ -0,0 +1,126 @@
+diff -Nru a/Documentation/SecurityBugs b/Documentation/SecurityBugs
+--- /dev/null	Wed Dec 31 16:00:00 196900
++++ b/Documentation/SecurityBugs	2005-05-11 15:43:56 -07:00
+@@ -0,0 +1,38 @@
++Linux kernel developers take security very seriously.  As such, we'd
++like to know when a security bug is found so that it can be fixed and
++disclosed as quickly as possible.  Please report security bugs to the
++Linux kernel security team.
++
++1) Contact
++
++The Linux kernel security team can be contacted by email at
++<security at kernel.org>.  This is a private list of security officers
++who will help verify the bug report and develop and release a fix.
++It is possible that the security team will bring in extra help from
++area maintainers to understand and fix the security vulnerability.
++
++As it is with any bug, the more information provided the easier it
++will be to diagnose and fix.  Please review the procedure outlined in
++REPORTING-BUGS if you are unclear about what information is helpful.
++Any exploit code is very helpful and will not be released without
++consent from the reporter unless it has already been made public.
++
++2) Disclosure
++
++The goal of the Linux kernel security team is to work with the
++bug submitter to bug resolution as well as disclosure.  We prefer
++to fully disclose the bug as soon as possible.  It is reasonable to
++delay disclosure when the bug or the fix is not yet fully understood,
++the solution is not well-tested or for vendor coordination.  However, we
++expect these delays to be short, measurable in days, not weeks or months.
++A disclosure date is negotiated by the security team working with the
++bug submitter as well as vendors.  However, the kernel security team
++holds the final say when setting a disclosure date.  The timeframe for
++disclosure is from immediate (esp. if it's already publically known)
++to a few weeks.  As a basic default policy, we expect report date to
++disclosure date to be on the order of 7 days.
++
++3) Non-disclosure agreements
++
++The Linux kernel security team is not a formal body and therefore unable
++to enter any non-disclosure agreements.
+diff -Nru a/MAINTAINERS b/MAINTAINERS
+--- a/MAINTAINERS	2005-05-11 15:43:56 -07:00
++++ b/MAINTAINERS	2005-05-11 15:43:56 -07:00
+@@ -1966,6 +1966,11 @@
+ W:	http://www.weinigel.se
+ S:	Supported
+ 
++SECURITY CONTACT
++P:	Security Officers
++M:	security at kernel.org
++S:	Supported
++
+ SELINUX SECURITY MODULE
+ P:	Stephen Smalley
+ M:	sds at epoch.ncsc.mil
+diff -Nru a/REPORTING-BUGS b/REPORTING-BUGS
+--- a/REPORTING-BUGS	2005-05-11 15:43:56 -07:00
++++ b/REPORTING-BUGS	2005-05-11 15:43:56 -07:00
+@@ -16,6 +16,10 @@
+ describe how to recreate it. That is worth even more than the oops itself.
+ The list of maintainers is in the MAINTAINERS file in this directory.
+ 
++      If it is a security bug, please copy the Security Contact listed
++in the MAINTAINERS file.  They can help coordinate bugfix and disclosure.
++See Documentation/SecurityBugs for more infomation.
++
+       If you are totally stumped as to whom to send the report, send it to
+ linux-kernel at vger.kernel.org. (For more information on the linux-kernel
+ mailing list see http://www.tux.org/lkml/).
+diff -Nru a/fs/binfmt_elf.c b/fs/binfmt_elf.c
+--- a/fs/binfmt_elf.c	2005-05-11 15:43:56 -07:00
++++ b/fs/binfmt_elf.c	2005-05-11 15:43:56 -07:00
+@@ -257,7 +257,7 @@
+ 	}
+ 
+ 	/* Populate argv and envp */
+-	p = current->mm->arg_start;
++	p = current->mm->arg_end = current->mm->arg_start;
+ 	while (argc-- > 0) {
+ 		size_t len;
+ 		__put_user((elf_addr_t)p, argv++);
+@@ -1279,7 +1279,7 @@
+ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
+ 		       struct mm_struct *mm)
+ {
+-	int i, len;
++	unsigned int i, len;
+ 	
+ 	/* first copy the parameters from user space */
+ 	memset(psinfo, 0, sizeof(struct elf_prpsinfo));
+diff -Nru a/fs/partitions/msdos.c b/fs/partitions/msdos.c
+--- a/fs/partitions/msdos.c	2005-05-11 15:43:56 -07:00
++++ b/fs/partitions/msdos.c	2005-05-11 15:43:56 -07:00
+@@ -114,9 +114,6 @@
+ 		 */
+ 		for (i=0; i<4; i++, p++) {
+ 			u32 offs, size, next;
+-
+-			if (SYS_IND(p) == 0)
+-				continue;
+ 			if (!NR_SECTS(p) || is_extended_partition(p))
+ 				continue;
+ 
+@@ -433,8 +430,6 @@
+ 	for (slot = 1 ; slot <= 4 ; slot++, p++) {
+ 		u32 start = START_SECT(p)*sector_size;
+ 		u32 size = NR_SECTS(p)*sector_size;
+-		if (SYS_IND(p) == 0)
+-			continue;
+ 		if (!size)
+ 			continue;
+ 		if (is_extended_partition(p)) {
+diff -Nru a/kernel/exit.c b/kernel/exit.c
+--- a/kernel/exit.c	2005-05-11 15:43:56 -07:00
++++ b/kernel/exit.c	2005-05-11 15:43:56 -07:00
+@@ -516,8 +516,6 @@
+ 	 */
+ 	BUG_ON(p == reaper || reaper->exit_state >= EXIT_ZOMBIE);
+ 	p->real_parent = reaper;
+-	if (p->parent == p->real_parent)
+-		BUG();
+ }
+ 
+ static inline void reparent_thread(task_t *p, task_t *father, int traced)

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-16 17:45:55 UTC (rev 6346)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-16 20:54:46 UTC (rev 6347)
@@ -86,14 +86,15 @@
 Patch5: 2.6.11.6.patch
 Patch6: 2.6.11.7.patch
 Patch7: 2.6.11.8.patch
-Patch8: acpi-20050309-2.6.11.diff
+Patch8: 2.6.11.9.patch
+Patch9: 2.6.11.10.patch
+Patch10: acpi-20050309-2.6.11.diff
 
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
 Patch103: linux-2.6.11-grsec-gracl-fix.patch
 Patch104: linux-2.6.11-ext2-corruption.patch
 Patch105: linux-2.6.11-mm-selected-bits.patch
-Patch106: linux-2.6.11-elf-coredump.patch
 
 Patch20020: linux-2.6.8-tinysofa-syslog.patch
 
@@ -238,13 +239,13 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %patch101 -p1 -b .epoll~
 %patch102 -p1 -b .compile~
 %patch103 -p1 -b .gracl~
 %patch104 -p1 -b .ext2-corruption~
 %patch105 -p1 -b .mm-selected-bits~
-%patch106 -p1 -b .elf-coredump~
 
 %patch20020 -p1 -b .tinysofa-syslog~
 
@@ -598,6 +599,12 @@
 
 
 %changelog
+* Mon May 16 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- 2.6.11.10
+
+* Thu May 12 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- add 2.6.11.9 changes
+
 * Wed May 11 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - add some mm patches
 - add linux-2.6.11-elf-coredump.patch (CAN-2005-1263)



From svn at tinysofa.org  Wed May 18 07:52:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 18 May 2005 03:52:44 -0400 (EDT)
Subject: [tinysofa-svn] r6348 - in contrib/classic/2.0: . nut nut/current
	nut/current/sources nut/current/specs
Message-ID: <20050518075244.B682F344C29@minbar.tinysofa.org>

Author: jh
Date: 2005-05-18 03:52:23 -0400 (Wed, 18 May 2005)
New Revision: 6348

Added:
   contrib/classic/2.0/nut/
   contrib/classic/2.0/nut/current/
   contrib/classic/2.0/nut/current/sources/
   contrib/classic/2.0/nut/current/sources/halt.local
   contrib/classic/2.0/nut/current/sources/nut-cvs20050518.tar.bz2
   contrib/classic/2.0/nut/current/specs/
   contrib/classic/2.0/nut/current/specs/nut.spec
   contrib/classic/2.0/nut/pristine/
   contrib/classic/2.0/nut/releases/
Log:
- add nut


Added: contrib/classic/2.0/nut/current/sources/halt.local
===================================================================
--- contrib/classic/2.0/nut/current/sources/halt.local	2005-05-16 20:54:46 UTC (rev 6347)
+++ contrib/classic/2.0/nut/current/sources/halt.local	2005-05-18 07:52:23 UTC (rev 6348)
@@ -0,0 +1,18 @@
+#!/bin/sh
+# halt.local for NUT
+
+PATH=/sbin:/bin:/usr/bin:/usr/sbin
+
+# load /etc/sysconfig/ups if present I've put the POWERDOWNFLAG
+# in there so noboby have to manually modify the script
+if [ -f /etc/sysconfig/ups ]; then
+   . /etc/sysconfig/ups
+fi
+UPSCMD=`which upsdrvctl`
+
+if [ -n "$POWERDOWNFLAG" -a -n "$UPSCMD" ]; then
+	if [ -f $POWERDOWNFLAG ]; then
+		$UPSCMD shutdown
+	fi
+fi
+

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


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

Added: contrib/classic/2.0/nut/current/specs/nut.spec
===================================================================
--- contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-16 20:54:46 UTC (rev 6347)
+++ contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-18 07:52:23 UTC (rev 6348)
@@ -0,0 +1,338 @@
+%define nutuser nutmon
+# configure file locations
+# confdir etc are not really negotiable, so are not configurable here
+%define STATEPATH  	/var/state/ups
+%define CGIPATH   	/srv/www/cgi-bin
+%define MODELPATH	/sbin
+%define CONFPATH	%{_sysconfdir}/ups
+
+%define with_cgi	0
+
+Name: nut
+Summary: Multi-vendor UPS Monitoring Project Client Utilities
+Version: 0.cvs20050518
+Release: 1jh
+Group: contrib
+Source: nut-cvs20050518.tar.bz2
+Source1: halt.local
+License: GPL
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Prereq: chkconfig coreutils
+BuildRequires: autoconf perl
+
+%description
+These programs are part of a developing project to monitor the assortment 
+of UPSes that are found out there in the field. Many models have serial 
+ports of some kind that allow some form of state checking. This
+capability has been harnessed where possible to allow for safe shutdowns, 
+live status tracking on web pages, and more.
+
+This package includes the client utilities that are required to monitor a
+UPS that the client host is powered from - either connected directly via
+a serial port (in which case the main nut package needs to be installed on
+this machine) or across the network (where another host on the network
+monitors the UPS via serial cable and runs the main nut package to allow
+clients to see the information).
+
+%package server
+Summary: Multi-vendor UPS Monitoring Project server
+Group: contrib
+Requires: nut = %{version}-%{release}
+
+%description server
+These programs are part of a developing project to monitor the assortment 
+of UPSes that are found out there in the field. Many models have serial 
+serial ports of some kind that allow some form of state checking. This
+capability has been harnessed where possible to allow for safe shutdowns, 
+live status tracking on web pages, and more.
+
+This package is the main NUT upsd daemon and the associated per-UPS-model
+drivers which talk to the UPSes.  You also need to install the base NUT
+package.
+
+%if %{with_cgi}
+%package cgi
+Summary: CGI utils for Multi-vendor UPS Monitoring Project
+Group: contrib
+Requires: gd >= 1.6
+BuildRequires: gd-devel >= 1.6, libpng-devel
+
+%description cgi
+These programs are part of a developing project to monitor the assortment 
+of UPSes that are found out there in the field. Many models have serial 
+serial ports of some kind that allow some form of state checking. This
+capability has been harnessed where possible to allow for safe shutdowns, 
+live status tracking on web pages, and more.
+
+This package adds the web CGI programs.   These can be installed on a
+separate machine to the rest of the NUT package.
+%endif
+
+
+%prep
+%setup -q -n %{name}
+autoconf
+
+find docs -type d -name CVS|xargs rm -fr
+
+# rename /etc/sysconfig/ups to /etc/sysconfig/nut to avoid
+# clash in /etc/init.d/halt script
+find RedHat -type f | \
+	xargs perl -pi -e 's|/etc/sysconfig/ups|/etc/sysconfig/nut|g'
+
+
+%build
+autoconf
+%configure \
+	--sysconfdir=%{CONFPATH} \
+	--with-statepath=%{STATEPATH} \
+	--datadir=%{_datadir}/%{name} \
+	--with-drvpath=%{MODELPATH} \
+	--with-cgipath=%{CGIPATH} \
+	--with-user=%{nutuser} \
+	--with-group=%{nutuser} \
+	--enable-shared \
+%if %{with_cgi}
+	--with-cgi
+%endif
+
+%make
+
+
+%install
+%{__mkdir_p} %{buildroot}/%{STATEPATH}
+
+make DESTDIR=%{buildroot} install
+%if %{with_cgi}
+make DESTDIR=%{buildroot} install-cgi
+%endif
+
+make DESTDIR=%{buildroot} install-conf
+
+for file in %{buildroot}%{CONFPATH}/*.sample
+do
+    mv $file %{buildroot}%{CONFPATH}/`basename $file .sample`
+done
+
+# install SYSV init stuff
+mkdir -p %{buildroot}%{_initrddir}
+install scripts/RedHat/upsd %{buildroot}%{_initrddir}
+install scripts/RedHat/upsmon %{buildroot}%{_initrddir}
+mkdir -p %{buildroot}/etc/sysconfig
+install scripts/RedHat/ups %{buildroot}/etc/sysconfig/nut
+
+install -m 755 %{SOURCE1} %{buildroot}/sbin/halt.local
+
+rm -fr %{buildroot}/usr/share/doc
+
+
+%pre
+/sbin/groupadd -r -f %{nutuser}
+if ! getent passwd %{nutuser} > /dev/null; then
+  /sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
+fi
+
+%pre server
+/sbin/groupadd -r -f %{nutuser}
+if ! getent passwd %{nutuser} > /dev/null; then
+  /sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
+fi
+
+%if %{with_cgi}
+%pre cgi
+/sbin/groupadd -r -f %{nutuser}
+if ! getent passwd %{nutuser} > /dev/null; then
+  /sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
+fi
+%endif
+
+%preun
+# only do this if it is not an upgrade
+if [ $1 -eq 0 ]
+then 
+   /sbin/chkconfig --del upsmon
+   [ -f %{_initrddir}/upsmon ] && \
+   	%{_initrddir}/upsmon stop
+fi
+
+%post
+/sbin/chkconfig --add upsmon
+# restart server if this is an upgrade
+if [ $1 -gt 1 ]
+then
+   [ -f %{_initrddir}/upsmon ] && \
+   	%{_initrddir}/upsmon restart
+fi
+
+
+%preun server
+# only do this if it is not an upgrade
+if [ $1 -eq 0 ]
+then 
+   /sbin/chkconfig --del upsd
+   [ -f %{_initrddir}/upsd ] && \
+   	%{_initrddir}/upsd stop
+fi
+
+%post server
+/sbin/chkconfig --add upsd
+# restart server if this is an upgrade
+if [ $1 -gt 1 ]
+then
+   [ -f %{_initrddir}/upsd ] && \
+   	%{_initrddir}/upsd restart
+fi
+
+
+%clean
+%clean_buildroot
+
+
+%files server
+%defattr(-,root,root)
+%{MODELPATH}
+/usr/sbin/upsd
+%attr(755,root,root) %{_initrddir}/upsd
+%dir %attr(755,root,root) %{CONFPATH}
+%config(noreplace) %attr(644,root,root) %{CONFPATH}/ups.conf
+%config(noreplace) %attr(644,root,root) %{CONFPATH}/upsd.conf
+%config(noreplace) %attr(600,root,root) %{CONFPATH}/upsd.users
+%{_datadir}/%{name}
+%{_mandir}/man8/apcsmart.8.gz
+%{_mandir}/man8/belkin.8.gz
+%{_mandir}/man8/bestups.8.gz
+%{_mandir}/man8/fentonups.8.gz
+%{_mandir}/man8/nutupsdrv.8.gz
+%{_mandir}/man8/powercom.8.gz
+%{_mandir}/man8/cyberpower.8.gz
+%{_mandir}/man8/etapro.8.gz
+%{_mandir}/man8/everups.8.gz
+%{_mandir}/man8/genericups.8.gz
+%{_mandir}/man8/ippon.8.gz
+%{_mandir}/man8/isbmex.8.gz
+%{_mandir}/man8/liebert.8.gz
+%{_mandir}/man8/masterguard.8.gz
+%{_mandir}/man8/metasys.8.gz
+%{_mandir}/man8/mge-shut.8.gz
+%{_mandir}/man8/mge-utalk.8.gz
+%{_mandir}/man8/mustek.8.gz
+%{_mandir}/man8/oneac.8.gz
+%{_mandir}/man8/powermust.8.gz
+%{_mandir}/man8/safenet.8.gz
+%{_mandir}/man8/sms.8.gz
+%{_mandir}/man8/solis.8.gz
+%{_mandir}/man8/tripplite.8.gz
+%{_mandir}/man8/tripplitesu.8.gz
+%{_mandir}/man8/upscode2.8.gz
+%{_mandir}/man8/victronups.8.gz
+%{_mandir}/man8/bcmxcp.8.gz
+%{_mandir}/man8/belkinunv.8.gz
+%{_mandir}/man8/bestfcom.8.gz
+%{_mandir}/man8/bestuferrups.8.gz
+%{_mandir}/man8/cpsups.8.gz
+
+%{_mandir}/man8/upsd.8.gz
+%{_mandir}/man8/upsdrvctl.8.gz
+%{_mandir}/man5/ups.conf.5.gz
+%{_mandir}/man5/upsd.conf.5.gz
+%{_mandir}/man5/upsd.users.5.gz
+
+%files
+%defattr(644,root,root,755)
+%doc docs/ CHANGES NEWS README
+%defattr(-,root,root)
+%doc CHANGES COPYING CREDITS INSTALL README docs/
+%dir %attr(755,root,root) %{CONFPATH}
+%config(noreplace) %attr(400,%{nutuser},%{nutuser}) %{CONFPATH}/upsmon.conf
+%config(noreplace) %attr(400,%{nutuser},%{nutuser}) %{CONFPATH}/upssched.conf
+%config(noreplace) %attr(644,root,root) /etc/sysconfig/nut
+%dir %attr(755,%{nutuser},%{nutuser}) %{STATEPATH}
+%attr(755,root,root) %{_initrddir}/upsmon
+/usr/bin/upsc
+/usr/bin/upscmd
+/usr/bin/upsrw
+/usr/bin/upslog
+/usr/sbin/upsmon
+/usr/sbin/upssched
+/sbin/halt.local
+%{_mandir}/man5/upsmon.conf.5.gz
+%{_mandir}/man5/upssched.conf.5.gz
+%{_mandir}/man8/nutupsdrv.8.gz
+%{_mandir}/man8/upsc.8.gz
+%{_mandir}/man8/upsrw.8.gz
+%{_mandir}/man8/upslog.8.gz
+%{_mandir}/man8/upscmd.8.gz
+%{_mandir}/man8/upsmon.8.gz
+%{_mandir}/man8/upssched.8.gz
+
+%if %{with_cgi}
+%files cgi
+%defattr(-,root,root)
+%dir %attr(755,root,root) %{CONFPATH}
+%config(noreplace) %attr(600,%{nutuser},root) %{CONFPATH}/upsset.conf
+%config(noreplace) %attr(644,root,root) %{CONFPATH}/hosts.conf
+%attr(644,root,root) %{CONFPATH}/upsstats.html
+%attr(644,root,root) %{CONFPATH}/upsstats-single.html
+%dir %{CGIPATH}
+%{CGIPATH}/upsimage.cgi
+%{CGIPATH}/upsset.cgi
+%{CGIPATH}/upsstats.cgi
+%endif
+
+
+%changelog
+* Wed May 18 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- tinysofa contrib
+- grab version with additional drivers from CVS
+
+* Fri Jan 31 2003 Antonino Albanese <al.an at monkeysweb.net>
+- Updated startup files (don't know if they still works on 6x)
+- Modified model path in /sbin cause upsdrvctl have to stay on
+  an already mounted filesystem
+- Create a system user and group %{nutuser} and compile everything
+  --with-user=%{nutuser}
+- no upspowerdown script anymore. I modify halt script directly
+- added missing html files to nut-cgi
+
+* Thu Feb  7 2002 Nigel Metheringham <Nigel.Metheringham at InTechnology.co.uk>
+- Rearranged config files again
+- Updated startup files (for RH 7x - rpm builds for eith 6x or 7x)
+- More man pages
+- Macrofied even more of the spec file
+- stripped SNMP support for main line, will fully integrate soon
+
+* Fri Feb  1 2002 Nigel Metheringham <Nigel.Metheringham at InTechnology.co.uk>
+- Integrated SNMP support back in (from my branch)
+- moved the config files around a little - default into samples subdir
+
+* Wed Oct 24 2001 Peter Bieringer <pb at bieringer.de> (0.45.3pre1)
+- Take man path given by rpm instead of hardwired
+- Add some missing man pages to %files
+
+* Wed Feb 07 2001 Karl O. Pinc <kop at meme.com> (0.44.3-pre2)
+- Cgi package buildrequires gd >= 1.6
+- Added man pages for apcsmart and powercom models
+
+* Tue Dec 05 2000 <Nigel.Metheringham at InTechnology.co.uk> (0.44.2)
+- Made cgi package standalone (needs no other parts of NUT)
+- Moved some configs into cgi
+- Shared hosts.conf between cgi & main
+
+* Fri Nov 24 2000 <Nigel.Metheringham at InTechnology.co.uk> (0.44.2)
+- Moved models to be more FHS compliant and make sure they are there
+  if everything but root is unmounted
+- Moved a few things around
+
+* Mon Aug 21 2000 <Nigel.Metheringham at Vdata.co.uk> (0.44.1)
+- Added new model drivers into rpm list
+- Made it wildcard more stuff so this doesn't need to be
+  maintained for every little change.
+  ** NOTE this breaks things if modelpath isn't distinct **
+
+* Mon Jul 17 2000 <Nigel.Metheringham at Vdata.co.uk> (0.44.0)
+- Fixed some problems in the spec file
+- Dropped the older changelog entries since there is some
+  intermediate history thats been missed.
+- Added new model drivers into rpm list
+- Updated descriptions somewhat
+



From svn at tinysofa.org  Wed May 18 08:21:28 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 18 May 2005 04:21:28 -0400 (EDT)
Subject: [tinysofa-svn] r6349 - contrib/classic/2.0/nut/current/specs
Message-ID: <20050518082128.7FCE8344B5A@minbar.tinysofa.org>

Author: jh
Date: 2005-05-18 04:21:19 -0400 (Wed, 18 May 2005)
New Revision: 6349

Modified:
   contrib/classic/2.0/nut/current/specs/nut.spec
Log:
- fix useradd/groupadd path


Modified: contrib/classic/2.0/nut/current/specs/nut.spec
===================================================================
--- contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-18 07:52:23 UTC (rev 6348)
+++ contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-18 08:21:19 UTC (rev 6349)
@@ -127,22 +127,22 @@
 
 
 %pre
-/sbin/groupadd -r -f %{nutuser}
+/usr/sbin/groupadd -r -f %{nutuser}
 if ! getent passwd %{nutuser} > /dev/null; then
-  /sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
+  /usr/sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
 fi
 
 %pre server
-/sbin/groupadd -r -f %{nutuser}
+/usr/sbin/groupadd -r -f %{nutuser}
 if ! getent passwd %{nutuser} > /dev/null; then
-  /sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
+  /usr/sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
 fi
 
 %if %{with_cgi}
 %pre cgi
-/sbin/groupadd -r -f %{nutuser}
+/usr/sbin/groupadd -r -f %{nutuser}
 if ! getent passwd %{nutuser} > /dev/null; then
-  /sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
+  /usr/sbin/useradd -d /etc/ups -g %{nutuser} -M -r %{nutuser}
 fi
 %endif
 



From svn at tinysofa.org  Wed May 18 11:45:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 18 May 2005 07:45:42 -0400 (EDT)
Subject: [tinysofa-svn] r6351 - contrib/classic/2.0
Message-ID: <20050518114542.DC385344C2E@minbar.tinysofa.org>

Author: jh
Date: 2005-05-18 07:45:31 -0400 (Wed, 18 May 2005)
New Revision: 6351

Added:
   contrib/classic/2.0/librsync/
Log:
- copy from 1.1 contrib


Copied: contrib/classic/2.0/librsync (from rev 6350, contrib/1.1/librsync)



From svn at tinysofa.org  Wed May 18 11:46:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 18 May 2005 07:46:22 -0400 (EDT)
Subject: [tinysofa-svn] r6352 - contrib/classic/2.0
Message-ID: <20050518114622.7CF88344C2E@minbar.tinysofa.org>

Author: jh
Date: 2005-05-18 07:46:11 -0400 (Wed, 18 May 2005)
New Revision: 6352

Added:
   contrib/classic/2.0/rdiff-backup/
Log:
- copy from 1.1 contrib


Copied: contrib/classic/2.0/rdiff-backup (from rev 6351, contrib/1.1/rdiff-backup)



From svn at tinysofa.org  Wed May 18 11:54:18 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 18 May 2005 07:54:18 -0400 (EDT)
Subject: [tinysofa-svn] r6353 - in contrib/classic/2.0/rdiff-backup/current:
	sources specs
Message-ID: <20050518115418.743E2344C37@minbar.tinysofa.org>

Author: jh
Date: 2005-05-18 07:54:05 -0400 (Wed, 18 May 2005)
New Revision: 6353

Added:
   contrib/classic/2.0/rdiff-backup/current/sources/rdiff-backup-0.12.8.tar.gz
Removed:
   contrib/classic/2.0/rdiff-backup/current/sources/rdiff-backup-0.12.7.tar.gz
Modified:
   contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec
Log:
- new upstream


Deleted: contrib/classic/2.0/rdiff-backup/current/sources/rdiff-backup-0.12.7.tar.gz
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/rdiff-backup/current/sources/rdiff-backup-0.12.8.tar.gz
===================================================================
(Binary files differ)


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

Modified: contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec
===================================================================
--- contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec	2005-05-18 11:46:11 UTC (rev 6352)
+++ contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec	2005-05-18 11:54:05 UTC (rev 6353)
@@ -1,4 +1,4 @@
-Version:	0.12.7
+Version:	0.12.8
 Summary:	Convenient and transparent local/remote incremental mirror/backup
 Name:		rdiff-backup
 Release: 1jh
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed May 18 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.12.8-1jh
+- 0.12.8
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 0.12.7-1jh
 - current (0.12.7-1jh) integrated as 0.12.7-1jh
 



From svn at tinysofa.org  Thu May 19 05:50:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 01:50:33 -0400 (EDT)
Subject: [tinysofa-svn] r6355 - in
	tinysofa/releases/classic/2.0/initscripts/current: sources specs
Message-ID: <20050519055033.A10C1344B55@minbar.tinysofa.org>

Author: jh
Date: 2005-05-19 01:50:22 -0400 (Thu, 19 May 2005)
New Revision: 6355

Added:
   tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.raid
Modified:
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- add md sysctl options to sysctl.conf

Added: tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.raid
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.raid	2005-05-18 15:51:34 UTC (rev 6354)
+++ tinysofa/releases/classic/2.0/initscripts/current/sources/sysctl.raid	2005-05-19 05:50:22 UTC (rev 6355)
@@ -0,0 +1,9 @@
+
+# md options
+
+# minimum reconstruction speed (kB/sec)
+dev.raid.speed_limit_min = 500
+
+# maximum reconstruction speed (kB/sec)
+dev.speed_limit_max = 15000
+

Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-18 15:51:34 UTC (rev 6354)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-19 05:50:22 UTC (rev 6355)
@@ -3,9 +3,10 @@
 Version: 7.31.9
 License: GPL
 Group: main
-Release: 14jh
+Release: 15jh
 Source: initscripts-%{version}.tar.bz2
 Source1: sysctl.grsec
+Source2: sysctl.raid
 URL: http://rhlinux.redhat.com/initscripts/
 Patch0: initscripts-s390.patch
 Patch1: initscripts-7.31.9-tinysofa.patch
@@ -79,6 +80,7 @@
 __EOF__
 
 cat %{SOURCE1} >> $RPM_BUILD_ROOT/etc/sysctl.conf
+cat %{SOURCE2} >> $RPM_BUILD_ROOT/etc/sysctl.conf
 
 
 %pre
@@ -217,6 +219,9 @@
 
 
 %changelog
+* Thu May 19 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-15jh
+- add md sysctl options to sysctl.conf
+
 * Sun May 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-14jh
 - change default kernel.grsecurity.chroot_findtask sysctl value to 0
 



From svn at tinysofa.org  Thu May 19 11:40:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 07:40:47 -0400 (EDT)
Subject: [tinysofa-svn] r6356 - in
	tinysofa/releases/classic/2.0/initscripts/current: sources specs
Message-ID: <20050519114047.62448344C7A@minbar.tinysofa.org>

Author: jh
Date: 2005-05-19 07:40:37 -0400 (Thu, 19 May 2005)
New Revision: 6356

Added:
   tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-legacy-ups.patch
Modified:
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- remove legacy UPS code (for nut)

Added: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-legacy-ups.patch
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-legacy-ups.patch	2005-05-19 05:50:22 UTC (rev 6355)
+++ tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-legacy-ups.patch	2005-05-19 11:40:37 UTC (rev 6356)
@@ -0,0 +1,14 @@
+--- ./rc.d/init.d/halt.legacy-ups~	2005-05-19 14:37:19.000000000 +0300
++++ ./rc.d/init.d/halt	2005-05-19 14:38:22.000000000 +0300
+@@ -196,11 +196,6 @@
+  echo $"On the next boot fsck will be forced."
+ fi
+ 
+-if [ "$command" = /sbin/halt -a -r /etc/ups/upsmon.conf -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then
+-	. /etc/sysconfig/ups
+-	[ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] && $MODEL $OPTIONS_HALT -k $DEVICE
+-fi
+-
+ if [ -x /sbin/halt.local ]; then
+    /sbin/halt.local
+ fi

Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-19 05:50:22 UTC (rev 6355)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-19 11:40:37 UTC (rev 6356)
@@ -17,6 +17,7 @@
 Patch6: initscripts-7.31.9-dovecot.patch
 Patch7: initscripts-7.31.9-usbfs.patch
 Patch8: initscripts-7.31.9-udev-support.patch
+Patch9: initscripts-7.31.9-legacy-ups.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15
 Requires: procps, sysklogd >= 1.3.31
@@ -52,6 +53,7 @@
 %patch6 -p1 -b .dovecot~
 %patch7 -p1 -b .usbfs~
 %patch8 -p1 -b .udev~
+%patch9 -p1 -b .legacy-ups~
 
 find . -name '*~'|xargs rm -f
 
@@ -221,6 +223,7 @@
 %changelog
 * Thu May 19 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-15jh
 - add md sysctl options to sysctl.conf
+- remove legacy UPS code (for nut)
 
 * Sun May 15 2005 Jaakko Heinonen <jh at tinysofa dot org> 7.31.9-14jh
 - change default kernel.grsecurity.chroot_findtask sysctl value to 0



From svn at tinysofa.org  Thu May 19 16:48:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 12:48:49 -0400 (EDT)
Subject: [tinysofa-svn] r6357 - contrib/classic/2.0
Message-ID: <20050519164849.40DA4344C7D@minbar.tinysofa.org>

Author: gda
Date: 2005-05-19 12:48:38 -0400 (Thu, 19 May 2005)
New Revision: 6357

Added:
   contrib/classic/2.0/curl/
Log:
is need by clamav

Copied: contrib/classic/2.0/curl (from rev 6356, contrib/1.1/curl)



From svn at tinysofa.org  Thu May 19 17:32:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 13:32:44 -0400 (EDT)
Subject: [tinysofa-svn] r6358 - contrib/classic/2.0/curl/current/specs
Message-ID: <20050519173244.76F71344B8F@minbar.tinysofa.org>

Author: gda
Date: 2005-05-19 13:32:39 -0400 (Thu, 19 May 2005)
New Revision: 6358

Modified:
   contrib/classic/2.0/curl/current/specs/curl.spec
Log:
clean ups

Modified: contrib/classic/2.0/curl/current/specs/curl.spec
===================================================================
--- contrib/classic/2.0/curl/current/specs/curl.spec	2005-05-19 16:48:38 UTC (rev 6357)
+++ contrib/classic/2.0/curl/current/specs/curl.spec	2005-05-19 17:32:39 UTC (rev 6358)
@@ -1,13 +1,14 @@
 Summary: get a file from a FTP, GOPHER or HTTP server.
 Name:    curl
 Version: 7.11.2
-Release: 2gd
+Release: 3gd
 License: MIT/X derivate
 Group: contrib
 Source:  http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 URL:     http://curl.haxx.se
 Requires: %{name}-libs = %{version}-%{release}
-BuildRequires: gcc-c++ gcc-c++-devel
+Requires: libstdc++
+BuildRequires: gcc-c++ libstdc++-devel
 BuildRequires: openssl-devel >= 0.9.5
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -45,16 +46,15 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure
-make 
+%configure
+%make 
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%makeinstall
 
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+%clean_buildroot
 
 
 %post libs
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Thu May 19 2005 Gerald Dachs <gda at tinysofa dot org> 7.11.2-3gd
+- clean ups
+
 * Mon Sep 13 2004 tsintegrate <jh at tinysofa dot org> 7.11.2-2gd
 - current (7.11.2-2gd) integrated as 7.11.2-2gd
 



From svn at tinysofa.org  Thu May 19 17:44:27 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 13:44:27 -0400 (EDT)
Subject: [tinysofa-svn] r6359 - in contrib/classic/2.0/clamav/current:
	sources specs
Message-ID: <20050519174427.74B62344BAD@minbar.tinysofa.org>

Author: gda
Date: 2005-05-19 13:42:49 -0400 (Thu, 19 May 2005)
New Revision: 6359

Added:
   contrib/classic/2.0/clamav/current/sources/clamav-0.85.1.tar.gz
Removed:
   contrib/classic/2.0/clamav/current/sources/clamav-0.85.tar.gz
Modified:
   contrib/classic/2.0/clamav/current/specs/clamav.spec
Log:
0.85.1

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


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

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

Modified: contrib/classic/2.0/clamav/current/specs/clamav.spec
===================================================================
--- contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-19 17:32:39 UTC (rev 6358)
+++ contrib/classic/2.0/clamav/current/specs/clamav.spec	2005-05-19 17:42:49 UTC (rev 6359)
@@ -1,6 +1,6 @@
 Summary: An antivirus toolkit for Unix
 Name:    clamav
-Version: 0.85
+Version: 0.85.1
 Release: 1gd
 License: GPL
 Group: contrib
@@ -13,8 +13,9 @@
 Source7: freshclam.logrotate
 Source8: freshclam.conf
 Source10: clamd.conf
+Requires: curl-libs openssl
 BuildRequires: sed, zlib-devel, gmp-devel, bzip2-devel
-BuildRequires: zlib, gmp
+BuildRequires: zlib, gmp, curl-devel, openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %define user_name  amavis
@@ -177,6 +178,9 @@
 
 
 %changelog
+* Thu May 19 2005 Gerald Dachs <gda at tinysofa dot org> 0.85.1-1gd
+- 0.85.1
+
 * Thu May 12 2005 Gerald Dachs <gda at tinysofa dot org> 0.85-1gd
 - 0.85
 - removed --enable-debug, debug code is broken



From svn at tinysofa.org  Thu May 19 18:51:46 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 14:51:46 -0400 (EDT)
Subject: [tinysofa-svn] r6360 - in contrib/classic/2.0/spamassassin/current:
	sources specs
Message-ID: <20050519185146.208F0344C06@minbar.tinysofa.org>

Author: gda
Date: 2005-05-19 14:51:16 -0400 (Thu, 19 May 2005)
New Revision: 6360

Added:
   contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.3.tar.bz2
Removed:
   contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.2.tar.bz2
Modified:
   contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
Log:
3.0.3

Deleted: contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.2.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.3.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/classic/2.0/spamassassin/current/sources/Mail-SpamAssassin-3.0.3.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-05-19 17:42:49 UTC (rev 6359)
+++ contrib/classic/2.0/spamassassin/current/specs/spamassassin.spec	2005-05-19 18:51:16 UTC (rev 6360)
@@ -3,7 +3,7 @@
 Summary:        a spam filter for email which can be invoked from mail delivery agents
 Group:          contrib
 Name: spamassassin
-Version: 3.0.2
+Version: 3.0.3
 Release: 1gd
 License: Apache License 2.0
 URL: http://spamassassin.apache.org/
@@ -122,6 +122,9 @@
 %service_postun spamassassin
 
 %changelog
+* Thu May 19 2005 Gerald Dachs <gda at tinysofa dot org> 3.0.3-1gd
+- 3.0.3
+
 * Wed Feb  2 2005 Gerald Dachs <gda at tinysofa dot de> 3.0.2-1gd
 - New upstream version
 



From svn at tinysofa.org  Thu May 19 19:44:01 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 19 May 2005 15:44:01 -0400 (EDT)
Subject: [tinysofa-svn] r6361 - in contrib/classic/2.0/clearsilver/current:
	sources specs
Message-ID: <20050519194401.EEC8E344CA3@minbar.tinysofa.org>

Author: gda
Date: 2005-05-19 15:43:44 -0400 (Thu, 19 May 2005)
New Revision: 6361

Added:
   contrib/classic/2.0/clearsilver/current/sources/clearsilver-0.9.14.tar.gz
Removed:
   contrib/classic/2.0/clearsilver/current/sources/clearsilver-0.9.13.tar.gz
Modified:
   contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec
Log:
0.9.14

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

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


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

Modified: contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec
===================================================================
--- contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec	2005-05-19 18:51:16 UTC (rev 6360)
+++ contrib/classic/2.0/clearsilver/current/specs/clearsilver.spec	2005-05-19 19:43:44 UTC (rev 6361)
@@ -1,7 +1,7 @@
 Summary: Neotonic ClearSilver
 Name: clearsilver
-Version: 0.9.13
-Release: 2gd
+Version: 0.9.14
+Release: 1gd
 Copyright: Open Source - Neotonic ClearSilver License (Apache 1.1 based)
 Group: contrib
 Source: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
@@ -58,7 +58,6 @@
 perl -pi -e 's|#!/usr/local/bin/python|#!/usr/bin/python|' scripts/document.py
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR="$RPM_BUILD_ROOT" PYTHON_SITE="%{py_libdir}" install
 
 (cd perl; make PREFIX="$RPM_BUILD_ROOT%{_prefix}" INSTALLDIRS=vendor install)
@@ -90,6 +89,9 @@
 %{perl_vendorarch}/auto/ClearSilver/ClearSilver.bs
 
 %Changelog
+* Thu May 19 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.14-1gd
+- 0.9.14
+
 * Tue Feb  1 2005 Gerald Dachs <gda at tinysofa dot org> 0.9.13-2gd
 - applied %defattr
 



From svn at tinysofa.org  Sat May 21 07:47:06 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 21 May 2005 03:47:06 -0400 (EDT)
Subject: [tinysofa-svn] r6362 -
	tinysofa/releases/classic/2.0/anaconda/current/sources
Message-ID: <20050521074706.30AD6344C9D@minbar.tinysofa.org>

Author: jh
Date: 2005-05-21 03:46:59 -0400 (Sat, 21 May 2005)
New Revision: 6362

Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch
Log:
- update mdadm patch to create better mdadm.conf


Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-05-19 19:43:44 UTC (rev 6361)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-05-21 07:46:59 UTC (rev 6362)
@@ -1,5 +1,5 @@
---- anaconda-9.1/fsset.py.mdadm~	2005-02-09 16:23:35.000000000 +0200
-+++ anaconda-9.1/fsset.py	2005-02-09 16:26:45.000000000 +0200
+--- anaconda-9.1/fsset.py.mdadm~	2005-05-21 10:33:12.000000000 +0300
++++ anaconda-9.1/fsset.py	2005-05-21 10:35:28.000000000 +0300
 @@ -982,16 +982,40 @@
  
          return raidtab
@@ -66,18 +66,36 @@
  
          if len(members) < spares:
              raise RuntimeError, ("you requiested more spare devices "
-@@ -1685,6 +1714,10 @@
+@@ -1685,6 +1714,28 @@
              return [ '-R', 'stride=%d' % (self.numDisks * 16) ]
          return []
  
 +    def mdadmLine (self, devPrefix="/dev"):
++        levels = ["multipath", "hsm", "translucent", "linear", "raid0",
++                  "raid1", "", "", "raid5", "raid5"]
++
++        (dev, devices, level, numActive) = raid.lookup_raid_device (self.device)
++
++        # First loop over all the devices that make up the RAID trying to read
++        # the superblock off each.  If we read a superblock, return a line that
++        # can go into the mdadm.conf.  If we fail, fall back to the old method
++        # of using the super-minor.
++        for d in devices:
++            try:
++                (major, minor, uuid, level, nrDisks, totalDisks, mdMinor) = \
++                    isys.raidsb(d)
++                return "ARRAY %s/%s level=%s num-devices=%d uuid=%s\n" \
++                    %(devPrefix, self.device, levels[level+4], nrDisks, uuid)
++            except ValueError:
++               pass
++
 +        return "ARRAY %s/%s super-minor=%s\n" %(devPrefix, self.device,
-+                                               self.minor)
++                                                self.minor)
 +
      def raidTab (self, devPrefix='/dev'):
          entry = ""
          entry = entry + "raiddev		    %s/%s\n" % (devPrefix,
-@@ -1713,18 +1746,21 @@
+@@ -1713,18 +1764,21 @@
          isys.makeDevInode(self.device, node)
  
          if not self.isSetup:



From svn at tinysofa.org  Mon May 23 10:34:27 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 23 May 2005 06:34:27 -0400 (EDT)
Subject: [tinysofa-svn] r6363 - contrib/classic/2.0/nut/current/specs
Message-ID: <20050523103427.78071344BB2@minbar.tinysofa.org>

Author: jh
Date: 2005-05-23 06:34:21 -0400 (Mon, 23 May 2005)
New Revision: 6363

Modified:
   contrib/classic/2.0/nut/current/specs/nut.spec
Log:
- /etc/rc.d/init.d/functions -> /etc/init.d/functions in init scripts


Modified: contrib/classic/2.0/nut/current/specs/nut.spec
===================================================================
--- contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-21 07:46:59 UTC (rev 6362)
+++ contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-23 10:34:21 UTC (rev 6363)
@@ -11,7 +11,7 @@
 Name: nut
 Summary: Multi-vendor UPS Monitoring Project Client Utilities
 Version: 0.cvs20050518
-Release: 1jh
+Release: 2jh
 Group: contrib
 Source: nut-cvs20050518.tar.bz2
 Source1: halt.local
@@ -80,7 +80,9 @@
 find RedHat -type f | \
 	xargs perl -pi -e 's|/etc/sysconfig/ups|/etc/sysconfig/nut|g'
 
+perl -pi -e 's|/etc/rc.d/init.d|/etc/init.d|g' scripts/RedHat/*
 
+
 %build
 autoconf
 %configure \



From svn at tinysofa.org  Mon May 23 10:57:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 23 May 2005 06:57:48 -0400 (EDT)
Subject: [tinysofa-svn] r6364 - in contrib/classic/2.0/nut/current: sources
	specs
Message-ID: <20050523105748.F27A9344C2E@minbar.tinysofa.org>

Author: jh
Date: 2005-05-23 06:57:39 -0400 (Mon, 23 May 2005)
New Revision: 6364

Added:
   contrib/classic/2.0/nut/current/sources/nut-initscripts.patch
Modified:
   contrib/classic/2.0/nut/current/specs/nut.spec
Log:
- patch initscripts

Added: contrib/classic/2.0/nut/current/sources/nut-initscripts.patch
===================================================================
--- contrib/classic/2.0/nut/current/sources/nut-initscripts.patch	2005-05-23 10:34:21 UTC (rev 6363)
+++ contrib/classic/2.0/nut/current/sources/nut-initscripts.patch	2005-05-23 10:57:39 UTC (rev 6364)
@@ -0,0 +1,45 @@
+--- ./scripts/RedHat/upsmon.orig	2005-05-23 13:54:08.000000000 +0300
++++ ./scripts/RedHat/upsmon	2005-05-23 13:54:36.000000000 +0300
+@@ -16,10 +16,10 @@
+ export PATH
+ 
+ # Source function library.
+-. /etc/rc.d/init.d/functions
++. /etc/init.d/functions
+ 
+-if [ -f /etc/sysconfig/ups ]; then
+-  . /etc/sysconfig/ups
++if [ -f /etc/sysconfig/nut ]; then
++  . /etc/sysconfig/nut
+ else
+   POWERDOWNFLAG=/etc/killpower
+   NUTUSER=nutmon
+--- ./scripts/RedHat/upsd.orig	2005-05-23 13:52:58.000000000 +0300
++++ ./scripts/RedHat/upsd	2005-05-23 13:54:02.000000000 +0300
+@@ -25,13 +25,13 @@
+ export PATH
+ 
+ # Source function library.
+-. /etc/rc.d/init.d/functions
++. /etc/init.d/functions
+ 
+ # POWERDOWNFLAG *must* match that in upsmon.conf
+ # Loading POWERDOWNFLAG from /etc/sysconfig/ups
+ DRIVERPATH=/sbin
+-if [ -f /etc/sysconfig/ups ]; then
+-  . /etc/sysconfig/ups
++if [ -f /etc/sysconfig/nut ]; then
++  . /etc/sysconfig/nut
+ else
+   POWERDOWNFLAG=/etc/killpower
+   NUTUSER=nutmon
+@@ -98,9 +98,6 @@
+ 	;;
+ 
+   status)
+-	# new style drivers
+-	action "NUT: checking UPS model drivers" upsdrvctl status
+-
+ 	status upsd
+ 	;;
+   *)

Modified: contrib/classic/2.0/nut/current/specs/nut.spec
===================================================================
--- contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-23 10:34:21 UTC (rev 6363)
+++ contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-23 10:57:39 UTC (rev 6364)
@@ -15,10 +15,11 @@
 Group: contrib
 Source: nut-cvs20050518.tar.bz2
 Source1: halt.local
+Patch0: nut-initscripts.patch
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: chkconfig coreutils
-BuildRequires: autoconf perl
+BuildRequires: autoconf
 
 %description
 These programs are part of a developing project to monitor the assortment 
@@ -71,18 +72,13 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .initscripts~
+
 autoconf
 
 find docs -type d -name CVS|xargs rm -fr
 
-# rename /etc/sysconfig/ups to /etc/sysconfig/nut to avoid
-# clash in /etc/init.d/halt script
-find RedHat -type f | \
-	xargs perl -pi -e 's|/etc/sysconfig/ups|/etc/sysconfig/nut|g'
 
-perl -pi -e 's|/etc/rc.d/init.d|/etc/init.d|g' scripts/RedHat/*
-
-
 %build
 autoconf
 %configure \
@@ -283,6 +279,9 @@
 
 
 %changelog
+* Mon May 23 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- patch initscripts
+
 * Wed May 18 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - tinysofa contrib
 - grab version with additional drivers from CVS



From svn at tinysofa.org  Mon May 23 11:20:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 23 May 2005 07:20:38 -0400 (EDT)
Subject: [tinysofa-svn] r6365 - in contrib/classic/2.0: . bittorrent
	bittorrent/current bittorrent/current/sources
	bittorrent/current/specs
Message-ID: <20050523112038.51021344BA1@minbar.tinysofa.org>

Author: jh
Date: 2005-05-23 07:20:24 -0400 (Mon, 23 May 2005)
New Revision: 6365

Added:
   contrib/classic/2.0/bittorrent/
   contrib/classic/2.0/bittorrent/current/
   contrib/classic/2.0/bittorrent/current/sources/
   contrib/classic/2.0/bittorrent/current/sources/BitTorrent-4.0.1.tar.gz
   contrib/classic/2.0/bittorrent/current/specs/
   contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec
   contrib/classic/2.0/bittorrent/pristine/
   contrib/classic/2.0/bittorrent/releases/
Log:
- bittorrent 4.0.1


Added: contrib/classic/2.0/bittorrent/current/sources/BitTorrent-4.0.1.tar.gz
===================================================================
(Binary files differ)


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

Added: contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec
===================================================================
--- contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec	2005-05-23 10:57:39 UTC (rev 6364)
+++ contrib/classic/2.0/bittorrent/current/specs/bittorrent.spec	2005-05-23 11:20:24 UTC (rev 6365)
@@ -0,0 +1,115 @@
+Name: bittorrent
+Version: 4.0.1
+Release: 1jh
+Summary: BitTorrent swarming network file transfer tool
+Group: contrib
+License: BitTorrent Open Source License
+URL: http://www.bittorrent.com/
+Source0: http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
+BuildRequires:  python-devel sed
+Requires: python
+%py_requires
+
+%description
+BitTorrent is a tool for copying files from one machine to
+another. FTP punishes sites for being popular: Since all uploading is
+done from one place, a popular site needs big iron and big
+bandwidth. With BitTorrent, clients automatically mirror files they
+download, making the publisher's burden almost nothing.
+
+
+%prep
+%setup -q -n BitTorrent-%{version}
+sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
+
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
+
+%install
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+sed -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
+
+
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root,-)
+%doc README.txt credits.txt LICENSE.txt
+%{_bindir}/btdownloadcurses.py
+%{_bindir}/btdownloadheadless.py
+%{_bindir}/btlaunchmany.py
+%{_bindir}/btlaunchmanycurses.py
+%{_bindir}/btmaketorrent.py
+%{_bindir}/btreannounce.py
+%{_bindir}/btrename.py
+%{_bindir}/btshowmetainfo.py
+%{_bindir}/bttrack.py
+%dir %{py_sitedir}/BitTorrent
+%{py_sitedir}/BitTorrent/*.py
+%{py_sitedir}/BitTorrent/*.pyc
+%ghost %{py_sitedir}/BitTorrent/*.pyo
+
+%exclude %{_bindir}/btdownloadgui.py
+%exclude %{_bindir}/btmaketorrentgui.py
+%exclude %{_datadir}/pixmaps
+
+
+%changelog
+* Mon May 23 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- tinysofa contrib
+
+* Wed May 18 2005 Paul Howarth <paul at city-fan.org> 4.0.1-1%{?dist}
+- new upstream release 4.0.1 (#157632)
+- add dist tag
+- source now found on sourceforge.net
+- move post/postun scriptlets to -gui subpackage
+- bttest.py removed upstream
+
+* Tue Mar 15 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.0-2
+- add desktop file, desktop menu icon, post/postun scriptlets
+
+* Mon Mar 14 2005 David Hill <djh[at]ii.net> - 4.0.0-1
+- update to 4.0.0, no longer requires wxPythonGTK
+
+* Wed Dec 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.4.1-3.a
+- x86_64: Fix python dependency, replace with python-abi dependency.
+
+* Mon Mar 29 2004 Marius L. J?hndal <mariuslj at ifi.uio.no> - 0:3.4.1-0.fdr.2.a
+- Changed Requires wxPythonGTK to wxPython (bug 1416).
+- Converted spec file to UTF-8.
+
+* Thu Mar 25 2004 Marius L. J?hndal <mariuslj at ifi.uio.no> - 0:3.4.1-0.fdr.1.a
+- Updated to 3.4.1a.
+- Brought in line with the Python spec template.
+- Fixed group and missing epoch in requires for gui subpackage.
+- Eliminated multiple copies of README.txt.
+- Eliminated perl BuildReq.
+
+* Wed Jul 16 2003 Seth Vidal <skvidal at phy.duke.edu>
+- rebuild under 7.3
+- some fixes
+
+* Wed Jul 16 2003 Warren Togami <warren at togami.com> 3.2.1-0.fdr.2.b
+- Fedoraize
+
+* Wed Jul 16 2003 Seth Vidal <skvidal at phy.duke.edu>
+- rebuilt on rhl 9 - testing
+
+* Fri May 30 2003 Peter Hanecak <hanecak at megaloman.sk> 3.2.1b-1
+- adapted to Doors Linux
+
+* Sun Mar 30 2003 G?tz Waschk <waschk at linux-mandrake.com> 3.2.1b-1mdk
+- split out gui tools to remove wxPythonGTK dep from the main package
+- new version
+
+* Fri Mar 28 2003 Frederic Lepied <flepied at mandrakesoft.com> 3.2-1mdk
+- 3.2
+
+* Wed Mar 26 2003 Frederic Lepied <flepied at mandrakesoft.com> 3.1-1mdk
+- initial packaging



From svn at tinysofa.org  Mon May 23 13:12:29 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 23 May 2005 09:12:29 -0400 (EDT)
Subject: [tinysofa-svn] r6366 - in
	tinysofa/releases/classic/2.0/bzip2/current: sources specs
Message-ID: <20050523131229.DA9B0344CD8@minbar.tinysofa.org>

Author: jh
Date: 2005-05-23 09:12:01 -0400 (Mon, 23 May 2005)
New Revision: 6366

Added:
   tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.3-saneso.patch
   tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.3.tar.gz
Removed:
   tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2-saneso.patch
   tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2.tar.gz
Modified:
   tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec
Log:
- 1.0.3, fixes a DoS vulnerability

Deleted: tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2-saneso.patch
===================================================================
--- tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2-saneso.patch	2005-05-23 11:20:24 UTC (rev 6365)
+++ tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2-saneso.patch	2005-05-23 13:12:01 UTC (rev 6366)
@@ -1,11 +0,0 @@
---- bzip2-1.0.2/Makefile-libbz2_so.saneso	Wed Jan 30 15:44:10 2002
-+++ bzip2-1.0.2/Makefile-libbz2_so	Wed Jan 30 15:44:26 2002
-@@ -20,7 +20,7 @@
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS)
-+	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.2 $(OBJS)
- 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.2
- 	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.2 libbz2.so.1.0

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

Copied: tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.3-saneso.patch (from rev 6311, tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2-saneso.patch)
===================================================================
--- tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.2-saneso.patch	2005-05-09 18:54:10 UTC (rev 6311)
+++ tinysofa/releases/classic/2.0/bzip2/current/sources/bzip2-1.0.3-saneso.patch	2005-05-23 13:12:01 UTC (rev 6366)
@@ -0,0 +1,11 @@
+--- bzip2-1.0.2/Makefile-libbz2_so.saneso	Wed Jan 30 15:44:10 2002
++++ bzip2-1.0.2/Makefile-libbz2_so	Wed Jan 30 15:44:26 2002
+@@ -20,7 +20,7 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
++	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.3 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.3 libbz2.so.1.0

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


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

Modified: tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec
===================================================================
--- tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec	2005-05-23 11:20:24 UTC (rev 6365)
+++ tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec	2005-05-23 13:12:01 UTC (rev 6366)
@@ -1,12 +1,11 @@
 Summary: A file compression utility.
 Name: bzip2
-Version: 1.0.2
-Release: 17jh
+Version: 1.0.3
+Release: 1jh
 License: BSD
 Group: main
 URL: http://sources.redhat.com/bzip2/
 Source: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{version}.tar.gz
-Patch: bzip2-1.0.2-saneso.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: bzip2-libs = %{version}-%{release}
 
@@ -40,7 +39,6 @@
 
 %prep
 %setup -q 
-%patch -p1
 
 
 %build
@@ -58,7 +56,7 @@
 mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}}
 
 install -m 755 bzlib.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libbz2.so.1.0.2 $RPM_BUILD_ROOT/%{_libdir}
+install -m 755 libbz2.so.%{version} $RPM_BUILD_ROOT/%{_libdir}
 install -m 755 libbz2.a $RPM_BUILD_ROOT/%{_libdir}
 install -m 755 bzip2-shared  $RPM_BUILD_ROOT/%{_bindir}/bzip2
 install -m 755 bzip2recover bzgrep bzdiff bzmore  $RPM_BUILD_ROOT/%{_bindir}/
@@ -67,7 +65,7 @@
 ln -s bzip2 $RPM_BUILD_ROOT/%{_bindir}/bzcat
 ln -s bzdiff $RPM_BUILD_ROOT/%{_bindir}/bzcmp
 ln -s bzmore $RPM_BUILD_ROOT/%{_bindir}/bzless
-ln -s libbz2.so.1.0.2 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1
+ln -s libbz2.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1
 ln -s libbz2.so.1 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so
 ln -s bzip2.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bzip2recover.1
 ln -s bzip2.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bunzip2.1
@@ -103,6 +101,9 @@
 
 
 %changelog
+* Mon May 23 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.0.3-1jh
+- 1.0.3, fixes a DoS vulnerability
+
 * Sat Sep 04 2004 tsintegrate <release at tinysofa dot org> 1.0.2-16ts
 - current (1.0.2-16jh) integrated as 1.0.2-16ts for release 1.1-U1
 



From svn at tinysofa.org  Mon May 23 17:53:42 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 23 May 2005 13:53:42 -0400 (EDT)
Subject: [tinysofa-svn] r6367 - in
	tinysofa/releases/classic/2.0/gdb/current: sources specs
Message-ID: <20050523175342.D9914344C21@minbar.tinysofa.org>

Author: jh
Date: 2005-05-23 13:53:31 -0400 (Mon, 23 May 2005)
New Revision: 6367

Added:
   tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-bfd.patch
   tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-gdbinit-stat.patch
Modified:
   tinysofa/releases/classic/2.0/gdb/current/specs/gdb.spec
Log:
- fix bfd library heap overflow
- fix insecure initialisation file handling


Added: tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-bfd.patch
===================================================================
--- tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-bfd.patch	2005-05-23 13:12:01 UTC (rev 6366)
+++ tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-bfd.patch	2005-05-23 17:53:31 UTC (rev 6367)
@@ -0,0 +1,32 @@
+--- ./bfd/elf.c	2004-09-27 21:46:06.000000000 +0100
++++ ./bfd/elf.c	2005-05-09 15:23:43.000000000 +0100
+@@ -796,7 +796,8 @@
+       /* Look through the phdrs to see if we need to adjust the lma.
+          If all the p_paddr fields are zero, we ignore them, since
+          some ELF linkers produce such output.  */
+-      phdr = elf_tdata (abfd)->phdr;
++	  if ((phdr = elf_tdata (abfd)->phdr) == NULL)
++		  return FALSE;
+       for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
+ 	{
+ 	  if (phdr->p_paddr != 0)
+@@ -1724,6 +1725,9 @@
+   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+   const char *name;
+ 
++  if (hdr == NULL)
++	  return FALSE;
++
+   name = elf_string_from_elf_strtab (abfd, hdr->sh_name);
+ 
+   switch (hdr->sh_type)
+@@ -1744,6 +1748,9 @@
+     case SHT_DYNAMIC:	/* Dynamic linking information.  */
+       if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
+ 	return FALSE;
++	  if (hdr->sh_link > elf_numsections (abfd) || 
++			  elf_elfsections (abfd)[hdr->sh_link] == NULL)
++		  return FALSE;
+       if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_STRTAB)
+ 	{
+ 	  Elf_Internal_Shdr *dynsymhdr;

Added: tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-gdbinit-stat.patch
===================================================================
--- tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-gdbinit-stat.patch	2005-05-23 13:12:01 UTC (rev 6366)
+++ tinysofa/releases/classic/2.0/gdb/current/sources/gdb-6.3-gdbinit-stat.patch	2005-05-23 17:53:31 UTC (rev 6367)
@@ -0,0 +1,11 @@
+--- ./gdb/main.c.orig	2005-04-08 18:21:50.000000000 -0400
++++ ./gdb/main.c	2005-04-08 18:50:58.000000000 -0400
+@@ -693,7 +693,7 @@
+ 
+   if (!homedir
+       || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
+-    if (!inhibit_gdbinit)
++    if (!inhibit_gdbinit && (cwdbuf.st_uid == getuid()) && (!cwdbuf.st_mode & (S_IWOTH)))
+       {
+ 	catch_command_errors (source_command, gdbinit, 0, RETURN_MASK_ALL);
+       }

Modified: tinysofa/releases/classic/2.0/gdb/current/specs/gdb.spec
===================================================================
--- tinysofa/releases/classic/2.0/gdb/current/specs/gdb.spec	2005-05-23 13:12:01 UTC (rev 6366)
+++ tinysofa/releases/classic/2.0/gdb/current/specs/gdb.spec	2005-05-23 17:53:31 UTC (rev 6367)
@@ -1,10 +1,12 @@
 Summary: A GNU source-level debugger for C, C++ and other languages.
 Name: gdb
 Version: 6.3
-Release: 2jh
+Release: 3jh
 License: GPL
 Group: development
 Source0: ftp://ftp.gnu.org/gdb/gdb/gdb-%{version}/gdb-%{version}.tar.bz2
+Patch0: gdb-6.3-gdbinit-stat.patch
+Patch1: gdb-6.3-bfd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: ncurses glibc
 BuildRequires: ncurses-devel glibc-devel gcc make gzip gettext flex
@@ -17,6 +19,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gdbinit-stat~
+%patch1 -p1 -b .bfd~
 
 
 %build
@@ -56,6 +60,10 @@
 
 
 %changelog
+* Mon May 23 2005 Jaakko Heinonen <jh at tinysofa dot org> 6.3-3jh
+- fix bfd library heap overflow
+- fix insecure initialisation file handling
+
 * Fri Feb 18 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - multilib fix
 



From svn at tinysofa.org  Tue May 24 05:09:39 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 24 May 2005 01:09:39 -0400 (EDT)
Subject: [tinysofa-svn] r6368 -
	contrib/classic/2.0/courier-imap/current/specs
Message-ID: <20050524050939.245D2344C4D@minbar.tinysofa.org>

Author: jh
Date: 2005-05-24 01:09:32 -0400 (Tue, 24 May 2005)
New Revision: 6368

Modified:
   contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec
Log:
- don't require imapd-pam

Modified: contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec
===================================================================
--- contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec	2005-05-23 17:53:31 UTC (rev 6367)
+++ contrib/classic/2.0/courier-imap/current/specs/courier-imap.spec	2005-05-24 05:09:32 UTC (rev 6368)
@@ -1,7 +1,7 @@
 Summary: Courier-IMAP server
 Name: courier-imap
 Version: 3.0.7
-Release: 2gd
+Release: 3jh
 License: GPL
 Group: contrib
 Source: http://unc.dl.sourceforge.net/sourceforge/courier/courier-imap-%{version}.tar.bz2
@@ -23,7 +23,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 %service_requires
 Requires: coreutils, sed
-Requires: db4, openssl, imapd-pam
+Requires: db4, openssl
+Requires: /etc/pam.d/imap
+Requires: /etc/pam.d/pop
+Requires: /etc/pam.d/pop3
 BuildRequires: sed, libstdc++-devel gcc-c++
 BuildRequires: perl, db4-devel, openssl-devel
 BuildRequires: pam-devel openldap-devel mysql-devel postgresql-devel
@@ -238,6 +241,9 @@
 
 
 %changelog
+* Tue May 24 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.0.7-3jh
+- don't require imapd-pam
+
 * Sun Feb 13 2005 Gerald Dachs <gda at tinysofa dot org> 3.0.7-2gd
 - patched for tinysofa 1.2
 - moved to contrib



From svn at tinysofa.org  Tue May 24 05:10:54 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 24 May 2005 01:10:54 -0400 (EDT)
Subject: [tinysofa-svn] r6369 - contrib/classic/2.0
Message-ID: <20050524051054.10C85344C4D@minbar.tinysofa.org>

Author: jh
Date: 2005-05-24 01:10:48 -0400 (Tue, 24 May 2005)
New Revision: 6369

Removed:
   contrib/classic/2.0/imapd-pam/
Log:
- remove imapd-pam




From svn at tinysofa.org  Tue May 24 11:07:35 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 24 May 2005 07:07:35 -0400 (EDT)
Subject: [tinysofa-svn] r6370 - in
	tinysofa/releases/classic/2.0/openssl/current: sources specs
Message-ID: <20050524110735.CFB1F344C91@minbar.tinysofa.org>

Author: jh
Date: 2005-05-24 07:07:25 -0400 (Tue, 24 May 2005)
New Revision: 6370

Added:
   tinysofa/releases/classic/2.0/openssl/current/sources/openssl-0.9.7e-can-2005-0109.patch
Modified:
   tinysofa/releases/classic/2.0/openssl/current/specs/openssl.spec
Log:
- add openssl-0.9.7e-can-2005-0109.patch

Added: tinysofa/releases/classic/2.0/openssl/current/sources/openssl-0.9.7e-can-2005-0109.patch
===================================================================
--- tinysofa/releases/classic/2.0/openssl/current/sources/openssl-0.9.7e-can-2005-0109.patch	2005-05-24 05:10:48 UTC (rev 6369)
+++ tinysofa/releases/classic/2.0/openssl/current/sources/openssl-0.9.7e-can-2005-0109.patch	2005-05-24 11:07:25 UTC (rev 6370)
@@ -0,0 +1,1007 @@
+--- ./apps/speed.c.can-2005-0109~	2004-06-28 19:32:14.000000000 +0300
++++ ./apps/speed.c	2005-05-24 13:58:34.000000000 +0300
+@@ -1706,7 +1706,7 @@
+ 				k,rsa_bits[k],rsa_results[k][0],
+ 				rsa_results[k][1]);
+ 		else
+-			fprintf(stdout,"rsa %4u bits %8.4fs %8.4fs %8.1f %8.1f\n",
++			fprintf(stdout,"rsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
+ 				rsa_bits[k],rsa_results[k][0],rsa_results[k][1],
+ 				1.0/rsa_results[k][0],1.0/rsa_results[k][1]);
+ 		}
+@@ -1725,7 +1725,7 @@
+ 			fprintf(stdout,"+F3:%u:%u:%f:%f\n",
+ 				k,dsa_bits[k],dsa_results[k][0],dsa_results[k][1]);
+ 		else
+-			fprintf(stdout,"dsa %4u bits %8.4fs %8.4fs %8.1f %8.1f\n",
++			fprintf(stdout,"dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
+ 				dsa_bits[k],dsa_results[k][0],dsa_results[k][1],
+ 				1.0/dsa_results[k][0],1.0/dsa_results[k][1]);
+ 		}
+--- ./util/libeay.num.can-2005-0109~	2004-10-14 08:52:06.000000000 +0300
++++ ./util/libeay.num	2005-05-24 13:59:20.000000000 +0300
+@@ -2841,3 +2841,4 @@
+ FIPS_mode                               3283	EXIST:OPENSSL_FIPS:FUNCTION:
+ FIPS_selftest_failed                    3284	EXIST:OPENSSL_FIPS:FUNCTION:
+ sk_is_sorted                            3285	EXIST::FUNCTION:
++BN_mod_exp_mont_consttime               3286	EXIST::FUNCTION:
+--- ./crypto/bn/exptest.c.can-2005-0109~	2003-02-22 20:02:41.000000000 +0200
++++ ./crypto/bn/exptest.c	2005-05-24 13:58:34.000000000 +0300
+@@ -77,7 +77,7 @@
+ 	BIO *out=NULL;
+ 	int i,ret;
+ 	unsigned char c;
+-	BIGNUM *r_mont,*r_recp,*r_simple,*a,*b,*m;
++	BIGNUM *r_mont,*r_mont_const,*r_recp,*r_simple,*a,*b,*m;
+ 
+ 	RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_rand may fail, and we don't
+ 	                                       * even check its return value
+@@ -88,6 +88,7 @@
+ 	ctx=BN_CTX_new();
+ 	if (ctx == NULL) EXIT(1);
+ 	r_mont=BN_new();
++	r_mont_const=BN_new();
+ 	r_recp=BN_new();
+ 	r_simple=BN_new();
+ 	a=BN_new();
+@@ -143,8 +144,17 @@
+ 			EXIT(1);
+ 			}
+ 
++		ret=BN_mod_exp_mont_consttime(r_mont_const,a,b,m,ctx,NULL);
++		if (ret <= 0)
++			{
++			printf("BN_mod_exp_mont_consttime() problems\n");
++			ERR_print_errors(out);
++			EXIT(1);
++			}
++
+ 		if (BN_cmp(r_simple, r_mont) == 0
+-		    && BN_cmp(r_simple,r_recp) == 0)
++		    && BN_cmp(r_simple,r_recp) == 0
++			&& BN_cmp(r_simple,r_mont_const) == 0)
+ 			{
+ 			printf(".");
+ 			fflush(stdout);
+@@ -153,6 +163,8 @@
+ 		  	{
+ 			if (BN_cmp(r_simple,r_mont) != 0)
+ 				printf("\nsimple and mont results differ\n");
++			if (BN_cmp(r_simple,r_mont) != 0)
++				printf("\nsimple and mont const time results differ\n");
+ 			if (BN_cmp(r_simple,r_recp) != 0)
+ 				printf("\nsimple and recp results differ\n");
+ 
+@@ -162,11 +174,13 @@
+ 			printf("\nsimple   =");	BN_print(out,r_simple);
+ 			printf("\nrecp     =");	BN_print(out,r_recp);
+ 			printf("\nmont     ="); BN_print(out,r_mont);
++			printf("\nmont_ct  ="); BN_print(out,r_mont_const);
+ 			printf("\n");
+ 			EXIT(1);
+ 			}
+ 		}
+ 	BN_free(r_mont);
++	BN_free(r_mont_const);
+ 	BN_free(r_recp);
+ 	BN_free(r_simple);
+ 	BN_free(a);
+--- ./crypto/bn/bn_lcl.h.can-2005-0109~	2004-01-29 11:41:01.000000000 +0200
++++ ./crypto/bn/bn_lcl.h	2005-05-24 13:58:34.000000000 +0300
+@@ -177,6 +177,45 @@
+ 
+ 
+ 
++/* BN_mod_exp_mont_conttime is based on the assumption that the
++ * L1 data cache line width of the target processor is at least
++ * the following value.
++ */
++#define MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH	( 64 )
++#define MOD_EXP_CTIME_MIN_CACHE_LINE_MASK	(MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - 1)
++
++/* Window sizes optimized for fixed window size modular exponentiation
++ * algorithm (BN_mod_exp_mont_consttime).
++ *
++ * To achieve the security goals of BN_mode_exp_mont_consttime, the
++ * maximum size of the window must not exceed
++ * log_2(MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH). 
++ *
++ * Window size thresholds are defined for cache line sizes of 32 and 64,
++ * cache line sizes where log_2(32)=5 and log_2(64)=6 respectively. A
++ * window size of 7 should only be used on processors that have a 128
++ * byte or greater cache line size.
++ */
++#if MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 64
++
++#  define BN_window_bits_for_ctime_exponent_size(b) \
++		((b) > 937 ? 6 : \
++		 (b) > 306 ? 5 : \
++		 (b) >  89 ? 4 : \
++		 (b) >  22 ? 3 : 1)
++#  define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE	(6)
++
++#elif MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 32
++
++#  define BN_window_bits_for_ctime_exponent_size(b) \
++		((b) > 306 ? 5 : \
++		 (b) >  89 ? 4 : \
++		 (b) >  22 ? 3 : 1)
++#  define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE	(5)
++
++#endif
++
++
+ /* Pentium pro 16,16,16,32,64 */
+ /* Alpha       16,16,16,16.64 */
+ #define BN_MULL_SIZE_NORMAL			(16) /* 32 */
+--- ./crypto/bn/bn_exp.c.can-2005-0109~	2000-12-08 00:06:09.000000000 +0200
++++ ./crypto/bn/bn_exp.c	2005-05-24 13:58:34.000000000 +0300
+@@ -56,7 +56,7 @@
+  * [including the GNU Public Licence.]
+  */
+ /* ====================================================================
+- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
++ * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+@@ -113,6 +113,7 @@
+ #include "cryptlib.h"
+ #include "bn_lcl.h"
+ 
++/* maximum precomputation table size for *variable* sliding windows */
+ #define TABLE_SIZE	32
+ 
+ /* this one works - simple but works */
+@@ -121,6 +122,13 @@
+ 	int i,bits,ret=0;
+ 	BIGNUM *v,*rr;
+ 
++	if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
++		{
++		/* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
++		BNerr(BN_F_BN_EXP,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
++		return -1;
++		}
++
+ 	BN_CTX_start(ctx);
+ 	if ((r == a) || (r == p))
+ 		rr = BN_CTX_get(ctx);
+@@ -204,7 +212,7 @@
+ 	if (BN_is_odd(m))
+ 		{
+ #  ifdef MONT_EXP_WORD
+-		if (a->top == 1 && !a->neg)
++		if (a->top == 1 && !a->neg && (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) == 0))
+ 			{
+ 			BN_ULONG A = a->d[0];
+ 			ret=BN_mod_exp_mont_word(r,A,p,m,ctx,NULL);
+@@ -234,6 +242,13 @@
+ 	BIGNUM val[TABLE_SIZE];
+ 	BN_RECP_CTX recp;
+ 
++	if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
++		{
++		/* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
++		BNerr(BN_F_BN_MOD_EXP_RECP,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
++		return -1;
++		}
++
+ 	bits=BN_num_bits(p);
+ 
+ 	if (bits == 0)
+@@ -361,6 +376,11 @@
+ 	BIGNUM val[TABLE_SIZE];
+ 	BN_MONT_CTX *mont=NULL;
+ 
++	if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
++		{
++		return BN_mod_exp_mont_consttime(rr, a, p, m, ctx, in_mont);
++		}
++
+ 	bn_check_top(a);
+ 	bn_check_top(p);
+ 	bn_check_top(m);
+@@ -493,6 +513,212 @@
+ 	return(ret);
+ 	}
+ 
++
++/* BN_mod_exp_mont_consttime() stores the precomputed powers in a specific layout
++ * so that accessing any of these table values shows the same access pattern as far
++ * as cache lines are concerned.  The following functions are used to transfer a BIGNUM
++ * from/to that table. */
++
++static int MOD_EXP_CTIME_COPY_TO_PREBUF(BIGNUM *b, int top, unsigned char *buf, int idx, int width)
++	{
++	size_t i, j;
++
++	if (bn_wexpand(b, top) == NULL)
++		return 0;
++	while (b->top < top)
++		{
++		b->d[b->top++] = 0;
++		}
++	
++	for (i = 0, j=idx; i < top * sizeof b->d[0]; i++, j+=width)
++		{
++		buf[j] = ((unsigned char*)b->d)[i];
++		}
++
++	bn_fix_top(b);
++	return 1;
++	}
++
++static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, unsigned char *buf, int idx, int width)
++	{
++	size_t i, j;
++
++	if (bn_wexpand(b, top) == NULL)
++		return 0;
++
++	for (i=0, j=idx; i < top * sizeof b->d[0]; i++, j+=width)
++		{
++		((unsigned char*)b->d)[i] = buf[j];
++		}
++
++	b->top = top;
++	bn_fix_top(b);
++	return 1;
++	}	
++
++/* Given a pointer value, compute the next address that is a cache line multiple. */
++#define MOD_EXP_CTIME_ALIGN(x_) \
++	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ULONG)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
++
++/* This variant of BN_mod_exp_mont() uses fixed windows and the special
++ * precomputation memory layout to limit data-dependency to a minimum
++ * to protect secret exponents (cf. the hyper-threading timing attacks
++ * pointed out by Colin Percival,
++ * http://www.daemonology.net/hyperthreading-considered-harmful/)
++ */
++int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
++		    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
++	{
++	int i,bits,ret=0,idx,window,wvalue;
++	int top;
++ 	BIGNUM *r;
++	const BIGNUM *aa;
++	BN_MONT_CTX *mont=NULL;
++
++	int numPowers;
++	unsigned char *powerbufFree=NULL;
++	int powerbufLen = 0;
++	unsigned char *powerbuf=NULL;
++	BIGNUM *computeTemp=NULL, *am=NULL;
++
++	bn_check_top(a);
++	bn_check_top(p);
++	bn_check_top(m);
++
++	top = m->top;
++
++	if (!(m->d[0] & 1))
++		{
++		BNerr(BN_F_BN_MOD_EXP_MONT_CONSTTIME,BN_R_CALLED_WITH_EVEN_MODULUS);
++		return(0);
++		}
++	bits=BN_num_bits(p);
++	if (bits == 0)
++		{
++		ret = BN_one(rr);
++		return ret;
++		}
++
++ 	/* Initialize BIGNUM context and allocate intermediate result */
++	BN_CTX_start(ctx);
++	r = BN_CTX_get(ctx);
++	if (r == NULL) goto err;
++
++	/* Allocate a montgomery context if it was not supplied by the caller.
++	 * If this is not done, things will break in the montgomery part.
++ 	 */
++	if (in_mont != NULL)
++		mont=in_mont;
++	else
++		{
++		if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
++		if (!BN_MONT_CTX_set(mont,m,ctx)) goto err;
++		}
++
++	/* Get the window size to use with size of p. */
++	window = BN_window_bits_for_ctime_exponent_size(bits);
++
++	/* Allocate a buffer large enough to hold all of the pre-computed
++	 * powers of a.
++	 */
++	numPowers = 1 << window;
++	powerbufLen = sizeof(m->d[0])*top*numPowers;
++	if ((powerbufFree=(unsigned char*)OPENSSL_malloc(powerbufLen+MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH)) == NULL)
++		goto err;
++		
++	powerbuf = MOD_EXP_CTIME_ALIGN(powerbufFree);
++	memset(powerbuf, 0, powerbufLen);
++
++ 	/* Initialize the intermediate result. Do this early to save double conversion,
++	 * once each for a^0 and intermediate result.
++	 */
++ 	if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
++	if (!MOD_EXP_CTIME_COPY_TO_PREBUF(r, top, powerbuf, 0, numPowers)) goto err;
++
++	/* Initialize computeTemp as a^1 with montgomery precalcs */
++	computeTemp = BN_CTX_get(ctx);
++	am = BN_CTX_get(ctx);
++	if (computeTemp==NULL || am==NULL) goto err;
++
++	if (a->neg || BN_ucmp(a,m) >= 0)
++		{
++		if (!BN_mod(am,a,m,ctx))
++			goto err;
++		aa= am;
++		}
++	else
++		aa=a;
++	if (!BN_to_montgomery(am,aa,mont,ctx)) goto err;
++	if (!BN_copy(computeTemp, am)) goto err;
++	if (!MOD_EXP_CTIME_COPY_TO_PREBUF(am, top, powerbuf, 1, numPowers)) goto err;
++
++	/* If the window size is greater than 1, then calculate
++	 * val[i=2..2^winsize-1]. Powers are computed as a*a^(i-1)
++	 * (even powers could instead be computed as (a^(i/2))^2
++	 * to use the slight performance advantage of sqr over mul).
++	 */
++	if (window > 1)
++		{
++		for (i=2; i<numPowers; i++)
++			{
++			/* Calculate a^i = a^(i-1) * a */
++			if (!BN_mod_mul_montgomery(computeTemp,am,computeTemp,mont,ctx))
++				goto err;
++			if (!MOD_EXP_CTIME_COPY_TO_PREBUF(computeTemp, top, powerbuf, i, numPowers)) goto err;
++			}
++		}
++
++ 	/* Adjust the number of bits up to a multiple of the window size.
++ 	 * If the exponent length is not a multiple of the window size, then
++ 	 * this pads the most significant bits with zeros to normalize the
++ 	 * scanning loop to there's no special cases.
++ 	 *
++ 	 * * NOTE: Making the window size a power of two less than the native
++	 * * word size ensures that the padded bits won't go past the last
++ 	 * * word in the internal BIGNUM structure. Going past the end will
++ 	 * * still produce the correct result, but causes a different branch
++ 	 * * to be taken in the BN_is_bit_set function.
++ 	 */
++ 	bits = ((bits+window-1)/window)*window;
++ 	idx=bits-1;	/* The top bit of the window */
++
++ 	/* Scan the exponent one window at a time starting from the most
++ 	 * significant bits.
++ 	 */
++ 	while (idx >= 0)
++  		{
++ 		wvalue=0; /* The 'value' of the window */
++ 		
++ 		/* Scan the window, squaring the result as we go */
++ 		for (i=0; i<window; i++,idx--)
++ 			{
++			if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))	goto err;
++			wvalue = (wvalue<<1)+BN_is_bit_set(p,idx);
++  			}
++ 		
++		/* Fetch the appropriate pre-computed value from the pre-buf */
++		if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(computeTemp, top, powerbuf, wvalue, numPowers)) goto err;
++
++ 		/* Multiply the result into the intermediate result */
++ 		if (!BN_mod_mul_montgomery(r,r,computeTemp,mont,ctx)) goto err;
++  		}
++
++ 	/* Convert the final result from montgomery to standard format */
++	if (!BN_from_montgomery(rr,r,mont,ctx)) goto err;
++	ret=1;
++err:
++	if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
++	if (powerbuf!=NULL)
++		{
++		OPENSSL_cleanse(powerbuf,powerbufLen);
++		OPENSSL_free(powerbufFree);
++		}
++ 	if (am!=NULL) BN_clear(am);
++ 	if (computeTemp!=NULL) BN_clear(computeTemp);
++	BN_CTX_end(ctx);
++	return(ret);
++	}
++
+ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
+                          const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
+ 	{
+@@ -517,6 +743,13 @@
+ #define BN_TO_MONTGOMERY_WORD(r, w, mont) \
+ 		(BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx))
+ 
++	if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
++		{
++		/* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
++		BNerr(BN_F_BN_MOD_EXP_MONT_WORD,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
++		return -1;
++		}
++
+ 	bn_check_top(p);
+ 	bn_check_top(m);
+ 
+@@ -644,6 +877,13 @@
+ 	BIGNUM *d;
+ 	BIGNUM val[TABLE_SIZE];
+ 
++	if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
++		{
++		/* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
++		BNerr(BN_F_BN_MOD_EXP_SIMPLE,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
++		return -1;
++		}
++
+ 	bits=BN_num_bits(p);
+ 
+ 	if (bits == 0)
+--- ./crypto/bn/bn_err.c.can-2005-0109~	2001-02-19 18:05:06.000000000 +0200
++++ ./crypto/bn/bn_err.c	2005-05-24 13:58:34.000000000 +0300
+@@ -75,11 +75,15 @@
+ {ERR_PACK(0,BN_F_BN_CTX_GET,0),	"BN_CTX_get"},
+ {ERR_PACK(0,BN_F_BN_CTX_NEW,0),	"BN_CTX_new"},
+ {ERR_PACK(0,BN_F_BN_DIV,0),	"BN_div"},
++{ERR_PACK(0,BN_F_BN_EXP,0),	"BN_exp"},
+ {ERR_PACK(0,BN_F_BN_EXPAND2,0),	"bn_expand2"},
+ {ERR_PACK(0,BN_F_BN_EXPAND_INTERNAL,0),	"BN_EXPAND_INTERNAL"},
+ {ERR_PACK(0,BN_F_BN_MOD_EXP2_MONT,0),	"BN_mod_exp2_mont"},
+ {ERR_PACK(0,BN_F_BN_MOD_EXP_MONT,0),	"BN_mod_exp_mont"},
++{ERR_PACK(0,BN_F_BN_MOD_EXP_MONT_CONSTTIME,0),	"BN_mod_exp_mont_consttime"},
+ {ERR_PACK(0,BN_F_BN_MOD_EXP_MONT_WORD,0),	"BN_mod_exp_mont_word"},
++{ERR_PACK(0,BN_F_BN_MOD_EXP_RECP,0),	"BN_mod_exp_recp"},
++{ERR_PACK(0,BN_F_BN_MOD_EXP_SIMPLE,0),	"BN_mod_exp_simple"},
+ {ERR_PACK(0,BN_F_BN_MOD_INVERSE,0),	"BN_mod_inverse"},
+ {ERR_PACK(0,BN_F_BN_MOD_LSHIFT_QUICK,0),	"BN_mod_lshift_quick"},
+ {ERR_PACK(0,BN_F_BN_MOD_MUL_RECIPROCAL,0),	"BN_mod_mul_reciprocal"},
+--- ./crypto/bn/bntest.c.can-2005-0109~	2004-05-11 15:45:06.000000000 +0300
++++ ./crypto/bn/bntest.c	2005-05-24 13:58:34.000000000 +0300
+@@ -86,6 +86,7 @@
+ int test_mod(BIO *bp,BN_CTX *ctx);
+ int test_mod_mul(BIO *bp,BN_CTX *ctx);
+ int test_mod_exp(BIO *bp,BN_CTX *ctx);
++int test_mod_exp_mont_consttime(BIO *bp,BN_CTX *ctx);
+ int test_exp(BIO *bp,BN_CTX *ctx);
+ int test_kron(BIO *bp,BN_CTX *ctx);
+ int test_sqrt(BIO *bp,BN_CTX *ctx);
+@@ -213,6 +214,10 @@
+ 	if (!test_mod_exp(out,ctx)) goto err;
+ 	BIO_flush(out);
+ 
++	message(out,"BN_mod_exp_mont_consttime");
++	if (!test_mod_exp_mont_consttime(out,ctx)) goto err;
++	BIO_flush(out);
++
+ 	message(out,"BN_exp");
+ 	if (!test_exp(out,ctx)) goto err;
+ 	BIO_flush(out);
+@@ -813,6 +818,57 @@
+ 	return(1);
+ 	}
+ 
++int test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx)
++	{
++	BIGNUM *a,*b,*c,*d,*e;
++	int i;
++
++	a=BN_new();
++	b=BN_new();
++	c=BN_new();
++	d=BN_new();
++	e=BN_new();
++
++	BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */
++	for (i=0; i<num2; i++)
++		{
++		BN_bntest_rand(a,20+i*5,0,0); /**/
++		BN_bntest_rand(b,2+i,0,0); /**/
++
++		if (!BN_mod_exp_mont_consttime(d,a,b,c,ctx,NULL))
++			return(00);
++
++		if (bp != NULL)
++			{
++			if (!results)
++				{
++				BN_print(bp,a);
++				BIO_puts(bp," ^ ");
++				BN_print(bp,b);
++				BIO_puts(bp," % ");
++				BN_print(bp,c);
++				BIO_puts(bp," - ");
++				}
++			BN_print(bp,d);
++			BIO_puts(bp,"\n");
++			}
++		BN_exp(e,a,b,ctx);
++		BN_sub(e,e,d);
++		BN_div(a,b,e,c,ctx);
++		if(!BN_is_zero(b))
++		    {
++		    fprintf(stderr,"Modulo exponentiation test failed!\n");
++		    return 0;
++		    }
++		}
++	BN_free(a);
++	BN_free(b);
++	BN_free(c);
++	BN_free(d);
++	BN_free(e);
++	return(1);
++	}
++
+ int test_exp(BIO *bp, BN_CTX *ctx)
+ 	{
+ 	BIGNUM *a,*b,*d,*e,*one;
+--- ./crypto/bn/bn.h.can-2005-0109~	2003-04-02 12:50:53.000000000 +0300
++++ ./crypto/bn/bn.h	2005-05-24 13:58:34.000000000 +0300
+@@ -225,10 +225,21 @@
+ 
+ #define BN_FLG_MALLOCED		0x01
+ #define BN_FLG_STATIC_DATA	0x02
++#define BN_FLG_EXP_CONSTTIME	0x04 /* avoid leaking exponent information through timings
++                            	      * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */
+ #define BN_FLG_FREE		0x8000	/* used for debuging */
+ #define BN_set_flags(b,n)	((b)->flags|=(n))
+ #define BN_get_flags(b,n)	((b)->flags&(n))
+ 
++#define BN_with_flags(dest,b,n)  ((dest)->d=(b)->d, \
++                                  (dest)->top=(b)->top, \
++                                  (dest)->dmax=(b)->dmax, \
++                                  (dest)->neg=(b)->neg, \
++                                  (dest)->flags=(((dest)->flags & BN_FLG_MALLOCED) \
++                                                 |  ((b)->flags & ~BN_FLG_MALLOCED) \
++                                                 |  BN_FLG_STATIC_DATA \
++                                                 |  (n)))
++
+ typedef struct bignum_st
+ 	{
+ 	BN_ULONG *d;	/* Pointer to an array of 'BN_BITS2' bit chunks. */
+@@ -378,6 +389,8 @@
+ 	const BIGNUM *m,BN_CTX *ctx);
+ int	BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+ 	const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
++int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
++	const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
+ int	BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
+ 	const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+ int	BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
+@@ -510,11 +523,15 @@
+ #define BN_F_BN_CTX_GET					 116
+ #define BN_F_BN_CTX_NEW					 106
+ #define BN_F_BN_DIV					 107
++#define BN_F_BN_EXP					 123
+ #define BN_F_BN_EXPAND2					 108
+ #define BN_F_BN_EXPAND_INTERNAL				 120
+ #define BN_F_BN_MOD_EXP2_MONT				 118
+ #define BN_F_BN_MOD_EXP_MONT				 109
++#define BN_F_BN_MOD_EXP_MONT_CONSTTIME			 124
+ #define BN_F_BN_MOD_EXP_MONT_WORD			 117
++#define BN_F_BN_MOD_EXP_RECP				 125
++#define BN_F_BN_MOD_EXP_SIMPLE				 126
+ #define BN_F_BN_MOD_INVERSE				 110
+ #define BN_F_BN_MOD_LSHIFT_QUICK			 119
+ #define BN_F_BN_MOD_MUL_RECIPROCAL			 111
+--- ./crypto/bn/expspeed.c.can-2005-0109~	2001-03-07 12:03:54.000000000 +0200
++++ ./crypto/bn/expspeed.c	2005-05-24 13:58:34.000000000 +0300
+@@ -321,7 +321,7 @@
+ #else /* TEST_SQRT */
+ 			"2*sqrt [prime == %d (mod 64)] %4d %4d mod %4d"
+ #endif
+-			" -> %8.3fms %5.1f (%ld)\n",
++			" -> %8.6fms %5.1f (%ld)\n",
+ #ifdef TEST_SQRT
+ 			P_MOD_64,
+ #endif
+--- ./crypto/dh/dhtest.c.can-2005-0109~	2003-02-22 20:02:43.000000000 +0200
++++ ./crypto/dh/dhtest.c	2005-05-24 13:58:34.000000000 +0300
+@@ -136,6 +136,10 @@
+ 	b->g=BN_dup(a->g);
+ 	if ((b->p == NULL) || (b->g == NULL)) goto err;
+ 
++	/* Set a to run with normal modexp and b to use constant time */
++	a->flags &= ~DH_FLAG_NO_EXP_CONSTTIME;
++	b->flags |= DH_FLAG_NO_EXP_CONSTTIME;
++
+ 	if (!DH_generate_key(a)) goto err;
+ 	BIO_puts(out,"pri 1=");
+ 	BN_print(out,a->priv_key);
+--- ./crypto/dh/dh_key.c.can-2005-0109~	2004-06-19 16:15:34.000000000 +0300
++++ ./crypto/dh/dh_key.c	2005-05-24 14:05:12.000000000 +0300
+@@ -141,8 +141,21 @@
+ 		l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */
+ 		if (!BN_rand(priv_key, l, 0, 0)) goto err;
+ 		}
+-	if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, priv_key,dh->p,ctx,mont))
+-		goto err;
++
++	{
++		BIGNUM local_prk;
++		BIGNUM *prk;
++
++		if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0)
++			{
++			prk = &local_prk;
++			BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME);
++			}
++		else
++			prk = priv_key;
++
++		if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, prk, dh->p, ctx, mont)) goto err;
++	}
+ 		
+ 	dh->pub_key=pub_key;
+ 	dh->priv_key=priv_key;
+@@ -180,7 +193,11 @@
+ 			if (!BN_MONT_CTX_set((BN_MONT_CTX *)dh->method_mont_p,
+ 				dh->p,ctx)) goto err;
+ 		}
+-
++	if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0)
++		{
++		/* XXX */
++		BN_set_flags(dh->priv_key, BN_FLG_EXP_CONSTTIME);
++		}
+ 	mont=(BN_MONT_CTX *)dh->method_mont_p;
+ 	if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont))
+ 		{
+@@ -200,7 +217,10 @@
+ 			const BIGNUM *m, BN_CTX *ctx,
+ 			BN_MONT_CTX *m_ctx)
+ 	{
+-	if (a->top == 1)
++	/* If a is only one word long and constant time is false, use the faster
++	 * exponenentiation function.
++	 */
++	if (a->top == 1 && ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) != 0))
+ 		{
+ 		BN_ULONG A = a->d[0];
+ 		return BN_mod_exp_mont_word(r,A,p,m,ctx,m_ctx);
+--- ./crypto/dh/dh.h.can-2005-0109~	2004-06-19 16:15:34.000000000 +0300
++++ ./crypto/dh/dh.h	2005-05-24 13:58:34.000000000 +0300
+@@ -70,7 +70,14 @@
+ #include <openssl/crypto.h>
+ #include <openssl/ossl_typ.h>
+ 	
+-#define DH_FLAG_CACHE_MONT_P	0x01
++#define DH_FLAG_CACHE_MONT_P     0x01
++#define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH
++                                       * implementation now uses constant time
++                                       * modular exponentiation for secret exponents
++                                       * by default. This flag causes the
++                                       * faster variable sliding window method to
++                                       * be used for all exponents.
++                                       */
+ 
+ #ifdef  __cplusplus
+ extern "C" {
+--- ./crypto/dsa/dsatest.c.can-2005-0109~	2003-04-08 08:58:36.000000000 +0300
++++ ./crypto/dsa/dsatest.c	2005-05-24 13:58:34.000000000 +0300
+@@ -194,10 +194,19 @@
+ 		BIO_printf(bio_err,"g value is wrong\n");
+ 		goto end;
+ 		}
++
++	dsa->flags |= DSA_FLAG_NO_EXP_CONSTTIME;
+ 	DSA_generate_key(dsa);
+ 	DSA_sign(0, str1, 20, sig, &siglen, dsa);
+ 	if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1)
+ 		ret=1;
++
++	dsa->flags &= ~DSA_FLAG_NO_EXP_CONSTTIME;
++	DSA_generate_key(dsa);
++	DSA_sign(0, str1, 20, sig, &siglen, dsa);
++	if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1)
++		ret=1;
++
+ end:
+ 	if (!ret)
+ 		ERR_print_errors(bio_err);
+--- ./crypto/dsa/dsa_ossl.c.can-2005-0109~	2004-05-11 15:45:16.000000000 +0300
++++ ./crypto/dsa/dsa_ossl.c	2005-05-24 13:58:34.000000000 +0300
+@@ -197,6 +197,10 @@
+ 	do
+ 		if (!BN_rand_range(&k, dsa->q)) goto err;
+ 	while (BN_is_zero(&k));
++	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
++		{
++		BN_set_flags(&k, BN_FLG_EXP_CONSTTIME);
++		}
+ 
+ 	if ((dsa->method_mont_p == NULL) && (dsa->flags & DSA_FLAG_CACHE_MONT_P))
+ 		{
+--- ./crypto/dsa/dsa_key.c.can-2005-0109~	2004-05-11 15:45:16.000000000 +0300
++++ ./crypto/dsa/dsa_key.c	2005-05-24 13:58:34.000000000 +0300
+@@ -90,8 +90,21 @@
+ 		}
+ 	else
+ 		pub_key=dsa->pub_key;
++	
++	{
++		BIGNUM local_prk;
++		BIGNUM *prk;
+ 
+-	if (!BN_mod_exp(pub_key,dsa->g,priv_key,dsa->p,ctx)) goto err;
++		if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
++			{
++			prk = &local_prk;
++			BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME);
++			}
++		else
++			prk = priv_key;
++
++		if (!BN_mod_exp(pub_key,dsa->g,prk,dsa->p,ctx)) goto err;
++	}
+ 
+ 	dsa->priv_key=priv_key;
+ 	dsa->pub_key=pub_key;
+--- ./crypto/dsa/dsa.h.can-2005-0109~	2004-05-19 17:16:33.000000000 +0300
++++ ./crypto/dsa/dsa.h	2005-05-24 13:58:34.000000000 +0300
+@@ -80,6 +80,13 @@
+ #endif
+ 
+ #define DSA_FLAG_CACHE_MONT_P	0x01
++#define DSA_FLAG_NO_EXP_CONSTTIME       0x02 /* new with 0.9.7h; the built-in DSA
++                                              * implementation now uses constant time
++                                              * modular exponentiation for secret exponents
++                                              * by default. This flag causes the
++                                              * faster variable sliding window method to
++                                              * be used for all exponents.
++                                              */
+ 
+ #if defined(OPENSSL_FIPS)
+ #define FIPS_DSA_SIZE_T	int
+--- ./crypto/rsa/rsa.h.can-2005-0109~	2004-05-19 17:16:32.000000000 +0300
++++ ./crypto/rsa/rsa.h	2005-05-24 13:58:34.000000000 +0300
+@@ -157,28 +157,35 @@
+ #define RSA_3	0x3L
+ #define RSA_F4	0x10001L
+ 
+-#define RSA_METHOD_FLAG_NO_CHECK	0x01 /* don't check pub/private match */
++#define RSA_METHOD_FLAG_NO_CHECK	0x0001 /* don't check pub/private match */
+ 
+-#define RSA_FLAG_CACHE_PUBLIC		0x02
+-#define RSA_FLAG_CACHE_PRIVATE		0x04
+-#define RSA_FLAG_BLINDING		0x08
+-#define RSA_FLAG_THREAD_SAFE		0x10
++#define RSA_FLAG_CACHE_PUBLIC		0x0002
++#define RSA_FLAG_CACHE_PRIVATE		0x0004
++#define RSA_FLAG_BLINDING		0x0008
++#define RSA_FLAG_THREAD_SAFE		0x0010
+ /* This flag means the private key operations will be handled by rsa_mod_exp
+  * and that they do not depend on the private key components being present:
+  * for example a key stored in external hardware. Without this flag bn_mod_exp
+  * gets called when private key components are absent.
+  */
+-#define RSA_FLAG_EXT_PKEY		0x20
++#define RSA_FLAG_EXT_PKEY		0x0020
+ 
+ /* This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify functions.
+  */
+-#define RSA_FLAG_SIGN_VER		0x40
++#define RSA_FLAG_SIGN_VER		0x0040
+ 
+-#define RSA_FLAG_NO_BLINDING		0x80 /* new with 0.9.6j and 0.9.7b; the built-in
+-                                              * RSA implementation now uses blinding by
+-                                              * default (ignoring RSA_FLAG_BLINDING),
+-                                              * but other engines might not need it
+-                                              */
++#define RSA_FLAG_NO_BLINDING		0x0080 /* new with 0.9.6j and 0.9.7b; the built-in
++                                                * RSA implementation now uses blinding by
++                                                * default (ignoring RSA_FLAG_BLINDING),
++                                                * but other engines might not need it
++                                                */
++#define RSA_FLAG_NO_EXP_CONSTTIME	0x0100 /* new with 0.9.7h; the built-in RSA
++                                                * implementation now uses constant time
++                                                * modular exponentiation for secret exponents
++                                                * by default. This flag causes the
++                                                * faster variable sliding window method to
++                                                * be used for all exponents.
++                                                */
+ 
+ #define RSA_PKCS1_PADDING	1
+ #define RSA_SSLV23_PADDING	2
+--- ./crypto/rsa/rsa_eay.c.can-2005-0109~	2004-05-11 15:45:46.000000000 +0300
++++ ./crypto/rsa/rsa_eay.c	2005-05-24 13:58:34.000000000 +0300
+@@ -55,6 +55,59 @@
+  * copied and put under another distribution licence
+  * [including the GNU Public Licence.]
+  */
++/* ====================================================================
++ * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. All advertising materials mentioning features or use of this
++ *    software must display the following acknowledgment:
++ *    "This product includes software developed by the OpenSSL Project
++ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
++ *
++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For written permission, please contact
++ *    openssl-core at openssl.org.
++ *
++ * 5. Products derived from this software may not be called "OpenSSL"
++ *    nor may "OpenSSL" appear in their names without prior written
++ *    permission of the OpenSSL Project.
++ *
++ * 6. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by the OpenSSL Project
++ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++ * OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ====================================================================
++ *
++ * This product includes cryptographic software written by Eric Young
++ * (eay at cryptsoft.com).  This product includes software written by Tim
++ * Hudson (tjh at cryptsoft.com).
++ *
++ */
+ 
+ #include <stdio.h>
+ #include "cryptlib.h"
+@@ -331,10 +384,22 @@
+ 		(rsa->dmp1 != NULL) &&
+ 		(rsa->dmq1 != NULL) &&
+ 		(rsa->iqmp != NULL)) )
+-		{ if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
++		{ 
++		if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err;
++		}
+ 	else
+ 		{
+-		if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL)) goto err;
++		BIGNUM local_d;
++		BIGNUM *d = NULL;
++		
++		if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
++			{
++			d = &local_d;
++			BN_with_flags(d, rsa->d, BN_FLG_EXP_CONSTTIME);
++			}
++		else
++			d = rsa->d;
++		if (!rsa->meth->bn_mod_exp(&ret,&f,d,rsa->n,ctx,NULL)) goto err;
+ 		}
+ 
+ 	if (blinding)
+@@ -444,10 +509,22 @@
+ 		(rsa->dmp1 != NULL) &&
+ 		(rsa->dmq1 != NULL) &&
+ 		(rsa->iqmp != NULL)) )
+-		{ if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
++		{
++		if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err;
++		}
+ 	else
+ 		{
+-		if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL))
++		BIGNUM local_d;
++		BIGNUM *d = NULL;
++		
++		if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
++			{
++			d = &local_d;
++			BN_with_flags(d, rsa->d, BN_FLG_EXP_CONSTTIME);
++			}
++		else
++			d = rsa->d;
++		if (!rsa->meth->bn_mod_exp(&ret,&f,d,rsa->n,ctx,NULL))
+ 			goto err;
+ 		}
+ 
+@@ -594,6 +671,8 @@
+ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+ 	{
+ 	BIGNUM r1,m1,vrfy;
++	BIGNUM local_dmp1, local_dmq1;
++	BIGNUM *dmp1, *dmq1;
+ 	int ret=0;
+ 	BN_CTX *ctx;
+ 
+@@ -654,11 +733,25 @@
+ 		}
+ 		
+ 	if (!BN_mod(&r1,I,rsa->q,ctx)) goto err;
+-	if (!rsa->meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx,
++	if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
++		{
++		dmq1 = &local_dmq1;
++		BN_with_flags(dmq1, rsa->dmq1, BN_FLG_EXP_CONSTTIME);
++		}
++	else
++		dmq1 = rsa->dmq1;
++	if (!rsa->meth->bn_mod_exp(&m1,&r1,dmq1,rsa->q,ctx,
+ 		rsa->_method_mod_q)) goto err;
+ 
+ 	if (!BN_mod(&r1,I,rsa->p,ctx)) goto err;
+-	if (!rsa->meth->bn_mod_exp(r0,&r1,rsa->dmp1,rsa->p,ctx,
++	if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
++		{
++		dmp1 = &local_dmp1;
++		BN_with_flags(dmp1, rsa->dmp1, BN_FLG_EXP_CONSTTIME);
++		}
++	else
++		dmp1 = rsa->dmp1;
++	if (!rsa->meth->bn_mod_exp(r0,&r1,dmp1,rsa->p,ctx,
+ 		rsa->_method_mod_p)) goto err;
+ 
+ 	if (!BN_sub(r0,r0,&m1)) goto err;
+@@ -693,10 +786,23 @@
+ 		if (vrfy.neg)
+ 			if (!BN_add(&vrfy, &vrfy, rsa->n)) goto err;
+ 		if (!BN_is_zero(&vrfy))
++			{
+ 			/* 'I' and 'vrfy' aren't congruent mod n. Don't leak
+ 			 * miscalculated CRT output, just do a raw (slower)
+ 			 * mod_exp and return that instead. */
+-			if (!rsa->meth->bn_mod_exp(r0,I,rsa->d,rsa->n,ctx,NULL)) goto err;
++
++			BIGNUM local_d;
++			BIGNUM *d = NULL;
++		
++			if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
++				{
++				d = &local_d;
++				BN_with_flags(d, rsa->d, BN_FLG_EXP_CONSTTIME);
++				}
++			else
++				d = rsa->d;
++			if (!rsa->meth->bn_mod_exp(r0,I,d,rsa->n,ctx,NULL)) goto err;
++			}
+ 		}
+ 	ret=1;
+ err:
+--- ./crypto/rsa/rsa_test.c.can-2005-0109~	2003-04-08 08:58:33.000000000 +0300
++++ ./crypto/rsa/rsa_test.c	2005-05-24 13:58:34.000000000 +0300
+@@ -227,10 +227,10 @@
+ 
+     plen = sizeof(ptext_ex) - 1;
+ 
+-    for (v = 0; v < 3; v++)
++    for (v = 0; v < 6; v++)
+ 	{
+ 	key = RSA_new();
+-	switch (v) {
++	switch (v%3) {
+     case 0:
+ 	clen = key1(key, ctext_ex);
+ 	break;
+@@ -241,6 +241,7 @@
+ 	clen = key3(key, ctext_ex);
+ 	break;
+ 	}
++	if (v/3 > 1) key->flags |= RSA_FLAG_NO_EXP_CONSTTIME;
+ 
+ 	num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
+ 				 RSA_PKCS1_PADDING);

Modified: tinysofa/releases/classic/2.0/openssl/current/specs/openssl.spec
===================================================================
--- tinysofa/releases/classic/2.0/openssl/current/specs/openssl.spec	2005-05-24 05:10:48 UTC (rev 6369)
+++ tinysofa/releases/classic/2.0/openssl/current/specs/openssl.spec	2005-05-24 11:07:25 UTC (rev 6370)
@@ -2,7 +2,7 @@
 Name: openssl
 %define majorver 0.9.7
 Version: %{majorver}e
-Release: 3jh
+Release: 4jh
 License: BSD-like
 Group: main
 %define m2crypto_version 0.13.1
@@ -19,6 +19,7 @@
 Patch4: openssl-0.9.7-include.patch
 Patch5: openssl-0.9.7c-CAN-2004-0079.patch
 Patch6: openssl-0.9.7e-Configure.patch
+Patch7: openssl-0.9.7e-can-2005-0109.patch
 Provides: SSL libssl.so libssl.so.0 libcrypto.so.0
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -71,7 +72,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1 -b .Configure
+%patch6 -p1 -b .Configure~
+%patch7 -p1 -b .can-2005-0109~
 
 perl util/perlpath.pl %{_bindir}
 
@@ -246,6 +248,9 @@
 
 
 %changelog
+* Tue May 24 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.9.7e-4jh
+- add openssl-0.9.7e-can-2005-0109.patch
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 0.9.7e-2ts
 - current (0.9.7e-2jh) integrated as 0.9.7e-2ts for release 1.1-U3
 



From svn at tinysofa.org  Tue May 24 18:16:00 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 24 May 2005 14:16:00 -0400 (EDT)
Subject: [tinysofa-svn] r6371 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050524181600.D8400344CBE@minbar.tinysofa.org>

Author: jh
Date: 2005-05-24 14:15:38 -0400 (Tue, 24 May 2005)
New Revision: 6371

Removed:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- bump up release
- add some mm patches


Deleted: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch	2005-05-24 11:07:25 UTC (rev 6370)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-elf-coredump.patch	2005-05-24 18:15:38 UTC (rev 6371)
@@ -1,11 +0,0 @@
---- ./fs/binfmt_elf.c.orig	2005-05-11 21:02:15.000000000 +0300
-+++ ./fs/binfmt_elf.c	2005-05-11 21:06:20.000000000 +0300
-@@ -1366,7 +1366,7 @@
- static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
- 		       struct mm_struct *mm)
- {
--	int i, len;
-+	unsigned int i, len;
- 	
- 	/* first copy the parameters from user space */
- 	memset(psinfo, 0, sizeof(struct elf_prpsinfo));

Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-05-24 11:07:25 UTC (rev 6370)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-05-24 18:15:38 UTC (rev 6371)
@@ -393,3 +393,171 @@
  }
 _
 
+
+From: "Andi Kleen" <ak at suse.de>
+
+The PTEs can point to ioremap mappings too, and these are often outside
+mem_map.  The NUMA hash page lookup functions cannot handle out of bounds
+accesses properly.
+
+Signed-off-by: Andi Kleen <ak at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ arch/x86_64/mm/fault.c |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff -puN arch/x86_64/mm/fault.c~x86_64-when-checking-vmalloc-mappings-dont-use arch/x86_64/mm/fault.c
+--- 25/arch/x86_64/mm/fault.c~x86_64-when-checking-vmalloc-mappings-dont-use	2005-05-13 22:54:58.000000000 -0700
++++ 25-akpm/arch/x86_64/mm/fault.c	2005-05-13 22:54:58.000000000 -0700
+@@ -234,6 +234,8 @@ static noinline void pgtable_bad(unsigne
+ 
+ /*
+  * Handle a fault on the vmalloc or module mapping area
++ *
++ * This assumes no large pages in there.
+  */
+ static int vmalloc_fault(unsigned long address)
+ {
+@@ -272,7 +274,10 @@ static int vmalloc_fault(unsigned long a
+ 	if (!pte_present(*pte_ref))
+ 		return -1;
+ 	pte = pte_offset_kernel(pmd, address);
+-	if (!pte_present(*pte) || pte_page(*pte) != pte_page(*pte_ref))
++	/* Don't use pte_page here, because the mappings can point
++	   outside mem_map, and the NUMA hash lookup cannot handle
++	   that. */
++	if (!pte_present(*pte) || pte_pfn(*pte) != pte_pfn(*pte_ref))
+ 		BUG();
+ 	__flush_tlb_all();
+ 	return 0;
+@@ -346,7 +351,9 @@ asmlinkage void do_page_fault(struct pt_
+ 	 * protection error (error_code & 1) == 0.
+ 	 */
+ 	if (unlikely(address >= TASK_SIZE)) {
+-		if (!(error_code & 5)) {
++		if (!(error_code & 5) &&
++		      ((address >= VMALLOC_START && address < VMALLOC_END) ||
++		       (address >= MODULES_VADDR && address < MODULES_END))) {
+ 			if (vmalloc_fault(address) < 0)
+ 				goto bad_area_nosemaphore;
+ 			return;
+_
+
+From: "Andi Kleen" <ak at suse.de>
+
+Allowed user programs to set a non canonical segment base, which would cause
+oopses in the kernel later.
+
+Credit-to: Alexander Nyberg <alexn at dsv.su.se>
+
+ For identifying and reporting this bug.
+
+Signed-off-by: Andi Kleen <ak at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ arch/x86_64/kernel/ptrace.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff -puN arch/x86_64/kernel/ptrace.c~x86_64-fix-canonical-checking-for-segment-registers-in arch/x86_64/kernel/ptrace.c
+--- 25/arch/x86_64/kernel/ptrace.c~x86_64-fix-canonical-checking-for-segment-registers-in	2005-05-13 22:54:55.000000000 -0700
++++ 25-akpm/arch/x86_64/kernel/ptrace.c	2005-05-13 22:54:55.000000000 -0700
+@@ -257,13 +257,13 @@ static int putreg(struct task_struct *ch
+ 			value &= 0xffff;
+ 			return 0;
+ 		case offsetof(struct user_regs_struct,fs_base):
+-			if (!((value >> 48) == 0 || (value >> 48) == 0xffff))
+-				return -EIO; 
++			if (value >= TASK_SIZE)
++				return -EIO;
+ 			child->thread.fs = value;
+ 			return 0;
+ 		case offsetof(struct user_regs_struct,gs_base):
+-			if (!((value >> 48) == 0 || (value >> 48) == 0xffff))
+-				return -EIO; 
++			if (value >= TASK_SIZE)
++				return -EIO;
+ 			child->thread.gs = value;
+ 			return 0;
+ 		case offsetof(struct user_regs_struct, eflags):
+_
+
+From: "Andi Kleen" <ak at suse.de>
+
+It could be in a memory hole not mapped in mem_map and that causes the hash
+lookup to go off to nirvana.
+
+Signed-off-by: Andi Kleen <ak at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ arch/x86_64/mm/ioremap.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+--- 25/arch/x86_64/mm/ioremap.c~
++++ 25-akpm/arch/x86_64/mm/ioremap.c
+@@ -266,7 +266,7 @@
+ 	if ((p->flags >> 20) &&
+ 		p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) {
+ 		/* p->size includes the guard page, but cpa doesn't like that */
+-		change_page_attr(virt_to_page(__va(p->phys_addr)),
++		change_page_attr_addr((unsigned long)__va(p->phys_addr),
+ 				 (p->size - PAGE_SIZE) >> PAGE_SHIFT,
+ 				 PAGE_KERNEL); 				 
+ 		global_flush_tlb();
+
+From: "Andi Kleen" <ak at suse.de>
+
+This works around a bug in the AMD K8 CPUs.
+
+Signed-off-by: Andi Kleen <ak at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ include/asm-x86_64/processor.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff -puN include/asm-x86_64/processor.h~x86_64-add-a-guard-page-at-the-end-of-the-47bit-address include/asm-x86_64/processor.h
+--- 25/include/asm-x86_64/processor.h~x86_64-add-a-guard-page-at-the-end-of-the-47bit-address	2005-05-13 22:54:35.000000000 -0700
++++ 25-akpm/include/asm-x86_64/processor.h	2005-05-13 22:54:35.000000000 -0700
+@@ -160,9 +160,9 @@
+ 
+ 
+ /*
+- * User space process size. 47bits.
++ * User space process size. 47bits minus one guard page.
+  */
+-#define TASK_SIZE_64	(0x800000000000)
++#define TASK_SIZE_64	(0x800000000000UL - 4096)
+ 
+ #define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
+ 
+
+From: "Andi Kleen" <ak at suse.de>
+
+This works around an AMD Erratum.
+
+Signed-off-by: Andi Kleen <ak at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ arch/x86_64/kernel/ptrace.c |    5 +++++
+ 1 files changed, 5 insertions(+)
+
+diff -puN arch/x86_64/kernel/ptrace.c~x86_64-check-if-ptrace-rip-is-canonical arch/x86_64/kernel/ptrace.c
+--- 25/arch/x86_64/kernel/ptrace.c~x86_64-check-if-ptrace-rip-is-canonical	2005-05-13 22:54:54.000000000 -0700
++++ 25-akpm/arch/x86_64/kernel/ptrace.c	2005-05-13 22:54:54.000000000 -0700
+@@ -277,6 +277,11 @@ static int putreg(struct task_struct *ch
+ 				return -EIO;
+ 			value &= 0xffff;
+ 			break;
++		case offsetof(struct user_regs_struct, rip):
++			/* Check if the new RIP address is canonical */
++			if (value >= TASK_SIZE)
++				return -EIO;
++			break;
+ 	}
+ 	put_stack_long(child, regno - sizeof(struct pt_regs), value);
+ 	return 0;
+_

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-24 11:07:25 UTC (rev 6370)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-24 18:15:38 UTC (rev 6371)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 14jh
+Release: 15jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}



From svn at tinysofa.org  Wed May 25 05:40:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 25 May 2005 01:40:44 -0400 (EDT)
Subject: [tinysofa-svn] r6372 -
	tinysofa/releases/classic/2.0/module-init-tools/current/specs
Message-ID: <20050525054044.48173344B69@minbar.tinysofa.org>

Author: jh
Date: 2005-05-25 01:40:37 -0400 (Wed, 25 May 2005)
New Revision: 6372

Modified:
   tinysofa/releases/classic/2.0/module-init-tools/current/specs/module-init-tools.spec
Log:
- don't install module removal script for cron

Modified: tinysofa/releases/classic/2.0/module-init-tools/current/specs/module-init-tools.spec
===================================================================
--- tinysofa/releases/classic/2.0/module-init-tools/current/specs/module-init-tools.spec	2005-05-24 18:15:38 UTC (rev 6371)
+++ tinysofa/releases/classic/2.0/module-init-tools/current/specs/module-init-tools.spec	2005-05-25 05:40:37 UTC (rev 6372)
@@ -1,3 +1,4 @@
+%define with_cron_rmmod	0
 %define _sbindir	/sbin
 %define _bindir		/sbin
 Summary: Kernel module management utilities.
@@ -3,5 +4,5 @@
 Name: module-init-tools
 Version: 3.1
-Release: 1jh
+Release: 2jh
 License: GPL
 Group: main
@@ -13,7 +14,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 PreReq: %{__chmod}
+%if %{with_cron_rmmod}
 Requires: crond
+%endif
 
 %description
 The module-init-tools package includes programs for managing automatic
@@ -40,7 +43,9 @@
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.conf.dist
 touch %{buildroot}%{_sysconfdir}/modprobe.conf
 
+%if %{with_cron_rmmod}
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.hourly/kmod
+%endif
 
 
 %clean
@@ -60,11 +65,16 @@
 %{_sysconfdir}/modprobe.conf.dist
 /sbin/*
 %{_mandir}/man?/*
+%if %{with_cron_rmmod}
 %{_sysconfdir}/cron.hourly/kmod
+%endif
 %ghost %{_sysconfdir}/modprobe.conf
 
 
 %changelog
+* Wed May 25 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.1-2jh
+- don't install module removal script for cron
+
 * Sun Jan 16 2005 Jaakko Heinonen <jh at tinysofa dot org> 3.1-1jh
 - adapt for 1.2
 - update to 3.1



From svn at tinysofa.org  Wed May 25 16:01:33 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 25 May 2005 12:01:33 -0400 (EDT)
Subject: [tinysofa-svn] r6373 - in contrib/classic/2.0: . libmng
	libmng/current libmng/current/sources libmng/current/specs
Message-ID: <20050525160133.D8997344CD8@minbar.tinysofa.org>

Author: gda
Date: 2005-05-25 12:01:10 -0400 (Wed, 25 May 2005)
New Revision: 6373

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

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


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

Added: contrib/classic/2.0/libmng/current/specs/libmng.spec
===================================================================
--- contrib/classic/2.0/libmng/current/specs/libmng.spec	2005-05-25 05:40:37 UTC (rev 6372)
+++ contrib/classic/2.0/libmng/current/specs/libmng.spec	2005-05-25 16:01:10 UTC (rev 6373)
@@ -0,0 +1,161 @@
+Name: libmng
+Version: 1.0.9
+Release: 1gd
+URL: http://www.libmng.com/
+Summary: A library which supports MNG graphics.
+License: BSD-like
+Source: http://osdn.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Group: contrib
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildPrereq: gcc glibc-devel zlib-devel libjpeg-devel libtool
+
+%package devel
+Summary: Development files for the LibMNG library.
+Group: contrib
+Requires: %{name} = %{version}
+
+%package static
+Summary: A statically linked version of the LibMNG library.
+Group: contrib
+
+%description
+LibMNG is a library for accessing graphics in MNG (Multi-image Network
+Graphics) and JNG (JPEG Network Graphics) formats.  MNG graphics are
+basically animated PNGs.  JNG graphics are basically JPEG streams
+integrated into a PNG chunk.
+
+%description devel
+LibMNG is a library for accessing MNG and JNG format graphics.  The
+libmng-devel package contains files needed for developing or compiling
+applications which use MNG graphics.
+
+%description static
+LibMNG is a library for accessing MNG and JNG format graphics.  The
+libmng-static package contains a statically linked version of the
+LibMNG library, which you need if you want to develop or compile
+applications using MNG graphics without depending upon LibMNG being
+installed on the user's system.
+
+%prep
+%setup -q
+
+%build
+cat unmaintained/autogen.sh | tr -d \\r > autogen.sh
+chmod 755 autogen.sh
+[ ! -x ./configure ] && ./autogen.sh --help # generate, but don't run
+%configure --enable-shared --enable-static --with-zlib --with-jpeg \
+	--with-gnu-ld
+%make
+
+%install
+%makeinstall
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+%clean_buildroot
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/*.so
+%{_includedir}/*
+%{_mandir}/man3
+%{_mandir}/man5
+
+%files static
+%defattr(-,root,root)
+%{_libdir}/*.a
+
+%changelog
+* Wed May 25 2005 Gerald Dachs <gda at tinysofa dot org> 1.0.9-1gd
+- adopted to tinysofa contrib
+
+* Wed Mar  2 2005 Matthias Clasen <mclasen at redhat.com> 1.0.9-1
+- Update to 1.0.9
+- Work around autogen.sh brokenness
+
+* Fri Feb 11 2005 Matthias Clasen <mclasen at redhat.com> 1.0.8-2
+- Remove .la files (#145970)
+- Remove some unneeded Requires
+
+* Tue Oct 12 2004 Matthias Clasen <mclasen at redhat.com> 1.0.8-1
+- Upgrade to 1.0.8
+
+* Mon Jul 19 2004 Matthias Clasen <mclasen at redhat.com> 1.0.7-4
+- Add missing Requires
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed May 19 2004 Matthias Clasen <mclasen at redhat.com> 1.0.7-1
+- Upgrade to 1.0.7
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Fri Dec 13 2002 Elliot Lee <sopwith at redhat.com> 1.0.4-2
+- Rebuild, _smp_mflags
+
+* Mon Jun 24 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.4-1
+- 1.0.4
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu Apr 25 2002 Than Ngo <than at redhat.com> 1.0.3-3
+- rebuild in new enviroment
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Sep 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.3-1
+- 1.0.3
+
+* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.2-1
+- Update to 1.0.2 (bugfix release - fixes a memory leak and file corruption)
+
+* Wed Jun 20 2001 Than Ngo <rtthan at redhat.com> 1.0.1-2
+- requires %%{name} = %%{version}
+
+* Thu May  3 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.0.1-1
+- 1.0.1
+
+* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- remove bogus symlink trick
+
+* Mon Feb 26 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update to 1.0.0 to make Qt 2.3.0 happy
+
+* Sat Jan 19 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.9.4, fixes MNG 1.0 spec compliance
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.9.3
+- Add ldconfig calls in %%post and %%postun
+
+* Tue Dec 05 2000 Florian La Roche <Florian.LaRoche at redhat.de>
+- added a clean section to the spec file
+
+* Tue Sep 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- initial rpm
+



From svn at tinysofa.org  Thu May 26 14:06:27 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 26 May 2005 10:06:27 -0400 (EDT)
Subject: [tinysofa-svn] r6375 -
	tinysofa/releases/classic/2.0/bzip2/current/specs
Message-ID: <20050526140627.6BF96344BA1@minbar.tinysofa.org>

Author: jh
Date: 2005-05-26 10:06:21 -0400 (Thu, 26 May 2005)
New Revision: 6375

Modified:
   tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec
Log:
- apply saneso patch

Modified: tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec
===================================================================
--- tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec	2005-05-26 13:02:51 UTC (rev 6374)
+++ tinysofa/releases/classic/2.0/bzip2/current/specs/bzip2.spec	2005-05-26 14:06:21 UTC (rev 6375)
@@ -1,11 +1,12 @@
 Summary: A file compression utility.
 Name: bzip2
 Version: 1.0.3
-Release: 1jh
+Release: 2jh
 License: BSD
 Group: main
 URL: http://sources.redhat.com/bzip2/
 Source: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{version}.tar.gz
+Patch0: bzip2-1.0.3-saneso.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: bzip2-libs = %{version}-%{release}
 
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .saneso~
 
 
 %build
@@ -101,6 +103,9 @@
 
 
 %changelog
+* Thu May 26 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.0.3-2jh
+- apply saneso patch
+
 * Mon May 23 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.0.3-1jh
 - 1.0.3, fixes a DoS vulnerability
 



From svn at tinysofa.org  Thu May 26 14:20:38 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 26 May 2005 10:20:38 -0400 (EDT)
Subject: [tinysofa-svn] r6376 -
	tinysofa/releases/classic/1.1/kernel/current/specs
Message-ID: <20050526142038.37906344BA5@minbar.tinysofa.org>

Author: jh
Date: 2005-05-26 10:20:31 -0400 (Thu, 26 May 2005)
New Revision: 6376

Modified:
   tinysofa/releases/classic/1.1/kernel/current/specs/kernel.spec
Log:
- apply patch1141


Modified: tinysofa/releases/classic/1.1/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/1.1/kernel/current/specs/kernel.spec	2005-05-26 14:06:21 UTC (rev 6375)
+++ tinysofa/releases/classic/1.1/kernel/current/specs/kernel.spec	2005-05-26 14:20:31 UTC (rev 6376)
@@ -1078,6 +1078,9 @@
 # statm
 %patch1140 -p1
 
+# pte_clear() races
+%patch1141 -p1
+
 # hugetlbfs (x86 and amd64, dummy functions for ppc64 and s390)
 %patch1150 -p1
 # hugetlbfs for ia64



From svn at tinysofa.org  Thu May 26 14:29:49 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 26 May 2005 10:29:49 -0400 (EDT)
Subject: [tinysofa-svn] r6377 -
	tinysofa/releases/classic/1.1/kernel/current/sources
Message-ID: <20050526142949.060AC344CD1@minbar.tinysofa.org>

Author: jh
Date: 2005-05-26 10:29:41 -0400 (Thu, 26 May 2005)
New Revision: 6377

Modified:
   tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config
   tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config
   tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586.config
Log:
- update configs


Modified: tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config
===================================================================
--- tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config	2005-05-26 14:20:31 UTC (rev 6376)
+++ tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config	2005-05-26 14:29:41 UTC (rev 6377)
@@ -338,6 +338,7 @@
 # SCSI low-level drivers
 #
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_BLK_DEV_3W_9XXX_RAID=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_ACARD=m
 # CONFIG_SCSI_AHA152X is not set
@@ -368,6 +369,7 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
+CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
 CONFIG_SCSI_SATA_NV=m
@@ -375,6 +377,7 @@
 CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
 CONFIG_SCSI_BUSLOGIC=m
@@ -520,6 +523,7 @@
 # CONFIG_FEALNX is not set
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
+# CONFIG_FORCEDETH is not set
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 CONFIG_8139CP=m
@@ -556,7 +560,6 @@
 CONFIG_TIGON3=m
 # CONFIG_FDDI is not set
 # CONFIG_NETCONSOLE is not set
-# CONFIG_FORCEDETH is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 # CONFIG_PPP is not set
@@ -712,7 +715,6 @@
 # CONFIG_QUOTA is not set
 # CONFIG_QFMT_V1 is not set
 # CONFIG_QFMT_V2 is not set
-# CONFIG_EPOLL is not set
 # CONFIG_QIFACE_COMPAT is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set

Modified: tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config
===================================================================
--- tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config	2005-05-26 14:20:31 UTC (rev 6376)
+++ tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config	2005-05-26 14:29:41 UTC (rev 6377)
@@ -493,6 +493,7 @@
 # SCSI low-level drivers
 #
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_BLK_DEV_3W_9XXX_RAID=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_ACARD=m
 # CONFIG_SCSI_AHA152X is not set
@@ -523,6 +524,7 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
+CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
 CONFIG_SCSI_SATA_NV=m
@@ -530,6 +532,7 @@
 CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
 CONFIG_SCSI_BUSLOGIC=m
@@ -698,6 +701,7 @@
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
+# CONFIG_FORCEDETH is not set
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 CONFIG_8139CP=m
@@ -734,7 +738,6 @@
 CONFIG_TIGON3=m
 # CONFIG_FDDI is not set
 CONFIG_NETCONSOLE=m
-# CONFIG_FORCEDETH is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
@@ -995,7 +998,6 @@
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m

Modified: tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586.config
===================================================================
--- tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586.config	2005-05-26 14:20:31 UTC (rev 6376)
+++ tinysofa/releases/classic/1.1/kernel/current/sources/kernel-2.4.21-i586.config	2005-05-26 14:29:41 UTC (rev 6377)
@@ -481,6 +481,7 @@
 # SCSI low-level drivers
 #
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_BLK_DEV_3W_9XXX_RAID=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_ACARD=m
 # CONFIG_SCSI_AHA152X is not set
@@ -511,6 +512,7 @@
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
+CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
 CONFIG_SCSI_ATA_PIIX=m
 CONFIG_SCSI_SATA_NV=m
@@ -518,6 +520,7 @@
 CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
+CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
 CONFIG_SCSI_BUSLOGIC=m
@@ -686,6 +689,7 @@
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
+# CONFIG_FORCEDETH is not set
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 CONFIG_8139CP=m
@@ -722,7 +726,6 @@
 CONFIG_TIGON3=m
 # CONFIG_FDDI is not set
 CONFIG_NETCONSOLE=m
-# CONFIG_FORCEDETH is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
@@ -1088,7 +1091,6 @@
 CONFIG_QUOTA=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
-# CONFIG_EPOLL is not set
 # CONFIG_QIFACE_COMPAT is not set
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m



From svn at tinysofa.org  Fri May 27 15:02:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 27 May 2005 11:02:14 -0400 (EDT)
Subject: [tinysofa-svn] r6378 -
	tinysofa/releases/classic/2.0/kernel-utils/current/specs
Message-ID: <20050527150214.DB0CE344BDE@minbar.tinysofa.org>

Author: jh
Date: 2005-05-27 11:02:08 -0400 (Fri, 27 May 2005)
New Revision: 6378

Modified:
   tinysofa/releases/classic/2.0/kernel-utils/current/specs/kernel-utils.spec
Log:
- bump up the version number to make sure it's later than kernel-utils
- shipped with tinysofa 1.0


Modified: tinysofa/releases/classic/2.0/kernel-utils/current/specs/kernel-utils.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel-utils/current/specs/kernel-utils.spec	2005-05-26 14:29:41 UTC (rev 6377)
+++ tinysofa/releases/classic/2.0/kernel-utils/current/specs/kernel-utils.spec	2005-05-27 15:02:08 UTC (rev 6378)
@@ -1,7 +1,7 @@
 Summary:        Kernel and Hardware related utilities
 Name:           kernel-utils
-Version:        2.4
-Release: 1gd
+Version:        2.6
+Release: 1jh
 Group: main
 License:        GPL/OSL
 Source0:        microcode_ctl-1.06.tar.gz
@@ -199,6 +199,10 @@
 
 
 %changelog
+* Fri May 27 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.6-1jh
+- bump up the version number to make sure it's later than kernel-utils
+- shipped with tinysofa 1.0
+
 * Mon Jan 24 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - adapt for 1.2
 - add try-restart targets



From svn at tinysofa.org  Fri May 27 19:21:47 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 27 May 2005 15:21:47 -0400 (EDT)
Subject: [tinysofa-svn] r6379 - in
	tinysofa/releases/classic/2.0/anaconda/current: sources specs
Message-ID: <20050527192147.5F166344F88@minbar.tinysofa.org>

Author: jh
Date: 2005-05-27 15:21:34 -0400 (Fri, 27 May 2005)
New Revision: 6379

Added:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-initramfs.patch
Modified:
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch
   tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch
   tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
Log:
- disable new mdadm code for now
- use initramfs instead of old style initrd


Added: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-initramfs.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-initramfs.patch	2005-05-27 15:02:08 UTC (rev 6378)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-initramfs.patch	2005-05-27 19:21:34 UTC (rev 6379)
@@ -0,0 +1,77 @@
+--- ./scripts/mk-images.initramfs~	2005-05-27 20:06:53.000000000 +0300
++++ ./scripts/mk-images	2005-05-27 22:01:18.000000000 +0300
+@@ -409,8 +409,6 @@
+ 
+     MBD_DIR=/tmp/makebootdisk.dir.$$
+     MBD_FSIMAGE=/tmp/makebootdisk.initrdimage.$$
+-    MBD_MNTPOINT=/tmp/makebootdisk.mount.$$
+-    MBD_TMPIMAGE=/tmp/makebootdisk.image.$$
+     MBD_BOOTTREE=/tmp/makebootdisk.tree.$$
+     INITBIN=init
+ 
+@@ -478,7 +476,7 @@
+     done
+ 
+     ln -s /usr/bin/sh $MBD_DIR/sbin/sh
+-    ln -s /sbin/init $MBD_DIR/linuxrc
++    ln -s /sbin/init $MBD_DIR/init
+     ln -s /proc/mounts $MBD_DIR/etc/mtab
+     ln -s sbin $MBD_DIR/bin
+ 
+@@ -537,45 +535,17 @@
+ EOF
+     ln -s fb0 $MBD_DIR/dev/fb
+ 
+-    dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=16000 2>/dev/null
+-    mke2fs -F -q $MBD_DIR/etc/ramfs.img.big
+-    tune2fs -c0 -i0 $MBD_DIR/etc/ramfs.img.big
+-    gzip -9 < $MBD_DIR/etc/ramfs.img.big > $MBD_DIR/etc/ramfs.img
+-    rm -f $MBD_DIR/etc/ramfs.img.big
+-
+ cat > $MBD_DIR/.profile <<EOF
+ PATH=/bin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/mnt/sysimage/sbin:/mnt/sysimage/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin
+ export PATH
+ EOF
+ 
+     rm -f $MBD_FSIMAGE
+-    dd if=/dev/zero of=$MBD_FSIMAGE bs=1k count=$INITRDSIZE 2> /dev/null
+-    /sbin/mke2fs -F -i 1024 -q $MBD_FSIMAGE $INITRDSIZE > /dev/null 2>/dev/null
+-    /sbin/tune2fs -c0 -i0 $MBD_FSIMAGE
+-
+-    rm -rf $MBD_MNTPOINT
+-    mkdir $MBD_MNTPOINT
+-    mount -o loop -t ext2 $MBD_FSIMAGE $MBD_MNTPOINT
+-    (cd $MBD_DIR; find . | cpio --quiet -p $MBD_MNTPOINT)
+-
+-    left=$(df $MBD_MNTPOINT | tail +2)
+-    left=$(echo $left | awk '{print $4'})
+-
+-    umount $MBD_MNTPOINT
+-
+-    mv -f $MBD_FSIMAGE $MBD_FSIMAGE.uncompressed
+-    gzip -9 < $MBD_FSIMAGE.uncompressed > $MBD_FSIMAGE
+-    rm -rf $MBD_FSIMAGE.uncompressed $MBD_DIR
++    (cd $MBD_DIR; find . |cpio --quiet -c -o) |gzip -9 > $MBD_FSIMAGE
+ 
+     size=$(du $MBD_FSIMAGE | awk '{ print $1 }')
+ 
+-    echo "Wrote $MBD_BOOTTREE (${size}k compressed, ${left}k free)"
+-
+-    rm -rf $MBD_TMPIMAGE $MBD_BOOTTREE
+-
+-    if [ -n "$PADSIZE" ]; then
+-	padfile $MBD_FSIMAGE $PADSIZE
+-    fi
++    echo "Wrote $MBD_FSIMAGE (${size}k compressed)"
+ 
+     if [ -n "$EXTRAINITRDPATH" ]; then
+ 	mkdir -p `dirname $EXTRAINITRDPATH`
+@@ -583,7 +553,7 @@
+     fi
+ 
+     if [ -z "$KEEP" ]; then
+-	rm -rf $MBD_TMPIMAGE $MBD_FSIMAGE $MBD_MNTPOINT $MBD_BOOTTREE
++	rm -rf $MBD_FSIMAGE $MBD_BOOTTREE
+     fi
+ }
+ 

Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch	2005-05-27 15:02:08 UTC (rev 6378)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-loader2-kernel26.patch	2005-05-27 19:21:34 UTC (rev 6379)
@@ -450,7 +450,55 @@
  #include <syslog.h>
  #include <unistd.h>
  
-@@ -215,7 +216,7 @@
+@@ -110,47 +111,6 @@
+ /* JKFIXME: bad hack for second stage modules without module-info */
+ struct moduleBallLocation * secondStageModuleLocation;
+ 
+-#if 0
+-#if !defined(__s390__) && !defined(__s390x__)
+-#define RAMDISK_DEVICE "/dev/ram"
+-#else
+-#define RAMDISK_DEVICE "/dev/ram2"
+-#endif
+-
+-
+-int setupRamdisk(void) {
+-    gzFile f;
+-    static int done = 0;
+-
+-    if (done) return 0;
+-
+-    done = 1;
+-
+-    f = gunzip_open("/etc/ramfs.img");
+-    if (f) {
+-        char buf[10240];
+-        int i, j = 0;
+-        int fd;
+-        
+-        fd = open(RAMDISK_DEVICE, O_RDWR);
+-        logMessage("copying file to fd %d", fd);
+-        
+-        while ((i = gunzip_read(f, buf, sizeof(buf))) > 0) {
+-            j += write(fd, buf, i);
+-        }
+-        
+-        logMessage("wrote %d bytes", j);
+-        close(fd);
+-        gunzip_close(f);
+-    }
+-    
+-    if (doPwMount(RAMDISK_DEVICE, "/tmp/ramfs", "ext2", 0, 0, NULL, NULL, 0))
+-        logMessage("failed to mount ramfs image");
+-    
+-    return 0;
+-}
+-#endif
+-
+ void setupRamfs(void) {
+     mkdirChain("/tmp/ramfs");
+     doPwMount("none", "/tmp/ramfs", "ramfs", 0, 0, NULL, NULL, 0);
+@@ -215,7 +175,7 @@
  void initializeConsole(moduleList modLoaded, moduleDeps modDeps,
                         moduleInfoSet modInfo, int flags) {
      if (!FL_NOFB(flags))
@@ -459,7 +507,7 @@
      /* enable UTF-8 console */
      printf("\033%%G");
      fflush(stdout);
-@@ -612,12 +613,12 @@
+@@ -612,12 +572,12 @@
      
      chptr = buf;
      while (*chptr && !total) {
@@ -474,7 +522,7 @@
          while (*chptr && *chptr != '\n') chptr++;
  
          *chptr = '\0';
-@@ -1102,7 +1103,7 @@
+@@ -1102,7 +1062,7 @@
      if (!strcmp(argv[0] + strlen(argv[0]) - 8, "modprobe"))
          return ourInsmodCommand(argc, argv);
      if (!strcmp(argv[0] + strlen(argv[0]) - 5, "rmmod"))
@@ -483,7 +531,7 @@
  
      if (!testing && !access("/var/run/loader.run", R_OK)) {
          printf(_("loader has already been run.  Starting shell."));
-@@ -1297,7 +1298,7 @@
+@@ -1297,7 +1257,7 @@
      /* look for cards which require the agpgart module */
      agpgartInitialize(modLoaded, modDeps, modInfo, flags);
  

Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-05-27 15:02:08 UTC (rev 6378)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-mdadm.patch	2005-05-27 19:21:34 UTC (rev 6379)
@@ -71,25 +71,25 @@
          return []
  
 +    def mdadmLine (self, devPrefix="/dev"):
-+        levels = ["multipath", "hsm", "translucent", "linear", "raid0",
-+                  "raid1", "", "", "raid5", "raid5"]
++        #levels = ["multipath", "hsm", "translucent", "linear", "raid0",
++        #          "raid1", "", "", "raid5", "raid5"]
 +
-+        (dev, devices, level, numActive) = raid.lookup_raid_device (self.device)
++        #(dev, devices, level, numActive) = raid.lookup_raid_device (self.device)
 +
 +        # First loop over all the devices that make up the RAID trying to read
 +        # the superblock off each.  If we read a superblock, return a line that
 +        # can go into the mdadm.conf.  If we fail, fall back to the old method
 +        # of using the super-minor.
-+        for d in devices:
-+            try:
-+                (major, minor, uuid, level, nrDisks, totalDisks, mdMinor) = \
-+                    isys.raidsb(d)
-+                return "ARRAY %s/%s level=%s num-devices=%d uuid=%s\n" \
-+                    %(devPrefix, self.device, levels[level+4], nrDisks, uuid)
-+            except ValueError:
-+               pass
++        #for d in devices:
++        #    try:
++        #        (major, minor, uuid, level, nrDisks, totalDisks, mdMinor) = \
++        #            isys.raidsb(d)
++        #        return "ARRAY %s/%s level=%s num-devices=%d uuid=%s\n" \
++        #            %(devPrefix, self.device, levels[level+4], nrDisks, uuid)
++        #    except ValueError:
++        #       pass
 +
-+        return "ARRAY %s/%s super-minor=%s\n" %(devPrefix, self.device,
++        return "# ARRAY %s/%s super-minor=%s\n" %(devPrefix, self.device,
 +                                                self.minor)
 +
      def raidTab (self, devPrefix='/dev'):

Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-27 15:02:08 UTC (rev 6378)
+++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-27 19:21:34 UTC (rev 6379)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 5jh
+Release: 5.2jh
 License: GPL
 Summary: installation program
 Group: development
@@ -36,6 +36,7 @@
 Patch19: anaconda-9.1-en-only.patch
 Patch20: anaconda-9.1-wcstubs.patch
 Patch21: anaconda-9.1-rpm-platform.patch
+Patch22: anaconda-9.1-initramfs.patch
 # booty patches
 Patch100: booty-0.38-tinysofa.patch
 Patch101: booty-0.38-tinysofa-splash.patch
@@ -102,6 +103,7 @@
 %patch19 -p1 -b .en-only~
 %patch20 -p1 -b .wcstubs~
 %patch21 -p1 -b .rpm-platform~
+%patch22 -p1 -b .initramfs~
 
 # rhpl and booty use originally python 2.3
 # anaconda uses orginally python 2.2



From svn at tinysofa.org  Fri May 27 20:27:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 27 May 2005 16:27:14 -0400 (EDT)
Subject: [tinysofa-svn] r6380 - in
	tinysofa/releases/classic/2.0/anaconda/current: sources specs
Message-ID: <20050527202714.CD037344F64@minbar.tinysofa.org>

Author: jh
Date: 2005-05-27 16:27:05 -0400 (Fri, 27 May 2005)
New Revision: 6380

Added:
   tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-language.patch
Modified:
   tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
Log:
- Remove unused booty support for localized boot messages. It may cause crashes in post install


Added: tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-language.patch
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-language.patch	2005-05-27 19:21:34 UTC (rev 6379)
+++ tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-language.patch	2005-05-27 20:27:05 UTC (rev 6380)
@@ -0,0 +1,21 @@
+--- ./bootloaderInfo.py.orig	2005-05-27 22:56:32.000000000 +0300
++++ ./bootloaderInfo.py	2005-05-27 22:57:05.000000000 +0300
+@@ -912,12 +912,12 @@
+             config.addEntry("password", self.pure, replace = 0)
+         
+ 
+-        import language
+-        for lang in language.expandLangs(langs.getDefault()):
+-            fn = "/boot/message." + lang
+-            if os.access(instRoot + fn, os.R_OK):
+-                message = fn
+-                break
++        #import language
++        #for lang in language.expandLangs(langs.getDefault()):
++        #    fn = "/boot/message." + lang
++        #    if os.access(instRoot + fn, os.R_OK):
++        #        message = fn
++        #        break
+ 
+         if self.serial == 1:
+            # grab the 0-based number of the serial console device

Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec
===================================================================
--- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-27 19:21:34 UTC (rev 6379)
+++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec	2005-05-27 20:27:05 UTC (rev 6380)
@@ -1,7 +1,7 @@
 ExcludeArch: ppc64
 Name: anaconda
 Version: 9.1
-Release: 5.2jh
+Release: 6jh
 License: GPL
 Summary: installation program
 Group: development
@@ -45,6 +45,7 @@
 Patch104: booty-0.40-bootloader.patch
 Patch105: booty-0.40-ide-scsi.patch
 Patch106: booty-0.40-lilo-timeout.patch
+Patch107: booty-0.40-language.patch
 # rhpl patches
 Patch200: rhpl-0.145-tinysofa-keytables.patch
 # common patches
@@ -122,6 +123,7 @@
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
+%patch107 -p1
 popd
 
 pushd rhpl-%{rhpl_version}



From svn at tinysofa.org  Fri May 27 20:55:30 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 27 May 2005 16:55:30 -0400 (EDT)
Subject: [tinysofa-svn] r6381 - in
	tinysofa/releases/classic/2.0/kernel/current: sources specs
Message-ID: <20050527205530.4768857D68A@minbar.tinysofa.org>

Author: jh
Date: 2005-05-27 16:55:18 -0400 (Fri, 27 May 2005)
New Revision: 6381

Added:
   tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.11-mod.patch
Modified:
   tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
   tinysofa/releases/classic/2.0/kernel/current/sources/patch-2.6.11-ac3
   tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
Log:
- 2.6.11.11

Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.11-mod.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.11-mod.patch	2005-05-27 20:27:05 UTC (rev 6380)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.11-mod.patch	2005-05-27 20:55:18 UTC (rev 6381)
@@ -0,0 +1,478 @@
+--- a/arch/ppc64/kernel/pSeries_iommu.c
++++ b/arch/ppc64/kernel/pSeries_iommu.c
+@@ -401,6 +401,8 @@ static void iommu_bus_setup_pSeriesLP(st
+ 	struct device_node *dn, *pdn;
+ 	unsigned int *dma_window = NULL;
+ 
++	DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self);
++
+ 	dn = pci_bus_to_OF_node(bus);
+ 
+ 	/* Find nearest ibm,dma-window, walking up the device tree */
+@@ -455,6 +457,56 @@ static void iommu_dev_setup_pSeries(stru
+ 	}
+ }
+ 
++static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
++{
++	struct device_node *pdn, *dn;
++	struct iommu_table *tbl;
++	int *dma_window = NULL;
++
++	DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, dev->pretty_name);
++
++	/* dev setup for LPAR is a little tricky, since the device tree might
++	 * contain the dma-window properties per-device and not neccesarily
++	 * for the bus. So we need to search upwards in the tree until we
++	 * either hit a dma-window property, OR find a parent with a table
++	 * already allocated.
++	 */
++	dn = pci_device_to_OF_node(dev);
++
++	for (pdn = dn; pdn && !pdn->iommu_table; pdn = pdn->parent) {
++		dma_window = (unsigned int *)get_property(pdn, "ibm,dma-window", NULL);
++		if (dma_window)
++			break;
++	}
++
++	/* Check for parent == NULL so we don't try to setup the empty EADS
++	 * slots on POWER4 machines.
++	 */
++	if (dma_window == NULL || pdn->parent == NULL) {
++		/* Fall back to regular (non-LPAR) dev setup */
++		DBG("No dma window for device, falling back to regular setup\n");
++		iommu_dev_setup_pSeries(dev);
++		return;
++	} else {
++		DBG("Found DMA window, allocating table\n");
++	}
++
++	if (!pdn->iommu_table) {
++		/* iommu_table_setparms_lpar needs bussubno. */
++		pdn->bussubno = pdn->phb->bus->number;
++
++		tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),
++						    GFP_KERNEL);
++
++		iommu_table_setparms_lpar(pdn->phb, pdn, tbl, dma_window);
++
++		pdn->iommu_table = iommu_init_table(tbl);
++	}
++
++	if (pdn != dn)
++		dn->iommu_table = pdn->iommu_table;
++}
++
+ static void iommu_bus_setup_null(struct pci_bus *b) { }
+ static void iommu_dev_setup_null(struct pci_dev *d) { }
+ 
+@@ -479,13 +531,14 @@ void iommu_init_early_pSeries(void)
+ 			ppc_md.tce_free	 = tce_free_pSeriesLP;
+ 		}
+ 		ppc_md.iommu_bus_setup = iommu_bus_setup_pSeriesLP;
++		ppc_md.iommu_dev_setup = iommu_dev_setup_pSeriesLP;
+ 	} else {
+ 		ppc_md.tce_build = tce_build_pSeries;
+ 		ppc_md.tce_free  = tce_free_pSeries;
+ 		ppc_md.iommu_bus_setup = iommu_bus_setup_pSeries;
++		ppc_md.iommu_dev_setup = iommu_dev_setup_pSeries;
+ 	}
+ 
+-	ppc_md.iommu_dev_setup = iommu_dev_setup_pSeries;
+ 
+ 	pci_iommu_init();
+ }
+diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
+--- a/arch/x86_64/kernel/ptrace.c
++++ b/arch/x86_64/kernel/ptrace.c
+@@ -129,13 +129,13 @@ static int putreg(struct task_struct *ch
+ 			value &= 0xffff;
+ 			return 0;
+ 		case offsetof(struct user_regs_struct,fs_base):
+-			if (!((value >> 48) == 0 || (value >> 48) == 0xffff))
+-				return -EIO; 
++			if (value >= TASK_SIZE)
++				return -EIO;
+ 			child->thread.fs = value;
+ 			return 0;
+ 		case offsetof(struct user_regs_struct,gs_base):
+-			if (!((value >> 48) == 0 || (value >> 48) == 0xffff))
+-				return -EIO; 
++			if (value >= TASK_SIZE)
++				return -EIO;
+ 			child->thread.gs = value;
+ 			return 0;
+ 		case offsetof(struct user_regs_struct, eflags):
+@@ -149,6 +149,11 @@ static int putreg(struct task_struct *ch
+ 				return -EIO;
+ 			value &= 0xffff;
+ 			break;
++		case offsetof(struct user_regs_struct, rip):
++			/* Check if the new RIP address is canonical */
++			if (value >= TASK_SIZE)
++				return -EIO;
++			break;
+ 	}
+ 	put_stack_long(child, regno - sizeof(struct pt_regs), value);
+ 	return 0;
+diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
+--- a/arch/x86_64/mm/fault.c
++++ b/arch/x86_64/mm/fault.c
+@@ -236,6 +236,8 @@ static noinline void pgtable_bad(unsigne
+ 
+ /*
+  * Handle a fault on the vmalloc or module mapping area
++ *
++ * This assumes no large pages in there.
+  */
+ static int vmalloc_fault(unsigned long address)
+ {
+@@ -274,7 +276,10 @@ static int vmalloc_fault(unsigned long a
+ 	if (!pte_present(*pte_ref))
+ 		return -1;
+ 	pte = pte_offset_kernel(pmd, address);
+-	if (!pte_present(*pte) || pte_page(*pte) != pte_page(*pte_ref))
++	/* Don't use pte_page here, because the mappings can point
++	   outside mem_map, and the NUMA hash lookup cannot handle
++	   that. */
++	if (!pte_present(*pte) || pte_pfn(*pte) != pte_pfn(*pte_ref))
+ 		BUG();
+ 	__flush_tlb_all();
+ 	return 0;
+@@ -348,7 +353,9 @@ asmlinkage void do_page_fault(struct pt_
+ 	 * protection error (error_code & 1) == 0.
+ 	 */
+ 	if (unlikely(address >= TASK_SIZE)) {
+-		if (!(error_code & 5)) {
++		if (!(error_code & 5) &&
++		      ((address >= VMALLOC_START && address < VMALLOC_END) ||
++		       (address >= MODULES_VADDR && address < MODULES_END))) {
+ 			if (vmalloc_fault(address) < 0)
+ 				goto bad_area_nosemaphore;
+ 			return;
+diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c
+--- a/arch/x86_64/mm/ioremap.c
++++ b/arch/x86_64/mm/ioremap.c
+@@ -266,7 +266,7 @@ void iounmap(volatile void __iomem *addr
+ 	if ((p->flags >> 20) &&
+ 		p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) {
+ 		/* p->size includes the guard page, but cpa doesn't like that */
+-		change_page_attr(virt_to_page(__va(p->phys_addr)),
++		change_page_attr_addr((unsigned long)(__va(p->phys_addr)),
+ 				 (p->size - PAGE_SIZE) >> PAGE_SHIFT,
+ 				 PAGE_KERNEL); 				 
+ 		global_flush_tlb();
+diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
+--- a/drivers/ide/ide-disk.c
++++ b/drivers/ide/ide-disk.c
+@@ -133,6 +133,8 @@ static ide_startstop_t __ide_do_rw_disk(
+ 	if (hwif->no_lba48_dma && lba48 && dma) {
+ 		if (block + rq->nr_sectors > 1ULL << 28)
+ 			dma = 0;
++		else
++			lba48 = 0;
+ 	}
+ 
+ 	if (!dma) {
+@@ -146,7 +148,7 @@ static ide_startstop_t __ide_do_rw_disk(
+ 	/* FIXME: SELECT_MASK(drive, 0) ? */
+ 
+ 	if (drive->select.b.lba) {
+-		if (drive->addressing == 1) {
++		if (lba48) {
+ 			task_ioreg_t tasklets[10];
+ 
+ 			pr_debug("%s: LBA=0x%012llx\n", drive->name, block);
+diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
+--- a/drivers/net/3c59x.c
++++ b/drivers/net/3c59x.c
+@@ -1581,7 +1581,8 @@ vortex_up(struct net_device *dev)
+ 
+ 	if (VORTEX_PCI(vp)) {
+ 		pci_set_power_state(VORTEX_PCI(vp), PCI_D0);	/* Go active */
+-		pci_restore_state(VORTEX_PCI(vp));
++		if (vp->pm_state_valid)
++			pci_restore_state(VORTEX_PCI(vp));
+ 		pci_enable_device(VORTEX_PCI(vp));
+ 	}
+ 
+@@ -2741,6 +2742,7 @@ vortex_down(struct net_device *dev, int 
+ 		outl(0, ioaddr + DownListPtr);
+ 
+ 	if (final_down && VORTEX_PCI(vp)) {
++		vp->pm_state_valid = 1;
+ 		pci_save_state(VORTEX_PCI(vp));
+ 		acpi_set_WOL(dev);
+ 	}
+@@ -3243,9 +3245,10 @@ static void acpi_set_WOL(struct net_devi
+ 		outw(RxEnable, ioaddr + EL3_CMD);
+ 
+ 		pci_enable_wake(VORTEX_PCI(vp), 0, 1);
++
++		/* Change the power state to D3; RxEnable doesn't take effect. */
++		pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
+ 	}
+-	/* Change the power state to D3; RxEnable doesn't take effect. */
+-	pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
+ }
+ 
+ 
+diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
+--- a/drivers/usb/serial/visor.c
++++ b/drivers/usb/serial/visor.c
+@@ -386,6 +386,7 @@ struct visor_private {
+ 	int bytes_in;
+ 	int bytes_out;
+ 	int outstanding_urbs;
++	int throttled;
+ };
+ 
+ /* number of outstanding urbs to prevent userspace DoS from happening */
+@@ -415,6 +416,7 @@ static int visor_open (struct usb_serial
+ 	priv->bytes_in = 0;
+ 	priv->bytes_out = 0;
+ 	priv->outstanding_urbs = 0;
++	priv->throttled = 0;
+ 	spin_unlock_irqrestore(&priv->lock, flags);
+ 
+ 	/*
+@@ -602,6 +604,7 @@ static void visor_read_bulk_callback (st
+ 	struct tty_struct *tty;
+ 	unsigned long flags;
+ 	int i;
++	int throttled;
+ 	int result;
+ 
+ 	dbg("%s - port %d", __FUNCTION__, port->number);
+@@ -627,18 +630,21 @@ static void visor_read_bulk_callback (st
+ 	}
+ 	spin_lock_irqsave(&priv->lock, flags);
+ 	priv->bytes_in += urb->actual_length;
++	throttled = priv->throttled;
+ 	spin_unlock_irqrestore(&priv->lock, flags);
+ 
+-	/* Continue trying to always read  */
+-	usb_fill_bulk_urb (port->read_urb, port->serial->dev,
+-			   usb_rcvbulkpipe(port->serial->dev,
+-					   port->bulk_in_endpointAddress),
+-			   port->read_urb->transfer_buffer,
+-			   port->read_urb->transfer_buffer_length,
+-			   visor_read_bulk_callback, port);
+-	result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+-	if (result)
+-		dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
++	/* Continue trying to always read if we should */
++	if (!throttled) {
++		usb_fill_bulk_urb (port->read_urb, port->serial->dev,
++				   usb_rcvbulkpipe(port->serial->dev,
++						   port->bulk_in_endpointAddress),
++				   port->read_urb->transfer_buffer,
++				   port->read_urb->transfer_buffer_length,
++				   visor_read_bulk_callback, port);
++		result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
++		if (result)
++			dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
++	}
+ 	return;
+ }
+ 
+@@ -683,16 +689,26 @@ exit:
+ 
+ static void visor_throttle (struct usb_serial_port *port)
+ {
++	struct visor_private *priv = usb_get_serial_port_data(port);
++	unsigned long flags;
++
+ 	dbg("%s - port %d", __FUNCTION__, port->number);
+-	usb_kill_urb(port->read_urb);
++	spin_lock_irqsave(&priv->lock, flags);
++	priv->throttled = 1;
++	spin_unlock_irqrestore(&priv->lock, flags);
+ }
+ 
+ 
+ static void visor_unthrottle (struct usb_serial_port *port)
+ {
++	struct visor_private *priv = usb_get_serial_port_data(port);
++	unsigned long flags;
+ 	int result;
+ 
+ 	dbg("%s - port %d", __FUNCTION__, port->number);
++	spin_lock_irqsave(&priv->lock, flags);
++	priv->throttled = 0;
++	spin_unlock_irqrestore(&priv->lock, flags);
+ 
+ 	port->read_urb->dev = port->serial->dev;
+ 	result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
+--- a/drivers/video/matrox/matroxfb_accel.c
++++ b/drivers/video/matrox/matroxfb_accel.c
+@@ -438,13 +438,21 @@ static void matroxfb_1bpp_imageblit(WPMI
+ 		} else if (step == 1) {
+ 			/* Special case for 1..8bit widths */
+ 			while (height--) {
+-				mga_writel(mmio, 0, *chardata);
++#if defined(__BIG_ENDIAN)
++				fb_writel((*chardata) << 24, mmio.vaddr);
++#else
++				fb_writel(*chardata, mmio.vaddr);
++#endif
+ 				chardata++;
+ 			}
+ 		} else if (step == 2) {
+ 			/* Special case for 9..15bit widths */
+ 			while (height--) {
+-				mga_writel(mmio, 0, *(u_int16_t*)chardata);
++#if defined(__BIG_ENDIAN)
++				fb_writel((*(u_int16_t*)chardata) << 16, mmio.vaddr);
++#else
++				fb_writel(*(u_int16_t*)chardata, mmio.vaddr);
++#endif
+ 				chardata += 2;
+ 			}
+ 		} else {
+@@ -454,7 +462,7 @@ static void matroxfb_1bpp_imageblit(WPMI
+ 				
+ 				for (i = 0; i < step; i += 4) {
+ 					/* Hope that there are at least three readable bytes beyond the end of bitmap */
+-					mga_writel(mmio, 0, get_unaligned((u_int32_t*)(chardata + i)));
++					fb_writel(get_unaligned((u_int32_t*)(chardata + i)),mmio.vaddr);
+ 				}
+ 				chardata += step;
+ 			}
+diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
+--- a/drivers/video/matrox/matroxfb_base.h
++++ b/drivers/video/matrox/matroxfb_base.h
+@@ -170,14 +170,14 @@ static inline void mga_memcpy_toio(vaddr
+ 
+ 	if ((unsigned long)src & 3) {
+ 		while (len >= 4) {
+-			writel(get_unaligned((u32 *)src), addr);
++			fb_writel(get_unaligned((u32 *)src), addr);
+ 			addr++;
+ 			len -= 4;
+ 			src += 4;
+ 		}
+ 	} else {
+ 		while (len >= 4) {
+-			writel(*(u32 *)src, addr);
++			fb_writel(*(u32 *)src, addr);
+ 			addr++;
+ 			len -= 4;
+ 			src += 4;
+diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
+--- a/fs/ext3/balloc.c
++++ b/fs/ext3/balloc.c
+@@ -268,7 +268,8 @@ void ext3_discard_reservation(struct ino
+ 
+ 	if (!rsv_is_empty(&rsv->rsv_window)) {
+ 		spin_lock(rsv_lock);
+-		rsv_window_remove(inode->i_sb, rsv);
++		if (!rsv_is_empty(&rsv->rsv_window))
++			rsv_window_remove(inode->i_sb, rsv);
+ 		spin_unlock(rsv_lock);
+ 	}
+ }
+diff --git a/include/linux/err.h b/include/linux/err.h
+--- a/include/linux/err.h
++++ b/include/linux/err.h
+@@ -13,6 +13,8 @@
+  * This should be a per-architecture thing, to allow different
+  * error and pointer decisions.
+  */
++#define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L)
++
+ static inline void *ERR_PTR(long error)
+ {
+ 	return (void *) error;
+@@ -25,7 +27,7 @@ static inline long PTR_ERR(const void *p
+ 
+ static inline long IS_ERR(const void *ptr)
+ {
+-	return unlikely((unsigned long)ptr > (unsigned long)-1000L);
++	return IS_ERR_VALUE((unsigned long)ptr);
+ }
+ 
+ #endif /* _LINUX_ERR_H */
+diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
+--- a/net/bridge/netfilter/ebtables.c
++++ b/net/bridge/netfilter/ebtables.c
+@@ -179,9 +179,10 @@ unsigned int ebt_do_table (unsigned int 
+ 	struct ebt_chainstack *cs;
+ 	struct ebt_entries *chaininfo;
+ 	char *base;
+-	struct ebt_table_info *private = table->private;
++	struct ebt_table_info *private;
+ 
+ 	read_lock_bh(&table->lock);
++	private = table->private;
+ 	cb_base = COUNTER_BASE(private->counters, private->nentries,
+ 	   smp_processor_id());
+ 	if (private->chainstack)
+diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
+--- a/net/rose/rose_route.c
++++ b/net/rose/rose_route.c
+@@ -727,7 +727,8 @@ int rose_rt_ioctl(unsigned int cmd, void
+ 		}
+ 		if (rose_route.mask > 10) /* Mask can't be more than 10 digits */
+ 			return -EINVAL;
+-
++		if (rose_route.ndigis > 8) /* No more than 8 digipeats */
++			return -EINVAL;
+ 		err = rose_add_node(&rose_route, dev);
+ 		dev_put(dev);
+ 		return err;
+diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
+--- a/sound/usb/usbaudio.c
++++ b/sound/usb/usbaudio.c
+@@ -3276,7 +3276,7 @@ static void snd_usb_audio_disconnect(str
+ 		}
+ 		usb_chip[chip->index] = NULL;
+ 		up(&register_mutex);
+-		snd_card_free_in_thread(card);
++		snd_card_free(card);
+ 	} else {
+ 		up(&register_mutex);
+ 	}
+diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
+--- a/sound/usb/usx2y/usbusx2y.c
++++ b/sound/usb/usx2y/usbusx2y.c
+@@ -1,6 +1,11 @@
+ /*
+  * usbusy2y.c - ALSA USB US-428 Driver
+  *
++2005-04-14 Karsten Wiese
++	Version 0.8.7.2:
++	Call snd_card_free() instead of snd_card_free_in_thread() to prevent oops with dead keyboard symptom.
++	Tested ok with kernel 2.6.12-rc2.
++
+ 2004-12-14 Karsten Wiese
+ 	Version 0.8.7.1:
+ 	snd_pcm_open for rawusb pcm-devices now returns -EBUSY if called without rawusb's hwdep device being open.
+@@ -143,7 +148,7 @@
+ 
+ 
+ MODULE_AUTHOR("Karsten Wiese <annabellesgarden at yahoo.de>");
+-MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.8.7.1");
++MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.8.7.2");
+ MODULE_LICENSE("GPL");
+ MODULE_SUPPORTED_DEVICE("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001)(0x8005)(0x8007) }}");
+ 
+@@ -430,8 +435,6 @@ static void usX2Y_usb_disconnect(struct 
+ 	if (ptr) {
+ 		usX2Ydev_t* usX2Y = usX2Y((snd_card_t*)ptr);
+ 		struct list_head* p;
+-		if (usX2Y->chip_status == USX2Y_STAT_CHIP_HUP)	// on 2.6.1 kernel snd_usbmidi_disconnect()
+-			return;					// calls us back. better leave :-) .
+ 		usX2Y->chip.shutdown = 1;
+ 		usX2Y->chip_status = USX2Y_STAT_CHIP_HUP;
+ 		usX2Y_unlinkSeq(&usX2Y->AS04);
+@@ -443,7 +446,7 @@ static void usX2Y_usb_disconnect(struct 
+ 		}
+ 		if (usX2Y->us428ctls_sharedmem) 
+ 			wake_up(&usX2Y->us428ctls_wait_queue_head);
+-		snd_card_free_in_thread((snd_card_t*)ptr);
++		snd_card_free((snd_card_t*)ptr);
+ 	}
+ }
+ 

Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-05-27 20:27:05 UTC (rev 6380)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-mm-selected-bits.patch	2005-05-27 20:55:18 UTC (rev 6381)
@@ -393,122 +393,8 @@
  }
 _
 
-
 From: "Andi Kleen" <ak at suse.de>
 
-The PTEs can point to ioremap mappings too, and these are often outside
-mem_map.  The NUMA hash page lookup functions cannot handle out of bounds
-accesses properly.
-
-Signed-off-by: Andi Kleen <ak at suse.de>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- arch/x86_64/mm/fault.c |   11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff -puN arch/x86_64/mm/fault.c~x86_64-when-checking-vmalloc-mappings-dont-use arch/x86_64/mm/fault.c
---- 25/arch/x86_64/mm/fault.c~x86_64-when-checking-vmalloc-mappings-dont-use	2005-05-13 22:54:58.000000000 -0700
-+++ 25-akpm/arch/x86_64/mm/fault.c	2005-05-13 22:54:58.000000000 -0700
-@@ -234,6 +234,8 @@ static noinline void pgtable_bad(unsigne
- 
- /*
-  * Handle a fault on the vmalloc or module mapping area
-+ *
-+ * This assumes no large pages in there.
-  */
- static int vmalloc_fault(unsigned long address)
- {
-@@ -272,7 +274,10 @@ static int vmalloc_fault(unsigned long a
- 	if (!pte_present(*pte_ref))
- 		return -1;
- 	pte = pte_offset_kernel(pmd, address);
--	if (!pte_present(*pte) || pte_page(*pte) != pte_page(*pte_ref))
-+	/* Don't use pte_page here, because the mappings can point
-+	   outside mem_map, and the NUMA hash lookup cannot handle
-+	   that. */
-+	if (!pte_present(*pte) || pte_pfn(*pte) != pte_pfn(*pte_ref))
- 		BUG();
- 	__flush_tlb_all();
- 	return 0;
-@@ -346,7 +351,9 @@ asmlinkage void do_page_fault(struct pt_
- 	 * protection error (error_code & 1) == 0.
- 	 */
- 	if (unlikely(address >= TASK_SIZE)) {
--		if (!(error_code & 5)) {
-+		if (!(error_code & 5) &&
-+		      ((address >= VMALLOC_START && address < VMALLOC_END) ||
-+		       (address >= MODULES_VADDR && address < MODULES_END))) {
- 			if (vmalloc_fault(address) < 0)
- 				goto bad_area_nosemaphore;
- 			return;
-_
-
-From: "Andi Kleen" <ak at suse.de>
-
-Allowed user programs to set a non canonical segment base, which would cause
-oopses in the kernel later.
-
-Credit-to: Alexander Nyberg <alexn at dsv.su.se>
-
- For identifying and reporting this bug.
-
-Signed-off-by: Andi Kleen <ak at suse.de>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- arch/x86_64/kernel/ptrace.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff -puN arch/x86_64/kernel/ptrace.c~x86_64-fix-canonical-checking-for-segment-registers-in arch/x86_64/kernel/ptrace.c
---- 25/arch/x86_64/kernel/ptrace.c~x86_64-fix-canonical-checking-for-segment-registers-in	2005-05-13 22:54:55.000000000 -0700
-+++ 25-akpm/arch/x86_64/kernel/ptrace.c	2005-05-13 22:54:55.000000000 -0700
-@@ -257,13 +257,13 @@ static int putreg(struct task_struct *ch
- 			value &= 0xffff;
- 			return 0;
- 		case offsetof(struct user_regs_struct,fs_base):
--			if (!((value >> 48) == 0 || (value >> 48) == 0xffff))
--				return -EIO; 
-+			if (value >= TASK_SIZE)
-+				return -EIO;
- 			child->thread.fs = value;
- 			return 0;
- 		case offsetof(struct user_regs_struct,gs_base):
--			if (!((value >> 48) == 0 || (value >> 48) == 0xffff))
--				return -EIO; 
-+			if (value >= TASK_SIZE)
-+				return -EIO;
- 			child->thread.gs = value;
- 			return 0;
- 		case offsetof(struct user_regs_struct, eflags):
-_
-
-From: "Andi Kleen" <ak at suse.de>
-
-It could be in a memory hole not mapped in mem_map and that causes the hash
-lookup to go off to nirvana.
-
-Signed-off-by: Andi Kleen <ak at suse.de>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- arch/x86_64/mm/ioremap.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
---- 25/arch/x86_64/mm/ioremap.c~
-+++ 25-akpm/arch/x86_64/mm/ioremap.c
-@@ -266,7 +266,7 @@
- 	if ((p->flags >> 20) &&
- 		p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) {
- 		/* p->size includes the guard page, but cpa doesn't like that */
--		change_page_attr(virt_to_page(__va(p->phys_addr)),
-+		change_page_attr_addr((unsigned long)__va(p->phys_addr),
- 				 (p->size - PAGE_SIZE) >> PAGE_SHIFT,
- 				 PAGE_KERNEL); 				 
- 		global_flush_tlb();
-
-From: "Andi Kleen" <ak at suse.de>
-
 This works around a bug in the AMD K8 CPUs.
 
 Signed-off-by: Andi Kleen <ak at suse.de>
@@ -533,31 +419,3 @@
  
  #define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
  
-
-From: "Andi Kleen" <ak at suse.de>
-
-This works around an AMD Erratum.
-
-Signed-off-by: Andi Kleen <ak at suse.de>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- arch/x86_64/kernel/ptrace.c |    5 +++++
- 1 files changed, 5 insertions(+)
-
-diff -puN arch/x86_64/kernel/ptrace.c~x86_64-check-if-ptrace-rip-is-canonical arch/x86_64/kernel/ptrace.c
---- 25/arch/x86_64/kernel/ptrace.c~x86_64-check-if-ptrace-rip-is-canonical	2005-05-13 22:54:54.000000000 -0700
-+++ 25-akpm/arch/x86_64/kernel/ptrace.c	2005-05-13 22:54:54.000000000 -0700
-@@ -277,6 +277,11 @@ static int putreg(struct task_struct *ch
- 				return -EIO;
- 			value &= 0xffff;
- 			break;
-+		case offsetof(struct user_regs_struct, rip):
-+			/* Check if the new RIP address is canonical */
-+			if (value >= TASK_SIZE)
-+				return -EIO;
-+			break;
- 	}
- 	put_stack_long(child, regno - sizeof(struct pt_regs), value);
- 	return 0;
-_

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-05-27 20:27:05 UTC (rev 6380)
+++ tinysofa/releases/classic/2.0/kernel/current/sources/patch-2.6.11-ac3	2005-05-27 20:55:18 UTC (rev 6381)
@@ -23763,16 +23763,3 @@
  int nr_process_rx_frame(struct sock *sk, struct sk_buff *skb)
  {
  	nr_cb *nr = nr_sk(sk);
-diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.11/net/rose/rose_route.c linux-2.6.11/net/rose/rose_route.c
---- linux.vanilla-2.6.11/net/rose/rose_route.c	2005-03-05 15:17:06.000000000 +0000
-+++ linux-2.6.11/net/rose/rose_route.c	2005-03-05 15:34:38.000000000 +0000
-@@ -727,7 +727,8 @@
- 		}
- 		if (rose_route.mask > 10) /* Mask can't be more than 10 digits */
- 			return -EINVAL;
--
-+		if(rose_route.ndigis > 8) /* No more than 8 digipeats */
-+			return -EINVAL;
- 		err = rose_add_node(&rose_route, dev);
- 		dev_put(dev);
- 		return err;

Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-27 20:27:05 UTC (rev 6380)
+++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec	2005-05-27 20:55:18 UTC (rev 6381)
@@ -46,7 +46,7 @@
 Group: main
 License: GPLv2
 Version: %{rpmversion}
-Release: 15jh
+Release: 16jh
 ExclusiveArch: noarch %{all_x86} x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -88,7 +88,8 @@
 Patch7: 2.6.11.8.patch
 Patch8: 2.6.11.9.patch
 Patch9: 2.6.11.10.patch
-Patch10: acpi-20050309-2.6.11.diff
+Patch10: 2.6.11.11-mod.patch
+Patch11: acpi-20050309-2.6.11.diff
 
 Patch101: linux-2.6.11-epoll.patch
 Patch102: linux-2.6.11-compile.patch
@@ -240,6 +241,8 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %patch101 -p1 -b .epoll~
 %patch102 -p1 -b .compile~
@@ -599,6 +602,9 @@
 
 
 %changelog
+* Fri May 27 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- 2.6.11.11
+
 * Mon May 16 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - 2.6.11.10
 



From svn at tinysofa.org  Sat May 28 15:28:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 28 May 2005 11:28:25 -0400 (EDT)
Subject: [tinysofa-svn] r6382 - in
	tinysofa/releases/classic/2.0/mdadm/current: sources specs
Message-ID: <20050528152825.50001344BDA@minbar.tinysofa.org>

Author: jh
Date: 2005-05-28 11:28:12 -0400 (Sat, 28 May 2005)
New Revision: 6382

Added:
   tinysofa/releases/classic/2.0/mdadm/current/sources/mdadm-1.11.0.tgz
Removed:
   tinysofa/releases/classic/2.0/mdadm/current/sources/mdadm-1.8.0.tgz
Modified:
   tinysofa/releases/classic/2.0/mdadm/current/specs/mdadm.spec
Log:
- 1.11.0

Added: tinysofa/releases/classic/2.0/mdadm/current/sources/mdadm-1.11.0.tgz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/classic/2.0/mdadm/current/sources/mdadm-1.11.0.tgz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/classic/2.0/mdadm/current/sources/mdadm-1.8.0.tgz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/classic/2.0/mdadm/current/specs/mdadm.spec
===================================================================
--- tinysofa/releases/classic/2.0/mdadm/current/specs/mdadm.spec	2005-05-27 20:55:18 UTC (rev 6381)
+++ tinysofa/releases/classic/2.0/mdadm/current/specs/mdadm.spec	2005-05-28 15:28:12 UTC (rev 6382)
@@ -1,7 +1,7 @@
 Summary: mdadm is used for controlling Linux md devices (aka RAID arrays)
 Name: mdadm
-Version: 1.8.0
-Release: 2jh
+Version: 1.11.0
+Release: 1jh
 Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1: mdmonitor.init
 Patch0: mdadm-1.5.0-email.patch
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue May 17 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.11.0-1jh
+- 1.11.0
+
 * Tue Jan 04 2005 tsintegrate <release at tinysofa dot org> 1.8.0-1ts
 - current (1.8.0-1jh) integrated as 1.8.0-1ts for release 1.1-U3
 



From svn at tinysofa.org  Mon May 30 07:49:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 03:49:22 -0400 (EDT)
Subject: [tinysofa-svn] r6383 - in contrib/classic/2.0/nut/current: sources
	specs
Message-ID: <20050530074922.78619344BDF@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 03:49:09 -0400 (Mon, 30 May 2005)
New Revision: 6383

Added:
   contrib/classic/2.0/nut/current/sources/upsmon.conf
   contrib/classic/2.0/nut/current/sources/upssched.conf
Modified:
   contrib/classic/2.0/nut/current/sources/halt.local
   contrib/classic/2.0/nut/current/specs/nut.spec
Log:
- fix halt.local
- provide more useful default configuration files


Modified: contrib/classic/2.0/nut/current/sources/halt.local
===================================================================
--- contrib/classic/2.0/nut/current/sources/halt.local	2005-05-28 15:28:12 UTC (rev 6382)
+++ contrib/classic/2.0/nut/current/sources/halt.local	2005-05-30 07:49:09 UTC (rev 6383)
@@ -5,8 +5,8 @@
 
 # load /etc/sysconfig/ups if present I've put the POWERDOWNFLAG
 # in there so noboby have to manually modify the script
-if [ -f /etc/sysconfig/ups ]; then
-   . /etc/sysconfig/ups
+if [ -f /etc/sysconfig/nut ]; then
+   . /etc/sysconfig/nut
 fi
 UPSCMD=`which upsdrvctl`
 

Added: contrib/classic/2.0/nut/current/sources/upsmon.conf
===================================================================
--- contrib/classic/2.0/nut/current/sources/upsmon.conf	2005-05-28 15:28:12 UTC (rev 6382)
+++ contrib/classic/2.0/nut/current/sources/upsmon.conf	2005-05-30 07:49:09 UTC (rev 6383)
@@ -0,0 +1,286 @@
+# Network UPS Tools: example upsmon configuration
+#
+# This file contains passwords, so keep it secure.
+
+# --------------------------------------------------------------------------
+# RUN_AS_USER <userid>
+#
+# By default, upsmon splits into two processes.  One stays as root and
+# waits to run the SHUTDOWNCMD.  The other one switches to another userid
+# and does everything else.
+#
+# The default nonprivileged user is set at compile-time with
+# 	'configure --with-user=...'.  
+# 
+# You can override it with '-u <user>' when starting upsmon, or just
+# define it here for convenience.
+#
+# Note: if you plan to use the reload feature, this file (upsmon.conf)
+# must be readable by this user!  Since it contains passwords, DO NOT
+# make it world-readable.  Also, do not make it writable by the upsmon
+# user, since it creates an opportunity for an attack by changing the
+# SHUTDOWNCMD to something malicious.
+#
+# For best results, you should create a new normal user like "nutmon",
+# and make it a member of a "nut" group or similar.  Then specify it
+# here and grant read access to the upsmon.conf for that group.
+#
+# This user should not have write access to upsmon.conf.
+#
+RUN_AS_USER nutmon
+
+# --------------------------------------------------------------------------
+# MONITOR <system> <powervalue> <username> <password> ("master"|"slave")
+#
+# List systems you want to monitor.  Not all of these may supply power
+# to the system running upsmon, but if you want to watch it, it has to
+# be in this section.
+# 
+# You must have at least one of these declared.
+#
+# <system> is a UPS identifier in the form <upsname>@<hostname>[:<port>]
+# like ups at localhost, su700 at mybox, etc.
+# 
+# Examples:
+# 
+#  - "su700 at mybox" means a UPS called "su700" on a system called "mybox"
+#
+#  - "fenton at bigbox:5678" is a UPS called "fenton" on a system called
+#    "bigbox" which runs upsd on port "5678".
+#
+# The UPS names like "su700" and "fenton" are set in your ups.conf
+# in [brackets] which identify a section for a particular driver.
+#
+# If the ups.conf on host "doghouse" has a section called "snoopy", the
+# identifier for it would be "snoopy at doghouse".
+#
+# <powervalue> is an integer - the number of power supplies that this UPS 
+# feeds on this system.  Most computers only have one power supply, so this 
+# is normally set to 1.  You need a pretty big or special box to have any 
+# other value here.
+#
+# You can also set this to 0 for a system that doesn't supply any power,
+# but you still want to monitor.  Use this when you want to hear about
+# changes for a given UPS without shutting down when it goes critical,
+# unless <powervalue> is 0.
+#
+# <username> and <password> must match an entry in that system's
+# upsd.users.  If your username is "monmaster" and your password is 
+# "blah", the upsd.users would look like this:
+#
+#	[monmaster]
+#		password  = blah
+#		allowfrom = 	(whatever applies to this host)
+#		upsmon master 	(or slave)
+# 
+# "master" means this system will shutdown last, allowing the slaves
+# time to shutdown first.
+#
+# "slave" means this system shuts down immediately when power goes critical.
+#
+# Examples: 
+#
+# MONITOR myups at bigserver 1 monmaster blah master
+# MONITOR su700 at server.example.com 1 upsmon secretpass slave
+
+# --------------------------------------------------------------------------
+# MINSUPPLIES <num>
+#
+# Give the number of power supplies that must be receiving power to keep
+# this system running.  Most systems have one power supply, so you would
+# put "1" in this field.
+#
+# Large/expensive server type systems usually have more, and can run with
+# a few missing.  The HP NetServer LH4 can run with 2 out of 4, for example,
+# so you'd set that to 2.  The idea is to keep the box running as long
+# as possible, right?
+#
+# Obviously you have to put the redundant supplies on different UPS circuits
+# for this to make sense!  See big-servers.txt in the docs subdirectory
+# for more information and ideas on how to use this feature.
+
+MINSUPPLIES 1
+
+# --------------------------------------------------------------------------
+# SHUTDOWNCMD "<command>"
+#
+# upsmon runs this command when the system needs to be brought down.
+#
+# This should work just about everywhere ... if it doesn't, well, change it.
+
+SHUTDOWNCMD "/sbin/shutdown -h +0"
+
+# --------------------------------------------------------------------------
+# NOTIFYCMD <command>
+#
+# upsmon calls this to send messages when things happen
+#
+# This command is called with the full text of the message as one argument.
+# The environment string NOTIFYTYPE will contain the type string of
+# whatever caused this event to happen.
+#
+# Note that this is only called for NOTIFY events that have EXEC set with
+# NOTIFYFLAG.  See NOTIFYFLAG below for more details.
+#
+# Making this some sort of shell script might not be a bad idea.  For more
+# information and ideas, see pager.txt in the docs directory.
+#
+# Example:
+# NOTIFYCMD /usr/local/ups/bin/notifyme
+NOTIFYCMD /usr/sbin/upssched
+
+# --------------------------------------------------------------------------
+# POLLFREQ <n> 
+#
+# Polling frequency for normal activities, measured in seconds.
+#
+# Adjust this to keep upsmon from flooding your network, but don't make 
+# it too high or it may miss certain short-lived power events.
+
+POLLFREQ 5
+
+# --------------------------------------------------------------------------
+# POLLFREQALERT <n>
+#
+# Polling frequency in seconds while UPS on battery.
+#
+# You can make this number lower than POLLFREQ, which will make updates
+# faster when any UPS is running on battery.  This is a good way to tune 
+# network load if you have a lot of these things running.  
+#
+# The default is 5 seconds for both this and POLLFREQ.
+
+POLLFREQALERT 5
+
+# --------------------------------------------------------------------------
+# HOSTSYNC - How long upsmon will wait before giving up on another upsmon
+#
+# The master upsmon process uses this number when waiting for slaves to
+# disconnect once it has set the forced shutdown (FSD) flag.  If they
+# don't disconnect after this many seconds, it goes on without them.
+#
+# Similarly, upsmon slave processes wait up to this interval for the 
+# master upsmon to set FSD when a UPS they are monitoring goes critical -
+# that is, on battery and low battery.  If the master doesn't do its job,
+# the slaves will shut down anyway to avoid damage to the file systems.
+#
+# This "wait for FSD" is done to avoid races where the status changes
+# to critical and back between polls by the master.
+
+HOSTSYNC 15
+
+# --------------------------------------------------------------------------
+# DEADTIME - Interval to wait before declaring a stale ups "dead"
+#
+# upsmon requires a UPS to provide status information every few seconds
+# (see POLLFREQ and POLLFREQALERT) to keep things updated.  If the status
+# fetch fails, the UPS is marked stale.  If it stays stale for more than
+# DEADTIME seconds, the UPS is marked dead.
+#
+# A dead UPS that was last known to be on battery is assumed to have gone
+# to a low battery condition.  This may force a shutdown if it is providing
+# a critical amount of power to your system.
+#
+# Note: DEADTIME should be a multiple of POLLFREQ and POLLFREQALERT.
+# Otherwise you'll have "dead" UPSes simply because upsmon isn't polling
+# them quickly enough.  Rule of thumb: take the larger of the two
+# POLLFREQ values, and multiply by 3.
+
+DEADTIME 15
+
+# --------------------------------------------------------------------------
+# POWERDOWNFLAG - Flag file for forcing UPS shutdown on the master system
+#
+# upsmon will create a file with this name in master mode when it's time
+# to shut down the load.  You should check for this file's existence in
+# your shutdown scripts and run 'upsdrvctl shutdown' if it exists.
+#
+# See the shutdown.txt file in the docs subdirectory for more information.
+
+POWERDOWNFLAG /etc/killpower
+
+# --------------------------------------------------------------------------
+# NOTIFYMSG - change messages sent by upsmon when certain events occur
+#
+# You can change the stock messages to something else if you like.
+#
+# NOTIFYMSG <notify type> "message"
+#
+# NOTIFYMSG ONLINE "UPS %s is getting line power"
+# NOTIFYMSG ONBATT "Someone pulled the plug on %s"
+#
+# Note that %s is replaced with the identifier of the UPS in question.
+#
+# Possible values for <notify type>:
+#
+# ONLINE   : UPS is back online
+# ONBATT   : UPS is on battery
+# LOWBATT  : UPS has a low battery (if also on battery, it's "critical")
+# FSD      : UPS is being shutdown by the master (FSD = "Forced Shutdown")
+# COMMOK   : Communications established with the UPS
+# COMMBAD  : Communications lost to the UPS
+# SHUTDOWN : The system is being shutdown
+# REPLBATT : The UPS battery is bad and needs to be replaced
+# NOCOMM   : A UPS is unavailable (can't be contacted for monitoring)
+
+# --------------------------------------------------------------------------
+# NOTIFYFLAG - change behavior of upsmon when NOTIFY events occur
+#
+# By default, upsmon sends walls (global messages to all logged in users)
+# and writes to the syslog when things happen.  You can change this.
+#
+# NOTIFYFLAG <notify type> <flag>[+<flag>][+<flag>] ...
+#
+# NOTIFYFLAG ONLINE SYSLOG
+# NOTIFYFLAG ONBATT SYSLOG+WALL+EXEC
+#
+# Possible values for the flags:
+#
+# SYSLOG - Write the message in the syslog 
+# WALL   - Write the message to all users on the system
+# EXEC   - Execute NOTIFYCMD (see above) with the message
+# IGNORE - Don't do anything
+#
+# If you use IGNORE, don't use any other flags on the same line.
+#NOTIFYFLAG ONLINE SYSLOG+EXEC
+#NOTIFYFLAG ONBATT SYSLOG+EXEC
+#NOTIFYFLAG LOWBATT SYSLOG+EXEC
+
+# --------------------------------------------------------------------------
+# RBWARNTIME - replace battery warning time in seconds
+#
+# upsmon will normally warn you about a battery that needs to be replaced
+# every 43200 seconds, which is 12 hours.  It does this by triggering a
+# NOTIFY_REPLBATT which is then handled by the usual notify structure
+# you've defined above.
+# 
+# If this number is not to your liking, override it here.
+
+RBWARNTIME 43200
+
+# --------------------------------------------------------------------------
+# NOCOMMWARNTIME - no communications warning time in seconds
+#
+# upsmon will let you know through the usual notify system if it can't
+# talk to any of the UPS entries that are defined in this file.  It will
+# trigger a NOTIFY_NOCOMM by default every 300 seconds unless you 
+# change the interval with this directive.
+
+NOCOMMWARNTIME 300
+
+# --------------------------------------------------------------------------
+# FINALDELAY - last sleep interval before shutting down the system
+#
+# On a master, upsmon will wait this long after sending the NOTIFY_SHUTDOWN
+# before executing your SHUTDOWNCMD.  If you need to do something in between
+# those events, increase this number.  Remember, at this point your UPS is 
+# almost depleted, so don't make this too high.
+#
+# Alternatively, you can set this very low so you don't wait around when
+# it's time to shut down.  Some UPSes don't give much warning for low
+# battery and will require a value of 0 here for a safe shutdown.
+#
+# Note: If FINALDELAY on the slave is greater than HOSTSYNC on the master,
+# the master will give up waiting for the slave to disconnect.
+
+FINALDELAY 5

Added: contrib/classic/2.0/nut/current/sources/upssched.conf
===================================================================
--- contrib/classic/2.0/nut/current/sources/upssched.conf	2005-05-28 15:28:12 UTC (rev 6382)
+++ contrib/classic/2.0/nut/current/sources/upssched.conf	2005-05-30 07:49:09 UTC (rev 6383)
@@ -0,0 +1,122 @@
+# Network UPS Tools - upssched.conf sample file
+#
+# ============================================================================
+#
+# CMDSCRIPT <scriptname>
+#
+# This script gets called to invoke commands for timers that trigger.
+# It is given a single argument - the <timername> in your
+# AT ... START-TIMER defines.
+#
+# *** This must be defined *before* the first AT line.  Otherwise the
+#     program will complain and exit without doing anything.
+#
+# A shell script with a big case..esac construct should work nicely for this.
+# An example has been provided to help you get started.
+
+#CMDSCRIPT /usr/local/ups/bin/upssched-cmd
+
+# ============================================================================
+#
+# PIPEFN <filename>
+#
+# This sets the file name of the FIFO that will pass communications between
+# processes to start and stop timers.  This should be set to some path where
+# normal users can't create the file, due to the possibility of symlinking
+# and other evil.
+#
+# Note: if you are running Solaris or similar, the permissions that 
+# upssched sets on this file *are not enough* to keep you safe.  If
+# your OS ignores the permissions on a FIFO, then you MUST put this in
+# a protected directory!
+#
+# Note 2: by default, upsmon will run upssched as whatever user you have
+# defined with RUN_AS_USER in upsmon.conf.  Make sure that user can
+# create files and write to files in the path you use for PIPEFN and
+# LOCKFN.
+#
+# My recommendation: create a special directory for upssched, make it
+# owned by your upsmon user, then use it for both.
+#
+# This is commented out by default to make you visit this file and think
+# about how your system works before potentially opening a hole.
+#
+PIPEFN /var/state/ups/upssched.pipe
+
+# ============================================================================
+#
+# LOCKFN <filename>
+#
+# REQUIRED.  This was added after version 1.2.1.
+#
+# upssched needs to be able to create this filename in order to avoid
+# a race condition when two events are dispatched from upsmon at nearly
+# the same time.  This file will only exist briefly.  It must not be
+# created by any other process.
+#
+# You should put this in the same directory as PIPEFN.
+#
+LOCKFN /var/state/ups/upssched.lock
+
+# ============================================================================
+#
+# AT <notifytype> <upsname> <command>
+#
+# Define a handler for a specific event <notifytype> on UPS <upsname>.
+#
+# <upsname> can be the special value * to apply this handler to every
+# possible value of <upsname>.
+#
+# Run the command <command> via your CMDSCRIPT when it happens. 
+#
+# Note that any AT that matches both the <notifytype> and the <upsname> 
+# for the current event will be used.
+
+# ============================================================================
+#
+# Possible AT commands
+#
+# - START-TIMER <timername> <interval>
+#
+#   Start a timer called <timername> that will trigger after <interval>
+#   seconds, calling your CMDSCRIPT with <timername> as the first
+#   argument.
+#
+#   Example:
+#   Start a timer that'll execute when any UPS (*) has been gone 10 seconds
+#
+#   AT COMMBAD * START-TIMER upsgone 10
+
+#   -----------------------------------------------------------------------
+#
+# - CANCEL-TIMER <timername> [cmd]
+#
+#   Cancel a running timer called <timername>, if possible. If the timer
+#   has passed then pass the optional argument <cmd> to CMDSCRIPT.
+#
+#   Example:
+#   If a specific UPS (myups at localhost) comes back online, then stop the 
+#   timer before it triggers
+# 
+#   AT COMMOK myups at localhost CANCEL-TIMER upsgone
+
+#   -----------------------------------------------------------------------
+#
+# - EXECUTE <command>
+#
+#   Immediately pass <command> as an argument to CMDSCRIPT.
+#
+#   Example:
+#   If any UPS (*) reverts to utility power, then execute
+#   'ups-back-on-line' via CMDSCRIPT.
+#
+#   AT ONLINE * EXECUTE ups-back-on-line
+
+# example of shutting down machines after 900 seconds from "on battery"
+# warning
+#
+# CMDSCRIPT "/usr/sbin/upsmon -c fsd"
+#
+# AT ONBATT * START-TIMER onbattwarn 900
+# AT ONLINE * CANCEL-TIMER onbattwarn
+

Modified: contrib/classic/2.0/nut/current/specs/nut.spec
===================================================================
--- contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-28 15:28:12 UTC (rev 6382)
+++ contrib/classic/2.0/nut/current/specs/nut.spec	2005-05-30 07:49:09 UTC (rev 6383)
@@ -11,10 +11,12 @@
 Name: nut
 Summary: Multi-vendor UPS Monitoring Project Client Utilities
 Version: 0.cvs20050518
-Release: 2jh
+Release: 3jh
 Group: contrib
 Source: nut-cvs20050518.tar.bz2
 Source1: halt.local
+Source2: upsmon.conf
+Source3: upssched.conf
 Patch0: nut-initscripts.patch
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -38,7 +40,7 @@
 %package server
 Summary: Multi-vendor UPS Monitoring Project server
 Group: contrib
-Requires: nut = %{version}-%{release}
+PreReq: nut = %{version}-%{release}
 
 %description server
 These programs are part of a developing project to monitor the assortment 
@@ -121,6 +123,8 @@
 
 install -m 755 %{SOURCE1} %{buildroot}/sbin/halt.local
 
+cp -f %{SOURCE2} %{SOURCE3} %{buildroot}%{_sysconfdir}/ups/
+
 rm -fr %{buildroot}/usr/share/doc
 
 
@@ -194,7 +198,7 @@
 %dir %attr(755,root,root) %{CONFPATH}
 %config(noreplace) %attr(644,root,root) %{CONFPATH}/ups.conf
 %config(noreplace) %attr(644,root,root) %{CONFPATH}/upsd.conf
-%config(noreplace) %attr(600,root,root) %{CONFPATH}/upsd.users
+%config(noreplace) %attr(400,%{nutuser},root) %{CONFPATH}/upsd.users
 %{_datadir}/%{name}
 %{_mandir}/man8/apcsmart.8.gz
 %{_mandir}/man8/belkin.8.gz
@@ -279,6 +283,10 @@
 
 
 %changelog
+* Mon May 30 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- fix halt.local
+- provide more useful default configuration files
+
 * Mon May 23 2005 Jaakko Heinonen <jh at tinysofa dot org>
 - patch initscripts
 



From svn at tinysofa.org  Mon May 30 12:04:14 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 08:04:14 -0400 (EDT)
Subject: [tinysofa-svn] r6384 -
	tinysofa/releases/classic/2.0/grsecurity/current/specs
Message-ID: <20050530120414.A2D2B3450C3@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 08:04:08 -0400 (Mon, 30 May 2005)
New Revision: 6384

Modified:
   tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec
Log:
- fix doc dir permissions


Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec
===================================================================
--- tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec	2005-05-30 07:49:09 UTC (rev 6383)
+++ tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec	2005-05-30 12:04:08 UTC (rev 6384)
@@ -32,7 +32,9 @@
 
 cp %{SOURCE3} .
 
+%{__chmod} 644 rbac.txt policy
 
+
 %build
 %make \
 	OPT_FLAGS="$RPM_OPT_FLAGS" \
@@ -98,7 +100,7 @@
 
 %files -f files.list
 %defattr(-,root,root)
-%doc %attr(644,root,root) rbac.txt policy
+%doc rbac.txt policy
 %dev(c, 1, 12) %attr(0622,root,root) /dev/grsec
 %dir %attr(0700,root,root) %{_sysconfdir}/grsec
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/grsec/policy



From svn at tinysofa.org  Mon May 30 12:06:48 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 08:06:48 -0400 (EDT)
Subject: [tinysofa-svn] r6385 -
	tinysofa/releases/classic/2.0/initscripts/current/specs
Message-ID: <20050530120648.8540C3450D4@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 08:06:42 -0400 (Mon, 30 May 2005)
New Revision: 6385

Modified:
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- fix doc dir permissions


Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-30 12:04:08 UTC (rev 6384)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-30 12:06:42 UTC (rev 6385)
@@ -84,7 +84,10 @@
 cat %{SOURCE1} >> $RPM_BUILD_ROOT/etc/sysctl.conf
 cat %{SOURCE2} >> $RPM_BUILD_ROOT/etc/sysctl.conf
 
+%{__chmod} 644 sysconfig.txt sysvinitfiles ChangeLog \
+	static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6
 
+
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
 



From svn at tinysofa.org  Mon May 30 12:12:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 08:12:36 -0400 (EDT)
Subject: [tinysofa-svn] r6386 -
	tinysofa/releases/classic/2.0/samba/current/specs
Message-ID: <20050530121236.E1D6A3450F4@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 08:12:30 -0400 (Mon, 30 May 2005)
New Revision: 6386

Modified:
   tinysofa/releases/classic/2.0/samba/current/specs/samba.spec
Log:
- correct documentation permissions


Modified: tinysofa/releases/classic/2.0/samba/current/specs/samba.spec
===================================================================
--- tinysofa/releases/classic/2.0/samba/current/specs/samba.spec	2005-05-30 12:06:42 UTC (rev 6385)
+++ tinysofa/releases/classic/2.0/samba/current/specs/samba.spec	2005-05-30 12:12:30 UTC (rev 6386)
@@ -143,7 +143,11 @@
 cd source
 script/mkversion.sh
 cd ..
+# documentation permissions
+find examples docs -type d -print|xargs chmod 755
+find examples docs -type f -print|xargs chmod 644
 
+
 %build
 cd source
 %ifarch i386 sparc



From svn at tinysofa.org  Mon May 30 12:21:36 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 08:21:36 -0400 (EDT)
Subject: [tinysofa-svn] r6387 - in tinysofa/releases/classic/2.0:
	cracklib/current/specs words/current/specs
Message-ID: <20050530122136.70399345131@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 08:21:24 -0400 (Mon, 30 May 2005)
New Revision: 6387

Modified:
   tinysofa/releases/classic/2.0/cracklib/current/specs/cracklib.spec
   tinysofa/releases/classic/2.0/words/current/specs/words.spec
Log:
- fix doc permissions


Modified: tinysofa/releases/classic/2.0/cracklib/current/specs/cracklib.spec
===================================================================
--- tinysofa/releases/classic/2.0/cracklib/current/specs/cracklib.spec	2005-05-30 12:12:30 UTC (rev 6386)
+++ tinysofa/releases/classic/2.0/cracklib/current/specs/cracklib.spec	2005-05-30 12:21:24 UTC (rev 6387)
@@ -52,7 +52,9 @@
 
 cp %{SOURCE1} cracklib/crack.h
 
+%{__chmod} 644 README MANIFEST LICENCE HISTORY POSTER
 
+
 %build
 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector}" \
 make all \

Modified: tinysofa/releases/classic/2.0/words/current/specs/words.spec
===================================================================
--- tinysofa/releases/classic/2.0/words/current/specs/words.spec	2005-05-30 12:12:30 UTC (rev 6386)
+++ tinysofa/releases/classic/2.0/words/current/specs/words.spec	2005-05-30 12:21:24 UTC (rev 6387)
@@ -19,7 +19,9 @@
 %setup -q -c
 %patch0 -p1
 
+%{__chmod} 644 usr/dict/README*
 
+
 %build
 
 



From svn at tinysofa.org  Mon May 30 12:40:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 08:40:25 -0400 (EDT)
Subject: [tinysofa-svn] r6388 -
	tinysofa/releases/classic/2.0/initscripts/current/specs
Message-ID: <20050530124025.5DA07344F43@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 08:40:18 -0400 (Mon, 30 May 2005)
New Revision: 6388

Modified:
   tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
Log:
- more permissions


Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-30 12:21:24 UTC (rev 6387)
+++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec	2005-05-30 12:40:18 UTC (rev 6388)
@@ -140,8 +140,8 @@
 
 %files
 %defattr(0755,root,root)
-%doc %attr(0644,root,root) sysconfig.txt sysvinitfiles ChangeLog 
-%doc %attr(0644,root,root) static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6
+%doc sysconfig.txt sysvinitfiles ChangeLog 
+%doc static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6
 %dir /etc/sysconfig/network-scripts
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/networking



From svn at tinysofa.org  Mon May 30 14:10:24 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 10:10:24 -0400 (EDT)
Subject: [tinysofa-svn] r6389 - in contrib/classic/2.0/mach/current: sources
	specs
Message-ID: <20050530141024.A6A24344FB5@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 10:10:15 -0400 (Mon, 30 May 2005)
New Revision: 6389

Modified:
   contrib/classic/2.0/mach/current/sources/ts-classic-2.0
   contrib/classic/2.0/mach/current/specs/mach.spec
Log:
- remove fcron from tcs 2.0 base package set

Modified: contrib/classic/2.0/mach/current/sources/ts-classic-2.0
===================================================================
--- contrib/classic/2.0/mach/current/sources/ts-classic-2.0	2005-05-30 12:40:18 UTC (rev 6388)
+++ contrib/classic/2.0/mach/current/sources/ts-classic-2.0	2005-05-30 14:10:15 UTC (rev 6389)
@@ -18,8 +18,7 @@
     'dir':      'ts-classic-2.0',
     'minimal':  'bash glibc',
     'base':     'coreutils findutils openssh-server openssh initscripts pam ' +
-                'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ' +
-                'tcp_wrappers',
+                'openssl zlib dev glibc-locales glibc-i18n-en_US tcp_wrappers',
     'build':    'dev rpm-devel rpm-build make gcc tar gzip patch ' +
                 'unzip bzip2 diffutils cpio elfutils',
 }

Modified: contrib/classic/2.0/mach/current/specs/mach.spec
===================================================================
--- contrib/classic/2.0/mach/current/specs/mach.spec	2005-05-30 12:40:18 UTC (rev 6388)
+++ contrib/classic/2.0/mach/current/specs/mach.spec	2005-05-30 14:10:15 UTC (rev 6389)
@@ -2,7 +2,7 @@
 
 Name: mach
 Version: 0.4.6
-Release: 14jh
+Release: 15jh
 Summary: make a chroot buildsystem
 Group: contrib
 License: GPL
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Mon May 30 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-15jh
+- remove fcron from tcs 2.0 base package set
+
 * Mon Jan 24 2005 Jaakko Heinonen <jh at tinysofa dot org> 0.4.6-12jh
 - add configuration for tinysofa classic server 1.2
 - fix a typo in 1.1 config



From svn at tinysofa.org  Mon May 30 15:09:43 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 11:09:43 -0400 (EDT)
Subject: [tinysofa-svn] r6390 - in contrib/classic/2.0: . nano nano/current
	nano/current/sources nano/current/specs
Message-ID: <20050530150943.8F3123450F3@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 11:09:15 -0400 (Mon, 30 May 2005)
New Revision: 6390

Added:
   contrib/classic/2.0/nano/
   contrib/classic/2.0/nano/current/
   contrib/classic/2.0/nano/current/sources/
   contrib/classic/2.0/nano/current/sources/nano-1.2.5.tar.gz
   contrib/classic/2.0/nano/current/specs/
   contrib/classic/2.0/nano/current/specs/nano.spec
   contrib/classic/2.0/nano/pristine/
   contrib/classic/2.0/nano/releases/
Log:
- add nano to contrib


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


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

Added: contrib/classic/2.0/nano/current/specs/nano.spec
===================================================================
--- contrib/classic/2.0/nano/current/specs/nano.spec	2005-05-30 14:10:15 UTC (rev 6389)
+++ contrib/classic/2.0/nano/current/specs/nano.spec	2005-05-30 15:09:15 UTC (rev 6390)
@@ -0,0 +1,48 @@
+Summary: Pico editor clone with enhancements
+Name: nano
+Version: 1.2.5
+Release: 1jh
+License: GPL
+Group: contrib
+URL: http://www.nano-editor.org
+Source: http://www.nano-editor.org/dist/v1.2/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: ncurses
+BuildRequires: ncurses-devel
+
+%description
+GNU nano is a small and friendly text editor.  It aims to emulate the Pico
+text editor while also offering a few enhancements.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure --enable-all
+%make
+
+
+%install
+%makeinstall_std
+
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO nanorc.sample
+%{_bindir}/nano
+%{_mandir}/*/*
+%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_infodir}/nano.info*
+
+
+%changelog
+* Mon May 30 2005 Jaakko Heinonen <jh at tinysofa dot org>
+- tinysofa
+
+* Sat Mar 30 2002 Chris Allegretta <chrisa at asty.org>
+- Accepted into main distribution
+- Added Packager and URL tage from original spec file.
+* Tue Mar 06 2002 Brett Pemberton <generica at email.com>
+- Initial spec-file



From svn at tinysofa.org  Mon May 30 18:46:53 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 30 May 2005 14:46:53 -0400 (EDT)
Subject: [tinysofa-svn] r6391 - in tinysofa/releases/classic/2.0:
	perl-dbd-mysql/current/specs perl-dbd-pg/current/specs
	perl-dbi/current/specs
Message-ID: <20050530184653.427C0344FA9@minbar.tinysofa.org>

Author: jh
Date: 2005-05-30 14:46:30 -0400 (Mon, 30 May 2005)
New Revision: 6391

Modified:
   tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec
   tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec
   tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec
Log:
- improve perl package requirements


Modified: tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec	2005-05-30 15:09:15 UTC (rev 6390)
+++ tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec	2005-05-30 18:46:30 UTC (rev 6391)
@@ -8,8 +8,8 @@
 Group: extra
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
-Requires: perl = %{perl_version} mysql-libs perl-dbi openssl
-BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version}
+Requires: perl = %{perl_epoch}:%{perl_version} mysql-libs perl-dbi openssl
+BuildRequires: perl-devel perl
 BuildRequires: mysql-devel perl-dbi openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}
 

Modified: tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec	2005-05-30 15:09:15 UTC (rev 6390)
+++ tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec	2005-05-30 18:46:30 UTC (rev 6391)
@@ -8,8 +8,8 @@
 Group: extra
 Source: %{perlname}-%{version}.tar.gz
 URL: http://www.cpan.org/
-Requires: perl = %{perl_version} perl-dbi postgresql-libs
-BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} perl-dbi
+Requires: perl = %{perl_epoch}:%{perl_version} perl-dbi postgresql-libs
+BuildRequires: perl-devel perl perl-dbi
 BuildRequires: postgresql-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}
 

Modified: tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec	2005-05-30 15:09:15 UTC (rev 6390)
+++ tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec	2005-05-30 18:46:30 UTC (rev 6391)
@@ -12,7 +12,7 @@
 Patch: DBI-1.38-CAN-2005-0077.patch
 License: GPL
 Group: extra
-Requires: perl >= %{perl_epoch}:%{perl_version}
+Requires: perl = %{perl_epoch}:%{perl_version}
 BuildRequires: perl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 



From svn at tinysofa.org  Tue May 31 05:12:25 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 31 May 2005 01:12:25 -0400 (EDT)
Subject: [tinysofa-svn] r6392 - in tinysofa/releases/classic/2.0:
	perl/current/specs perl-dbd-mysql/current/specs
	perl-dbd-pg/current/specs perl-dbi/current/specs
Message-ID: <20050531051225.916AE345153@minbar.tinysofa.org>

Author: jh
Date: 2005-05-31 01:12:06 -0400 (Tue, 31 May 2005)
New Revision: 6392

Modified:
   tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec
   tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec
   tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec
   tinysofa/releases/classic/2.0/perl/current/specs/perl.spec
Log:
- bump up release numbers
perl:
- remove suspicious provides statement


Modified: tinysofa/releases/classic/2.0/perl/current/specs/perl.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl/current/specs/perl.spec	2005-05-30 18:46:30 UTC (rev 6391)
+++ tinysofa/releases/classic/2.0/perl/current/specs/perl.spec	2005-05-31 05:12:06 UTC (rev 6392)
@@ -4,7 +4,7 @@
 Name: perl
 Version: 5.8.6
 Epoch: 1
-Release: 5jh
+Release: 6jh
 License: GPL
 Group: main
 Url: http://www.perl.com
@@ -35,9 +35,8 @@
 BuildRequires: gdbm-devel
 BuildRequires: db4-devel
 BuildRequires: findutils
-# Removed untill prove of need: (christht)
-#%define _noVersionedDependencies 1
-Provides: perl <= %{epoch}:%{version}
+# provide also without epoch
+Provides: perl = %{version}
 
 # This is really there, strange
 Provides: perl(Carp::Heavy)
@@ -448,6 +447,10 @@
 
 
 %changelog
+* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 5.8.6-6jh
+- remove unclean provides statement which provided all versions of the
+  package
+
 * Sun Mar 13 2005 Jaakko Heinonen <jh at tinysofa dot org> 5.8.6-5jh
 - fix CAN-2005-0448 (#9)
 

Modified: tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec	2005-05-30 18:46:30 UTC (rev 6391)
+++ tinysofa/releases/classic/2.0/perl-dbd-mysql/current/specs/perl-dbd-mysql.spec	2005-05-31 05:12:06 UTC (rev 6392)
@@ -3,7 +3,7 @@
 Summary: MySQL driver for the Perl5 Database Interface (DBI) 
 Name: perl-dbd-mysql
 Version: 2.9004
-Release: 1gd
+Release: 2jh
 License: Artistic, GPL
 Group: extra
 Source: %{perlname}-%{version}.tar.gz
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 2.9004-2jh
+- improve requirements
+
 * Wed Jan 19 2004 Gerald Dachs <gda at tinysofa dot org> 2.9004-1gd
 - initial build
 

Modified: tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec	2005-05-30 18:46:30 UTC (rev 6391)
+++ tinysofa/releases/classic/2.0/perl-dbd-pg/current/specs/perl-dbd-pg.spec	2005-05-31 05:12:06 UTC (rev 6392)
@@ -3,7 +3,7 @@
 Summary: PostgreSQL database driver for the DBI module 
 Name: perl-dbd-pg
 Version: 1.32
-Release: 1gd
+Release: 2jh
 License: Artistic, GPL
 Group: extra
 Source: %{perlname}-%{version}.tar.gz
@@ -47,6 +47,9 @@
 %doc Changes MANIFEST README README.win32 TODO
 
 %changelog
+* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.32-2jh
+- improve requirements
+
 * Wed Jan  19 2005 Gerald Dachs <gda at tinysofa dot org> 1.32-1gd
 - initial build
 

Modified: tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec
===================================================================
--- tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec	2005-05-30 18:46:30 UTC (rev 6391)
+++ tinysofa/releases/classic/2.0/perl-dbi/current/specs/perl-dbi.spec	2005-05-31 05:12:06 UTC (rev 6392)
@@ -6,7 +6,7 @@
 Summary: The Perl Database Interface by Tim Bunce
 Name: perl-dbi
 Version: 1.38
-Release: 3jh
+Release: 4jh
 URL: http://www.cpan.org/
 Source: ftp://ftp.pasteur.fr/pub/computing/CPAN/modules/by-module/DBI/%{real_name}-%{version}.tar.gz
 Patch: DBI-1.38-CAN-2005-0077.patch
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.38-4jh
+- improve requirements
+
 * Fri Jan 28 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.38-2jh
 - CAN-2005-0077 fix
 



From svn at tinysofa.org  Tue May 31 16:26:44 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 31 May 2005 12:26:44 -0400 (EDT)
Subject: [tinysofa-svn] r6393 - in
	tinysofa/releases/classic/2.0/cups/current: sources specs
Message-ID: <20050531162644.98184345176@minbar.tinysofa.org>

Author: jh
Date: 2005-05-31 12:26:34 -0400 (Tue, 31 May 2005)
New Revision: 6393

Added:
   tinysofa/releases/classic/2.0/cups/current/sources/cups-1.1.19-no_rpath.patch
Modified:
   tinysofa/releases/classic/2.0/cups/current/specs/cups.spec
Log:
- add cups-1.1.19-no_rpath.patch

Added: tinysofa/releases/classic/2.0/cups/current/sources/cups-1.1.19-no_rpath.patch
===================================================================
--- tinysofa/releases/classic/2.0/cups/current/sources/cups-1.1.19-no_rpath.patch	2005-05-31 05:12:06 UTC (rev 6392)
+++ tinysofa/releases/classic/2.0/cups/current/sources/cups-1.1.19-no_rpath.patch	2005-05-31 16:26:34 UTC (rev 6393)
@@ -0,0 +1,13 @@
+--- cups-1.1.21rc2/config-scripts/cups-sharedlibs.m4.no_rpath	2004-08-11 15:39:26.000000000 +0100
++++ cups-1.1.21rc2/config-scripts/cups-sharedlibs.m4	2004-08-24 12:33:05.873003900 +0100
+@@ -137,9 +137,7 @@
+                         ;;
+                 Linux | GNU)
+                         # Linux and HURD
+-                	DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+-                        LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+-                        EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
++                        EXPORT_LDFLAGS=""
+                         ;;
+ 	esac
+ else

Modified: tinysofa/releases/classic/2.0/cups/current/specs/cups.spec
===================================================================
--- tinysofa/releases/classic/2.0/cups/current/specs/cups.spec	2005-05-31 05:12:06 UTC (rev 6392)
+++ tinysofa/releases/classic/2.0/cups/current/specs/cups.spec	2005-05-31 16:26:34 UTC (rev 6393)
@@ -1,7 +1,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 3jh
+Release: 4jh
 License: GPL
 Group: main
 Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2
@@ -18,6 +18,7 @@
 Patch9: cups-1.1.19-ppdsdat.patch
 Patch10: cups-pie.patch
 Patch11: cups-CAN-2005-0064.patch
+Patch12: cups-1.1.19-no_rpath.patch
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
 %service_requires
@@ -214,6 +215,9 @@
 
 
 %changelog
+* Tue May 31 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.24-4jh
+- add cups-1.1.19-no_rpath.patch
+
 * Wed Feb  2 2005 Jaakko Heinonen <jh at tinysofa dot org> 1.1.23-2jh
 - fix CAN-2005-0064
 



From svn at tinysofa.org  Tue May 31 16:46:05 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 31 May 2005 12:46:05 -0400 (EDT)
Subject: [tinysofa-svn] r6394 -
	tinysofa/releases/classic/2.0/cups/current/specs
Message-ID: <20050531164605.DD880345110@minbar.tinysofa.org>

Author: jh
Date: 2005-05-31 12:45:59 -0400 (Tue, 31 May 2005)
New Revision: 6394

Modified:
   tinysofa/releases/classic/2.0/cups/current/specs/cups.spec
Log:
- apply the patch actually


Modified: tinysofa/releases/classic/2.0/cups/current/specs/cups.spec
===================================================================
--- tinysofa/releases/classic/2.0/cups/current/specs/cups.spec	2005-05-31 16:26:34 UTC (rev 6393)
+++ tinysofa/releases/classic/2.0/cups/current/specs/cups.spec	2005-05-31 16:45:59 UTC (rev 6394)
@@ -72,6 +72,7 @@
 %patch9 -p1 -b .ppdsdat
 %patch10 -p1 -b .pie
 %patch11 -p1 -b .CAN-2005-0064
+%patch12 -p1
 
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 autoconf



From svn at tinysofa.org  Tue May 31 17:45:22 2005
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 31 May 2005 13:45:22 -0400 (EDT)
Subject: [tinysofa-svn] r6396 -
	tinysofa/releases/classic/2.0/krb5/current/specs
Message-ID: <20050531174522.975123450A2@minbar.tinysofa.org>

Author: jh
Date: 2005-05-31 13:45:14 -0400 (Tue, 31 May 2005)
New Revision: 6396

Modified:
   tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec
Log:
- build without pie


Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec
===================================================================
--- tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec	2005-05-31 17:21:47 UTC (rev 6395)
+++ tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec	2005-05-31 17:45:14 UTC (rev 6396)
@@ -1,7 +1,7 @@
 Summary: Kerberos is a network authentication protocol.
 Name: krb5
 Version: 1.3.6
-Release: 5jh
+Release: 6jh
 Group: main
 Source0: krb5-%{version}.tar.gz
 Patch0: krb5-1.3.6-prof_err.patch
@@ -56,7 +56,6 @@
 %ifarch %{ix86} s390 ppc sparc
 export CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
 %endif
-export LDFLAGS="$LDFLAGS -pie"
 %configure \
 	--enable-shared \
 	--program-prefix=krb5 \