January 2007 - openSUSE Commits - openSUSE Mailing Lists

commit fuse
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package fuse checked in at Tue Jan 30 17:07:28 CET 2007. -------- --- fuse/fuse.changes 2007-01-18 16:40:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2007-01-30 15:58:34.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 30 15:56:22 CET 2007 - tiwai(a)suse.de + +- updated to version 2.6.2: + * fix 64bit compile problems + * fix fuse_teardown problem + * fix unaligned access in file descriptor in libfuse + * fix detection of fuseblk + * fix use after free in fuse_flush + * fix compatible API for opts == NULL + +------------------------------------------------------------------- Old: ---- fuse-2.6.1.tar.bz2 fuse-compat-abort-fix.diff New: ---- fuse-2.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.Q13727/_old 2007-01-30 17:06:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Q13727/_new 2007-01-30 17:06:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.6.1) +# spec file for package fuse (Version 2.6.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,12 @@ Name: fuse Summary: Userspace File System -Version: 2.6.1 -Release: 4 +Version: 2.6.2 +Release: 1 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Patch: fuse-install-fix.diff -Patch1: fuse-compat-abort-fix.diff URL: http://fuse.sf.net BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -55,7 +54,6 @@ %prep %setup -q %patch -%patch1 %{?suse_update_config:%{suse_update_config -f}} %build @@ -105,6 +103,14 @@ %{_libdir}/pkgconfig/*.pc %changelog -n fuse +* Tue Jan 30 2007 - tiwai(a)suse.de +- updated to version 2.6.2: + * fix 64bit compile problems + * fix fuse_teardown problem + * fix unaligned access in file descriptor in libfuse + * fix detection of fuseblk + * fix use after free in fuse_flush + * fix compatible API for opts == NULL * Thu Jan 18 2007 - tiwai(a)suse.de - fix compat API (#233870) * Tue Dec 19 2006 - tiwai(a)suse.de ++++++ fuse-2.6.1.tar.bz2 -> fuse-2.6.2.tar.bz2 ++++++ ++++ 2939 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/ChangeLog new/fuse-2.6.2/ChangeLog --- old/fuse-2.6.1/ChangeLog 2006-12-01 13:48:11.000000000 +0100 +++ new/fuse-2.6.2/ChangeLog 2007-01-30 14:42:10.000000000 +0100 @@ -1,3 +1,60 @@ +2007-01-30 Miklos Szeredi <miklos(a)szeredi.hu> + + * Released 2.6.2 + +2007-01-28 Miklos Szeredi <miklos(a)szeredi.hu> + + * kernel: fix BUG in control filesystem if it is umounted and + mounted again, while some fuse filesystems are present. + Bugreport from Florent Mertens + + * kernel: sync with mainline, support 2.6.20 + +2007-01-22 Miklos Szeredi <miklos(a)szeredi.hu> + + * lib/Makefile.am: actually link libfuse against libfuse_libs + +2007-01-19 Miklos Szeredi <miklos(a)szeredi.hu> + + * Build fix for 2.6.16 vanila and 2.6.15 FC5 kernels. Patch from + Ian Abbott + + * Fix possible double lock in certain cases if request is + interrupted + +2007-01-18 Miklos Szeredi <miklos(a)szeredi.hu> + + * Fix abort in fuse_new() compatibility API for opts == NULL case. + Novell bugzilla #233870. Patch from Takashi Iwai. + +2007-01-02 Miklos Szeredi <miklos(a)szeredi.hu> + + * Fix unaligned access in file desctriptor passing in libfuse, + fusermount and ulockmgr. Debian bug ID: 404904. Reported and + tested by Sebastian Fontius + +2006-12-15 Miklos Szeredi <miklos(a)szeredi.hu> + + * fusermount: Fix detection of fuseblk. Reported by Szakacsits + Szabolcs + + * lib: Fix use after free in fuse_flush(). Reported by Ron + Lindman + +2006-12-04 Miklos Szeredi <miklos(a)szeredi.hu> + + * Fix warnings with gcc-4.1 on 64bit archs. Report from + Harshavardhana + + * Add extra warning options, and fix resulting warnings + + * Really fix fuse_teardown problem + +2006-12-02 Miklos Szeredi <miklos(a)szeredi.hu> + + * Add -lrt to fuse.pc (if needed) to fix static linking against + libfuse. Reported by Szakacsits Szabolcs + 2006-12-01 Miklos Szeredi <miklos(a)szeredi.hu> * Released 2.6.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/configure.in new/fuse-2.6.2/configure.in --- old/fuse-2.6.1/configure.in 2006-12-01 12:58:57.000000000 +0100 +++ new/fuse-2.6.2/configure.in 2007-01-28 18:35:24.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(fuse, 2.6.1) +AC_INIT(fuse, 2.6.2) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AM_CONFIG_HEADER(include/config.h) @@ -20,7 +20,7 @@ esac if test "$ac_env_CFLAGS_set" != set; then - CFLAGS="-Wall -W -g -O2" + CFLAGS="-Wall -W -Wno-sign-compare -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings -g -O2 -fno-strict-aliasing" fi AC_ARG_ENABLE(kernel-module, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/doc/kernel.txt new/fuse-2.6.2/doc/kernel.txt --- old/fuse-2.6.1/doc/kernel.txt 2006-09-30 17:56:09.000000000 +0200 +++ new/fuse-2.6.2/doc/kernel.txt 2007-01-28 23:00:08.000000000 +0100 @@ -94,8 +94,8 @@ filesystem is free to implement it's access policy or leave it to the underlying file access mechanism (e.g. in case of network filesystems). This option enables permission checking, restricting - access based on file mode. This is option is usually useful - together with the 'allow_other' mount option. + access based on file mode. It is usually useful together with the + 'allow_other' mount option. 'allow_other' @@ -132,7 +132,7 @@ 'waiting' - The number of requests which are waiting to be transfered to + The number of requests which are waiting to be transferred to userspace or being processed by the filesystem daemon. If there is no filesystem activity and 'waiting' is non-zero, then the filesystem is hung or deadlocked. @@ -157,7 +157,7 @@ 2) If the request is not yet sent to userspace AND the signal is not fatal, then an 'interrupted' flag is set for the request. When - the request has been successfully transfered to userspace and + the request has been successfully transferred to userspace and this flag is set, an INTERRUPT request is queued. 3) If the request is already sent to userspace, then an INTERRUPT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/fuse.pc.in new/fuse-2.6.2/fuse.pc.in --- old/fuse-2.6.1/fuse.pc.in 2006-06-06 11:18:25.000000000 +0200 +++ new/fuse-2.6.2/fuse.pc.in 2006-12-09 19:52:22.000000000 +0100 @@ -6,5 +6,5 @@ Name: fuse Description: Filesystem in Userspace Version: @VERSION@ -Libs: -L${libdir} -lfuse -pthread +Libs: -L${libdir} -lfuse @libfuse_libs@ Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/include/fuse_compat.h new/fuse-2.6.2/include/fuse_compat.h --- old/fuse-2.6.1/include/fuse_compat.h 2006-09-22 21:21:42.000000000 +0200 +++ new/fuse-2.6.2/include/fuse_compat.h 2006-12-09 19:52:22.000000000 +0100 @@ -62,7 +62,7 @@ size_t op_size, char **mountpoint, int *multithreaded, int *fd); -void fuse_teardown_compat25(struct fuse *fuse, int fd, char *mountpoint); +void fuse_teardown_compat22(struct fuse *fuse, int fd, char *mountpoint); #ifndef __FreeBSD__ #include <sys/statfs.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/include/fuse.h new/fuse-2.6.2/include/fuse.h --- old/fuse-2.6.1/include/fuse.h 2006-11-30 12:53:18.000000000 +0100 +++ new/fuse-2.6.2/include/fuse.h 2006-12-09 19:52:22.000000000 +0100 @@ -624,14 +624,14 @@ fuse_main_real_compat25(argc, argv, op, sizeof(*(op))) # define fuse_new fuse_new_compat25 # define fuse_setup fuse_setup_compat25 -# define fuse_teardown fuse_teardown_compat25 +# define fuse_teardown fuse_teardown_compat22 # define fuse_operations fuse_operations_compat25 # elif FUSE_USE_VERSION == 22 # define fuse_main(argc, argv, op) \ fuse_main_real_compat22(argc, argv, op, sizeof(*(op))) # define fuse_new fuse_new_compat22 # define fuse_setup fuse_setup_compat22 -# define fuse_teardown fuse_teardown_compat25 +# define fuse_teardown fuse_teardown_compat22 # define fuse_operations fuse_operations_compat22 # define fuse_file_info fuse_file_info_compat # elif FUSE_USE_VERSION == 24 @@ -646,7 +646,7 @@ # define fuse_main fuse_main_compat2 # define fuse_new fuse_new_compat2 # define __fuse_setup fuse_setup_compat2 -# define __fuse_teardown fuse_teardown_compat25 +# define __fuse_teardown fuse_teardown_compat22 # define __fuse_exited fuse_exited # define __fuse_set_getcontext_func fuse_set_getcontext_func # else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/config.h.in new/fuse-2.6.2/kernel/config.h.in --- old/fuse-2.6.1/kernel/config.h.in 2006-12-01 13:00:11.000000000 +0100 +++ new/fuse-2.6.2/kernel/config.h.in 2007-01-30 14:43:15.000000000 +0100 @@ -15,6 +15,9 @@ /* lookup_instantiate_filp() is defined */ #undef HAVE_LOOKUP_INSTANTIATE_FILP +/* kernel has mutex.h */ +#undef HAVE_MUTEX_H + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/configure.ac new/fuse-2.6.2/kernel/configure.ac --- old/fuse-2.6.1/kernel/configure.ac 2006-12-01 12:59:05.000000000 +0100 +++ new/fuse-2.6.2/kernel/configure.ac 2007-01-28 23:15:18.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(fuse-kernel, 2.6.1) +AC_INIT(fuse-kernel, 2.6.2) AC_CONFIG_HEADERS([config.h]) AC_PROG_INSTALL @@ -179,6 +179,13 @@ else AC_MSG_RESULT([no]) fi + AC_MSG_CHECKING([if kernel has mutex.h ]) + if test -f $kernelsrc/include/linux/mutex.h; then + AC_DEFINE(HAVE_MUTEX_H, 1, [kernel has mutex.h]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi isuml=no KERNELMAKE_PARAMS= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/control.c new/fuse-2.6.2/kernel/control.c --- old/fuse-2.6.1/kernel/control.c 2006-10-13 11:52:22.000000000 +0200 +++ new/fuse-2.6.2/kernel/control.c 2007-01-28 18:31:03.000000000 +0100 @@ -221,8 +221,12 @@ static void fuse_ctl_kill_sb(struct super_block *sb) { + struct fuse_conn *fc; + mutex_lock(&fuse_mutex); fuse_control_sb = NULL; + list_for_each_entry(fc, &fuse_conn_list, entry) + fc->ctl_ndents = 0; mutex_unlock(&fuse_mutex); kill_litter_super(sb); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/dev.c new/fuse-2.6.2/kernel/dev.c --- old/fuse-2.6.1/kernel/dev.c 2006-11-19 17:02:34.000000000 +0100 +++ new/fuse-2.6.2/kernel/dev.c 2007-01-28 22:26:41.000000000 +0100 @@ -43,7 +43,7 @@ struct fuse_req *fuse_request_alloc(void) { - struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, SLAB_KERNEL); + struct fuse_req *req = kmem_cache_alloc(fuse_req_cachep, GFP_KERNEL); if (req) fuse_request_init(req); return req; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/file.c new/fuse-2.6.2/kernel/file.c --- old/fuse-2.6.1/kernel/file.c 2006-10-20 19:33:56.000000000 +0200 +++ new/fuse-2.6.2/kernel/file.c 2007-01-28 22:25:02.000000000 +0100 @@ -500,10 +500,8 @@ i_size_write(inode, pos); spin_unlock(&fc->lock); - if (offset == 0 && to == PAGE_CACHE_SIZE) { - clear_page_dirty(page); + if (offset == 0 && to == PAGE_CACHE_SIZE) SetPageUptodate(page); - } } fuse_invalidate_attr(inode); return err; @@ -628,15 +626,9 @@ struct inode *inode = file->f_dentry->d_inode; ssize_t res; /* Don't allow parallel writes to the same file */ -#ifdef KERNEL_2_6_16_PLUS mutex_lock(&inode->i_mutex); res = fuse_direct_io(file, buf, count, ppos, 1); mutex_unlock(&inode->i_mutex); -#else - down(&inode->i_sem); - res = fuse_direct_io(file, buf, count, ppos, 1); - up(&inode->i_sem); -#endif return res; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/fuse_i.h new/fuse-2.6.2/kernel/fuse_i.h --- old/fuse-2.6.1/kernel/fuse_i.h 2006-11-28 15:04:45.000000000 +0100 +++ new/fuse-2.6.2/kernel/fuse_i.h 2007-01-28 23:23:29.000000000 +0100 @@ -42,7 +42,7 @@ # define KERNEL_2_6_19_PLUS #endif -#ifdef __arm__ +#if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) #define DCACHE_BUG #endif @@ -55,7 +55,7 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/backing-dev.h> -#ifdef KERNEL_2_6_17_PLUS +#ifdef HAVE_MUTEX_H #include <linux/mutex.h> #else #include <asm/semaphore.h> @@ -65,6 +65,7 @@ #define mutex_lock(m) down(m) #define mutex_unlock(m) up(m) #define mutex semaphore +#define i_mutex i_sem /* Hack for struct inode */ #endif #ifndef KERNEL_2_6_19_PLUS #define clear_nlink(inode) (inode)->i_nlink = 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/kernel/inode.c new/fuse-2.6.2/kernel/inode.c --- old/fuse-2.6.1/kernel/inode.c 2006-11-28 15:04:45.000000000 +0100 +++ new/fuse-2.6.2/kernel/inode.c 2007-01-28 23:55:33.000000000 +0100 @@ -52,7 +52,7 @@ struct inode *inode; struct fuse_inode *fi; - inode = kmem_cache_alloc(fuse_inode_cachep, SLAB_KERNEL); + inode = kmem_cache_alloc(fuse_inode_cachep, GFP_KERNEL); if (!inode) return NULL; @@ -636,8 +636,10 @@ return -EINVAL; if (is_bdev) { +#ifdef CONFIG_BLOCK if (!sb_set_blocksize(sb, d.blksize)) return -EINVAL; +#endif } else { sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; @@ -733,7 +735,24 @@ { return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super, mnt); } +#else +static struct super_block *fuse_get_sb(struct file_system_type *fs_type, + int flags, const char *dev_name, + void *raw_data) +{ + return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super); +} +#endif + +static struct file_system_type fuse_fs_type = { + .owner = THIS_MODULE, + .name = "fuse", + .get_sb = fuse_get_sb, + .kill_sb = kill_anon_super, +}; +#ifdef CONFIG_BLOCK +#ifdef KERNEL_2_6_18_PLUS static int fuse_get_sb_blk(struct file_system_type *fs_type, int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt) @@ -742,13 +761,6 @@ mnt); } #else -static struct super_block *fuse_get_sb(struct file_system_type *fs_type, - int flags, const char *dev_name, - void *raw_data) -{ - return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super); -} - static struct super_block *fuse_get_sb_blk(struct file_system_type *fs_type, int flags, const char *dev_name, void *raw_data) @@ -758,13 +770,6 @@ } #endif -static struct file_system_type fuse_fs_type = { - .owner = THIS_MODULE, - .name = "fuse", - .get_sb = fuse_get_sb, - .kill_sb = kill_anon_super, -}; - static struct file_system_type fuseblk_fs_type = { .owner = THIS_MODULE, .name = "fuseblk", @@ -773,6 +778,26 @@ .fs_flags = FS_REQUIRES_DEV, }; +static inline int register_fuseblk(void) +{ + return register_filesystem(&fuseblk_fs_type); +} + +static inline void unregister_fuseblk(void) +{ + unregister_filesystem(&fuseblk_fs_type); +} +#else +static inline int register_fuseblk(void) +{ + return 0; +} + +static inline void unregister_fuseblk(void) +{ +} +#endif + #ifndef HAVE_FS_SUBSYS static decl_subsys(fs, NULL, NULL); #endif @@ -797,7 +822,7 @@ if (err) goto out; - err = register_filesystem(&fuseblk_fs_type); + err = register_fuseblk(); if (err) goto out_unreg; @@ -812,7 +837,7 @@ return 0; out_unreg2: - unregister_filesystem(&fuseblk_fs_type); + unregister_fuseblk(); out_unreg: unregister_filesystem(&fuse_fs_type); out: @@ -822,7 +847,7 @@ static void fuse_fs_cleanup(void) { unregister_filesystem(&fuse_fs_type); - unregister_filesystem(&fuseblk_fs_type); + unregister_fuseblk(); kmem_cache_destroy(fuse_inode_cachep); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/fuse.c new/fuse-2.6.2/lib/fuse.c --- old/fuse-2.6.1/lib/fuse.c 2006-11-06 12:53:12.000000000 +0100 +++ new/fuse-2.6.2/lib/fuse.c 2007-01-19 23:51:28.000000000 +0100 @@ -1437,16 +1437,14 @@ if (f->conf.kernel_cache) fi->keep_cache = 1; - pthread_mutex_lock(&f->lock); if (fuse_reply_create(req, &e, fi) == -ENOENT) { /* The open syscall was interrupted, so it must be cancelled */ if(f->op.release) fuse_do_release(f, req, path, fi); - pthread_mutex_unlock(&f->lock); forget_node(f, e.ino, 1); } else { - struct node *node = get_node(f, e.ino); - node->open_count ++; + pthread_mutex_lock(&f->lock); + get_node(f, e.ino)->open_count++; pthread_mutex_unlock(&f->lock); } } else @@ -1467,7 +1465,10 @@ static void open_auto_cache(struct fuse *f, fuse_req_t req, fuse_ino_t ino, const char *path, struct fuse_file_info *fi) { - struct node *node = get_node(f, ino); + struct node *node; + + pthread_mutex_lock(&f->lock); + node = get_node(f, ino); if (node->cache_valid) { struct timespec now; @@ -1476,10 +1477,12 @@ struct stat stbuf; int err; + pthread_mutex_unlock(&f->lock); if (f->op.fgetattr) err = fuse_do_fgetattr(f, req, path, &stbuf, fi); else err = fuse_do_getattr(f, req, path, &stbuf); + pthread_mutex_lock(&f->lock); if (!err) update_stat(node, &stbuf); @@ -1491,6 +1494,7 @@ fi->keep_cache = 1; node->cache_valid = 1; + pthread_mutex_unlock(&f->lock); } static void fuse_open(fuse_req_t req, fuse_ino_t ino, @@ -1519,7 +1523,6 @@ if (f->conf.kernel_cache) fi->keep_cache = 1; - pthread_mutex_lock(&f->lock); if (f->conf.auto_cache) open_auto_cache(f, req, ino, path, fi); @@ -1528,10 +1531,10 @@ if(f->op.release && path != NULL) fuse_compat_release(f, req, path, fi); } else { - struct node *node = get_node(f, ino); - node->open_count ++; + pthread_mutex_lock(&f->lock); + get_node(f, ino)->open_count++; + pthread_mutex_unlock(&f->lock); } - pthread_mutex_unlock(&f->lock); } else reply_err(req, err); @@ -1750,7 +1753,6 @@ dh->fh = fi.fh; } if (!err) { - pthread_mutex_lock(&f->lock); if (fuse_reply_open(req, llfi) == -ENOENT) { /* The opendir syscall was interrupted, so it must be cancelled */ @@ -1759,7 +1761,6 @@ pthread_mutex_destroy(&dh->lock); free(dh); } - pthread_mutex_unlock(&f->lock); } else { reply_err(req, err); free(dh); @@ -2295,7 +2296,6 @@ err = -ENOSYS; if (f->op.flush) err = fuse_do_flush(f, req, path, fi); - free(path); } if (f->op.lock) { struct flock lock; @@ -2314,6 +2314,7 @@ if (err == -ENOSYS) err = 0; } + free(path); pthread_rwlock_unlock(&f->tree_lock); reply_err(req, err); } @@ -2948,9 +2949,10 @@ struct fuse *f; struct fuse_args args = FUSE_ARGS_INIT(0, NULL); + if (fuse_opt_add_arg(&args, "") == -1) + return NULL; if (opts && - (fuse_opt_add_arg(&args, "") == -1 || - fuse_opt_add_arg(&args, "-o") == -1 || + (fuse_opt_add_arg(&args, "-o") == -1 || fuse_opt_add_arg(&args, opts) == -1)) { fuse_opt_free_args(&args); return NULL; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/fuse_kern_chan.c new/fuse-2.6.2/lib/fuse_kern_chan.c --- old/fuse-2.6.1/lib/fuse_kern_chan.c 2006-03-18 14:04:57.000000000 +0100 +++ new/fuse-2.6.2/lib/fuse_kern_chan.c 2006-12-09 19:52:22.000000000 +0100 @@ -8,6 +8,7 @@ #include "fuse_lowlevel.h" #include "fuse_kernel.h" +#include "fuse_i.h" #include <stdio.h> #include <errno.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/fuse_lowlevel.c new/fuse-2.6.2/lib/fuse_lowlevel.c --- old/fuse-2.6.1/lib/fuse_lowlevel.c 2006-11-07 17:43:45.000000000 +0100 +++ new/fuse-2.6.2/lib/fuse_lowlevel.c 2006-12-09 19:52:22.000000000 +0100 @@ -11,6 +11,8 @@ #include "fuse_opt.h" #include "fuse_i.h" #include "fuse_misc.h" +#include "fuse_common_compat.h" +#include "fuse_lowlevel_compat.h" #include <stdio.h> #include <stdlib.h> @@ -970,7 +972,8 @@ } if (bufsize < FUSE_MIN_READ_BUFFER) { - fprintf(stderr, "fuse: warning: buffer size too small: %i\n", bufsize); + fprintf(stderr, "fuse: warning: buffer size too small: %zu\n", + bufsize); bufsize = FUSE_MIN_READ_BUFFER; } @@ -1110,7 +1113,7 @@ struct fuse_req *req; if (f->debug) { - printf("unique: %llu, opcode: %s (%i), nodeid: %lu, insize: %i\n", + printf("unique: %llu, opcode: %s (%i), nodeid: %lu, insize: %zu\n", (unsigned long long) in->unique, opname((enum fuse_opcode) in->opcode), in->opcode, (unsigned long) in->nodeid, len); @@ -1294,9 +1297,6 @@ } -#include "fuse_common_compat.h" -#include "fuse_lowlevel_compat.h" - #ifndef __FreeBSD__ static void fill_open_compat(struct fuse_open_out *arg, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/helper.c new/fuse-2.6.2/lib/helper.c --- old/fuse-2.6.1/lib/helper.c 2006-11-11 10:39:25.000000000 +0100 +++ new/fuse-2.6.2/lib/helper.c 2006-12-09 19:52:22.000000000 +0100 @@ -331,6 +331,7 @@ } #undef fuse_main +int fuse_main(void); int fuse_main(void) { fprintf(stderr, "fuse_main(): This function does not exist\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/Makefile.am new/fuse-2.6.2/lib/Makefile.am --- old/fuse-2.6.1/lib/Makefile.am 2006-12-01 12:59:21.000000000 +0100 +++ new/fuse-2.6.2/lib/Makefile.am 2007-01-28 18:46:02.000000000 +0100 @@ -26,10 +26,10 @@ helper.c \ $(mount_source) -libfuse_la_LDFLAGS = $(libfuse_libs) -version-number 2:6:1 \ +libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:2 \ -Wl,--version-script,$(srcdir)/fuse_versionscript libulockmgr_la_SOURCES = ulockmgr.c -libulockmgr_la_LDFLAGS = -version-number 1:0:0 +libulockmgr_la_LDFLAGS = -version-number 1:0:1 EXTRA_DIST = fuse_versionscript diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/mount.c new/fuse-2.6.2/lib/mount.c --- old/fuse-2.6.1/lib/mount.c 2006-11-28 15:04:45.000000000 +0100 +++ new/fuse-2.6.2/lib/mount.c 2007-01-02 18:10:33.000000000 +0100 @@ -9,6 +9,7 @@ #include "config.h" #include "fuse_i.h" #include "fuse_opt.h" +#include "fuse_common_compat.h" #include <stdio.h> #include <stdlib.h> @@ -150,7 +151,7 @@ struct iovec iov; char buf[1]; int rv; - char ccmsg[CMSG_SPACE(sizeof(int))]; + size_t ccmsg[CMSG_SPACE(sizeof(int)) / sizeof(size_t)]; struct cmsghdr *cmsg; iov.iov_base = buf; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/lib/ulockmgr.c new/fuse-2.6.2/lib/ulockmgr.c --- old/fuse-2.6.1/lib/ulockmgr.c 2006-10-08 15:29:08.000000000 +0200 +++ new/fuse-2.6.2/lib/ulockmgr.c 2007-01-02 18:10:33.000000000 +0100 @@ -75,7 +75,7 @@ struct msghdr msg; struct cmsghdr *p_cmsg; struct iovec vec; - char cmsgbuf[CMSG_SPACE(sizeof(int) * MAX_SEND_FDS)]; + size_t cmsgbuf[CMSG_SPACE(sizeof(int) * MAX_SEND_FDS) / sizeof(size_t)]; int res; assert(numfds <= MAX_SEND_FDS); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/util/fusermount.c new/fuse-2.6.2/util/fusermount.c --- old/fuse-2.6.1/util/fusermount.c 2006-11-29 16:56:01.000000000 +0100 +++ new/fuse-2.6.2/util/fusermount.c 2007-01-02 18:10:33.000000000 +0100 @@ -141,7 +141,7 @@ filenames. */ static int check_name(const char *name) { - char *s; + const char *s; for (s = "\n\t\\"; *s; s++) { if (strchr(name, *s)) { fprintf(stderr, "%s: illegal character 0x%02x in mount entry\n", @@ -583,7 +583,7 @@ return 1; while (fgets(buf, sizeof(buf), f)) - if (strcmp(buf, "fuseblk\n") == 0) { + if (strstr(buf, "fuseblk\n")) { fclose(f); return 1; } @@ -1036,7 +1036,7 @@ struct msghdr msg; struct cmsghdr *p_cmsg; struct iovec vec; - char cmsgbuf[CMSG_SPACE(sizeof(fd))]; + size_t cmsgbuf[CMSG_SPACE(sizeof(fd)) / sizeof(size_t)]; int *p_fds; char sendchar = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.6.1/util/ulockmgr_server.c new/fuse-2.6.2/util/ulockmgr_server.c --- old/fuse-2.6.1/util/ulockmgr_server.c 2006-10-08 17:25:57.000000000 +0200 +++ new/fuse-2.6.2/util/ulockmgr_server.c 2007-01-02 18:10:33.000000000 +0100 @@ -58,7 +58,7 @@ { struct msghdr msg; struct iovec iov; - char ccmsg[CMSG_SPACE(sizeof(int)) * MAX_SEND_FDS]; + size_t ccmsg[CMSG_SPACE(sizeof(int) * MAX_SEND_FDS) / sizeof(size_t)]; struct cmsghdr *cmsg; int res; int i; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics3
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package kdegraphics3 checked in at Tue Jan 30 15:41:55 CET 2007. -------- --- KDE/kdegraphics3/kdegraphics3.changes 2007-01-25 12:02:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdegraphics3/kdegraphics3.changes 2007-01-30 15:20:14.359675000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 30 15:20:03 CET 2007 - ro(a)suse.de + +- remove BuildRequires for hp-officejet + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.fi8942/_old 2007-01-30 15:41:39.000000000 +0100 +++ /var/tmp/diff_new_pack.fi8942/_new 2007-01-30 15:41:39.000000000 +0100 @@ -21,9 +21,6 @@ %if %suse_version > 1010 BuildRequires: libgphoto2-devel %endif -%ifarch %ix86 ia64 x86_64 -BuildRequires: hp-officeJet -%endif License: GNU General Public License (GPL) Group: Productivity/Graphics/Viewers Provides: kuickshow kdegraphics3-kfile-plugins kgamma @@ -32,7 +29,7 @@ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Summary: Base Libraries for KDE Graphics Applications Version: 3.5.6 -Release: 2 +Release: 3 Source0: kdegraphics-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: prefer-kpdf.diff @@ -642,6 +639,8 @@ /opt/kde3/include/*.h %changelog -n kdegraphics3 +* Tue Jan 30 2007 - ro(a)suse.de +- remove BuildRequires for hp-officejet * Thu Jan 25 2007 - stbinner(a)suse.de - add 3_5_BRANCH.diff to fix build on BETA * Tue Jan 16 2007 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit man-pages-pl
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package man-pages-pl checked in at Tue Jan 30 15:38:52 CET 2007. -------- --- man-pages-pl/man-pages-pl.changes 2006-07-13 08:56:12.000000000 +0200 +++ /mounts/work_src_done/NOARCH/man-pages-pl/man-pages-pl.changes 2007-01-30 12:08:32.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 30 12:08:14 CET 2007 - mskibbe(a)suse.de + +- file conflict between vim and man-pages-pl (#239785) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages-pl.spec ++++++ --- /var/tmp/diff_new_pack.H22253/_old 2007-01-30 15:38:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H22253/_new 2007-01-30 15:38:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package man-pages-pl (Version 2006.7.13) +# spec file for package man-pages-pl (Version 2007.1.30) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,10 +11,10 @@ # norootforbuild Name: man-pages-pl -License: Other License(s), see package, LDPL +License: GNU General Public License (GPL), Linux Documentation Project License (LDPL) Group: Documentation/Man Autoreqprov: off -Version: 2006.7.13 +Version: 2007.1.30 Release: 1 Summary: LDP man Pages (Polish) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +44,7 @@ rm man1/evim.1 rm man1/ex.1 rm man1/gview.1 +rm man1/eview.1 rm man1/gvim.1 rm man1/gvimdiff.1 rm man1/rgview.1 @@ -70,6 +71,8 @@ %{_mandir}/pl %changelog -n man-pages-pl +* Tue Jan 30 2007 - mskibbe(a)suse.de +- file conflict between vim and man-pages-pl (#239785) * Thu Jul 13 2006 - hvogel(a)suse.de - remove vim man pages, they are provided by vim now * Wed Feb 22 2006 - hvogel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghostscript-cjk
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package ghostscript-cjk checked in at Tue Jan 30 15:38:37 CET 2007. -------- --- ghostscript-cjk/ghostscript-cjk.changes 2006-12-19 14:18:24.000000000 +0100 +++ /mounts/work_src_done/NOARCH/ghostscript-cjk/ghostscript-cjk.changes 2007-01-30 13:15:14.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 30 13:14:14 CET 2007 - mfabian(a)suse.de + +- Bugzilla #239692: acroread moved to /usr/lib for openSUSE > 10.2, + adapt the script acroread-cidfont-config. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-cjk.spec ++++++ --- /var/tmp/diff_new_pack.g21019/_old 2007-01-30 15:38:20.000000000 +0100 +++ /var/tmp/diff_new_pack.g21019/_new 2007-01-30 15:38:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghostscript-cjk (Version 20050315) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -16,7 +16,7 @@ Autoreqprov: on Provides: locale(ghostscript-library:ja;ko;zh) Version: 20050315 -Release: 41 +Release: 44 Requires: ghostscript-library >= 8.15, ft2demos Obsoletes: CMap-Adobe-Identity,CMap-Adobe-Japan2,CMap-Adobe-Korea1,CMap-Adobe-GB1,CMap-Adobe-CNS1,CMap-Adobe-Japan1 URL: http://www.gyve.org/gs-cjk/ @@ -94,6 +94,9 @@ %{_mandir}/*/* %changelog -n ghostscript-cjk +* Tue Jan 30 2007 - mfabian(a)suse.de +- Bugzilla #239692: acroread moved to /usr/lib for openSUSE > 10.2, + adapt the script acroread-cidfont-config. * Tue Dec 19 2006 - mfabian(a)suse.de - disable the generation of CID-keyed font setup when mkcfm is missing. Support for CID-keyed fonts has been dropped from ++++++ acroread-cidfont-config ++++++ --- ghostscript-cjk/acroread-cidfont-config 2005-09-01 18:19:29.000000000 +0200 +++ /mounts/work_src_done/NOARCH/ghostscript-cjk/acroread-cidfont-config 2007-01-30 13:13:53.000000000 +0100 @@ -52,7 +52,7 @@ my $cmap_dir = "/usr/share/ghostscript/Resource/CMap"; my $cidfont_dir = "/usr/share/ghostscript/Resource/CIDFont"; -my $acrobat_dir = "/usr/X11R6/lib/Acrobat7/Resource/Font"; +my $acrobat_dir = search_directory ("/usr/lib/Acrobat7/Resource/Font", "/usr/X11R6/lib/Acrobat7/Resource/Font"); my %cidfont_replacements = ( @@ -146,6 +146,24 @@ chdir $cwd || die "Can't cd to $cwd: $!\n"; } +sub search_executable { + for my $file (@_) { + if (-x $file) { + return $file; + } + } + return ""; +} + +sub search_directory { + for my $dir (@_) { + if (-d $dir) { + return $dir; + } + } + return ""; +} + sub my_system { my ($command) = @_; if ($OPT_VERBOSE) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nss_ldap
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package nss_ldap checked in at Tue Jan 30 15:34:44 CET 2007. -------- --- nss_ldap/nss_ldap.changes 2007-01-15 14:37:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/nss_ldap/nss_ldap.changes 2007-01-30 14:13:34.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 30 14:12:23 CET 2007 - rhafer(a)suse.de + +- Apply the "port" directive correctly if present in ldap.conf + (Bug #224879) + +------------------------------------------------------------------- New: ---- nss_ldap-parse_ldap_port.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss_ldap.spec ++++++ --- /var/tmp/diff_new_pack.e10539/_old 2007-01-30 15:30:53.000000000 +0100 +++ /var/tmp/diff_new_pack.e10539/_new 2007-01-30 15:30:53.000000000 +0100 @@ -17,7 +17,7 @@ PreReq: /usr/bin/grep /usr/bin/sed /bin/mktemp Autoreqprov: on Version: 254 -Release: 1 +Release: 2 Summary: NSS LDAP Module URL: http://www.padl.com/OSS/nss_ldap.html Source: nss_ldap-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Patch: nss_ldap.dif Patch1: sigset.dif Patch2: group-utf8.dif +Patch3: nss_ldap-parse_ldap_port.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,6 +45,7 @@ %patch -p1 %patch1 %patch2 -p1 +%patch3 cp -v %{S:1} . %build @@ -102,6 +104,9 @@ %doc %{_mandir}/man5/nss_ldap.5* %changelog -n nss_ldap +* Tue Jan 30 2007 - rhafer(a)suse.de +- Apply the "port" directive correctly if present in ldap.conf + (Bug #224879) * Mon Jan 15 2007 - rhafer(a)suse.de - Update to nss_ldap-254 * fix for BUG#292: array bounds check in ldap-network.c ++++++ nss_ldap-parse_ldap_port.dif ++++++ --- ldap-nss.c 2007/01/30 13:05:13 1.1 +++ ldap-nss.c 2007/01/30 13:06:06 @@ -1016,7 +1016,7 @@ /* we should be looking for the second instance to find the port number */ if (p != NULL) { - p = strchr (p, ':'); + p = strchr (++p, ':'); } #ifdef HAVE_LDAP_INITIALIZE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Tue Jan 30 15:29:46 CET 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-01-09 18:31:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-01-30 07:44:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 30 07:43:09 CET 2007 - sndirsch(a)suse.de + +- rn50_pixel_clock_limit.patch: + * resolves video corruption problem on ES1000 (X.Org Bug #5766) + +------------------------------------------------------------------- New: ---- rn50_pixel_clock_limit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.Uw6247/_old 2007-01-30 15:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Uw6247/_new 2007-01-30 15:28:37.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 48 +Release: 50 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -82,6 +82,7 @@ Patch18: radeon-vbios-ppc.diff Patch24: xf86-video-intel.modesetting.diff Patch25: xf86-video-intel.modesetting-sdvo-stuffing.diff +Patch26: rn50_pixel_clock_limit.patch %description This package contains X.Org video drivers. @@ -96,6 +97,7 @@ %patch1 -p1 %patch2 -p0 %patch18 -p1 +%patch26 -p2 popd pushd xf86-video-nv-*/src %patch3 -p6 @@ -200,6 +202,9 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Tue Jan 30 2007 - sndirsch(a)suse.de +- rn50_pixel_clock_limit.patch: + * resolves video corruption problem on ES1000 (X.Org Bug #5766) * Tue Jan 09 2007 - sndirsch(a)suse.de - updated i810 driver to release 1.7.4 * Fix bug #8536, i915 BIOS fails when restarting Xserver. ++++++ rn50_pixel_clock_limit.patch ++++++ --- xf86-video-ati-6.6.3/src/radeon_driver.c.orig 2007-01-30 10:57:16.000000000 +0000 +++ xf86-video-ati-6.6.3/src/radeon_driver.c 2007-01-30 11:13:50.000000000 +0000 @@ -1713,18 +1713,6 @@ info->mclk = 200.00; } - if (info->ChipFamily == CHIP_FAMILY_RV100 && !info->HasCRTC2) { - /* Avoid RN50 corruption due to memory bandwidth starvation. - * 18 is an empirical value based on the databook and Windows driver. - * - * Empirical value changed to 24 to raise pixel clock limit and - * allow higher resolution modes on capable monitors - */ - pll->max_pll_freq = min(pll->max_pll_freq, - 24 * info->mclk * 100 / pScrn->bitsPerPixel * - info->RamWidth / 16); - } - xf86DrvMsg (pScrn->scrnIndex, X_INFO, "PLL parameters: rf=%d rd=%d min=%ld max=%ld; xclk=%d\n", pll->reference_freq, @@ -3851,6 +3839,12 @@ clockRanges->interlaceAllowed = (info->MergeType == MT_CRT); clockRanges->doubleScanAllowed = (info->MergeType == MT_CRT); + if (info->ChipFamily == CHIP_FAMILY_RV100 ) { + if(!info->HasCRTC2) + clockRanges->maxClock = + min(clockRanges->maxClock, (440000 / ((pScrn->bitsPerPixel+7)/8))); + } + /* We'll use our own mode validation routine for DFP/LCD, since * xf86ValidateModes does not work correctly with the DFP/LCD modes * 'stretched' from their native mode. @@ -4116,6 +4110,12 @@ clockRanges->interlaceAllowed = (info->DisplayType == MT_CRT); clockRanges->doubleScanAllowed = (info->DisplayType == MT_CRT); + if (info->ChipFamily == CHIP_FAMILY_RV100) { + if(!info->HasCRTC2) + clockRanges->maxClock = + min(clockRanges->maxClock, (440000 / ((pScrn->bitsPerPixel+7)/8))); + } + /* We'll use our own mode validation routine for DFP/LCD, since * xf86ValidateModes does not work correctly with the DFP/LCD modes * 'stretched' from their native mode. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-TermReadLine-Gnu
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package perl-TermReadLine-Gnu checked in at Tue Jan 30 15:26:36 CET 2007. -------- --- perl-TermReadLine-Gnu/perl-TermReadLine-Gnu.changes 2006-08-28 18:38:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-TermReadLine-Gnu/perl-TermReadLine-Gnu.changes 2007-01-30 11:39:28.428057000 +0100 @@ -1,0 +2,15 @@ +Tue Jan 30 11:38:44 CET 2007 - ms(a)suse.de + +- update to version 1.16 + +1.16 2006-04-02 + - fix Makefile.PL to work with the latest Cygwin. + (Use 1.15 for old Cygwin.) + - readline-5.1 support + new function + variable_value + reset_screen_size + new variable + prefer_env_winsize + +------------------------------------------------------------------- Old: ---- Term-ReadLine-Gnu-1.15.dif Term-ReadLine-Gnu-1.15.tar.bz2 New: ---- Term-ReadLine-Gnu-1.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-TermReadLine-Gnu.spec ++++++ --- /var/tmp/diff_new_pack.gpD472/_old 2007-01-30 15:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.gpD472/_new 2007-01-30 15:26:22.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-TermReadLine-Gnu (Version 1.15) +# spec file for package perl-TermReadLine-Gnu (Version 1.16) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,17 +12,17 @@ Name: perl-TermReadLine-Gnu BuildRequires: readline-devel -Version: 1.15 -Release: 14 +Version: 1.16 +Release: 1 Requires: readline Requires: perl = %{perl_version} Autoreqprov: on Group: Development/Libraries/Perl -License: GPL -URL: www.cpan.org +License: GNU General Public License (GPL) +URL: http://search.cpan.org/~hayashi/Term-ReadLine-Gnu-1.16 Summary: Perl extension for the GNU Readline/History Library -Source: Term-ReadLine-Gnu-%{version}.tar.bz2 -Patch: Term-ReadLine-Gnu-%{version}.dif +Source: Term-ReadLine-Gnu-%{version}.tar.gz +#Patch: Term-ReadLine-Gnu-%{version}.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,7 +39,7 @@ %prep %setup -n Term-ReadLine-Gnu-%{version} -%patch +#%patch %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS" @@ -66,6 +66,17 @@ /var/adm/perl-modules/%{name} %changelog -n perl-TermReadLine-Gnu +* Tue Jan 30 2007 - ms(a)suse.de +- update to version 1.16 + 1.16 2006-04-02 + - fix Makefile.PL to work with the latest Cygwin. + (Use 1.15 for old Cygwin.) + - readline-5.1 support + new function + variable_value + reset_screen_size + new variable + prefer_env_winsize * Mon Aug 28 2006 - ms(a)suse.de - synchronize the outstream fd inside the readline library (#200843) * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-NetAddr-IP
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package perl-NetAddr-IP checked in at Tue Jan 30 15:26:16 CET 2007. -------- --- perl-NetAddr-IP/perl-NetAddr-IP.changes 2006-05-08 11:10:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-NetAddr-IP/perl-NetAddr-IP.changes 2007-01-30 11:33:17.390445000 +0100 @@ -1,0 +2,40 @@ +Tue Jan 30 10:53:27 CET 2007 - ms(a)suse.de + +- update to version 4.00.4 + +4.004 Wed Aug 16 16:01:54 PDT 2006 + update to include/exclude files in corrupted distro + +4.003 Sun Aug 6 10:48:25 PDT 2006 + correct SYNOPSIS documentation + add :old_nth + + update Lite.pm documentation + update Util.pm documentation + Imported into distribution CVS tree - Some revision number + mismatches are to be expected + Latin-1 is back + Fixed some angle brackets so that they show up in the docs + +4.002 Fri Aug 4 14:14:16 PDT 2006 + remove unused global variable $isV6 + + update Lite.pm to v1.02 + $isV6 global converted to a lexical variable within sub "_xnew" + $Class global removed and replaced by calls to UNIVERSAL::isa + Thanks to julian(a)mehnle.net for spotting problems related to + using the Lite.pm with mod_perl + +4.001 Thu Jul 6 14:09:01 PDT 2006 + various bug fixes courtesy of Luis Munoz: + changes to Lite.pm v1.01, Util.pm v0.17 see Changes in those distros. + update t/v6-re.t, addconst called as a scalar, should be called to + return the address value ()[1] + +4.000 Mon Jun 19 21:51:10 PDT 2006 + initial release of version 4.000 which includes + full support of ipV6 addresses and drops the requirement + for Math::BigInt and will run on older versions of Perl + at least back to 5.005_03 + +------------------------------------------------------------------- Old: ---- NetAddr-IP-3.32.tar.gz New: ---- NetAddr-IP-4.004.dif NetAddr-IP-4.004.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-NetAddr-IP.spec ++++++ --- /var/tmp/diff_new_pack.d31684/_old 2007-01-30 15:25:35.000000000 +0100 +++ /var/tmp/diff_new_pack.d31684/_new 2007-01-30 15:25:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-NetAddr-IP (Version 3.32) +# spec file for package perl-NetAddr-IP (Version 4.004) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,11 +15,12 @@ Group: Development/Libraries/Perl Provides: NetAddr Autoreqprov: on -Version: 3.32 +Version: 4.004 Release: 1 Summary: NetAddr::IP - Manages IP addresses and subnets -Url: http://search.cpan.org +URL: http://search.cpan.org/~luismunoz/NetAddr-IP-4.004 Source: NetAddr-IP-%{version}.tar.gz +Patch: NetAddr-IP-%{version}.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,6 +38,7 @@ %prep %setup -n NetAddr-IP-%{version} +%patch %build CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL @@ -53,15 +55,50 @@ %files %defattr(-,root,root) %doc README -%dir %{perl_vendorlib}/NetAddr +%dir %{perl_vendorarch}/NetAddr %dir %{perl_vendorarch}/auto/NetAddr %dir %{perl_vendorarch}/auto/NetAddr/IP -%{perl_vendorlib}/NetAddr/IP.pm +%{perl_vendorarch}/NetAddr/IP.pm +%{perl_vendorarch}/NetAddr/IP %{perl_vendorarch}/auto/NetAddr/IP/.packlist +%{perl_vendorarch}/auto/NetAddr/IP %doc %{_mandir}/man?/NetAddr::IP.3pm.gz +%doc %{_mandir}/man?/NetAddr::IP::Lite.3pm.gz +%doc %{_mandir}/man?/NetAddr::IP::Util.3pm.gz +%doc %{_mandir}/man?/NetAddr::IP::UtilPP.3pm.gz /var/adm/perl-modules/%{name} %changelog -n perl-NetAddr-IP +* Tue Jan 30 2007 - ms(a)suse.de +- update to version 4.00.4 + 4.004 Wed Aug 16 16:01:54 PDT 2006 + update to include/exclude files in corrupted distro + 4.003 Sun Aug 6 10:48:25 PDT 2006 + correct SYNOPSIS documentation + add :old_nth + update Lite.pm documentation + update Util.pm documentation + Imported into distribution CVS tree - Some revision number + mismatches are to be expected + Latin-1 is back + Fixed some angle brackets so that they show up in the docs + 4.002 Fri Aug 4 14:14:16 PDT 2006 + remove unused global variable $isV6 + update Lite.pm to v1.02 + $isV6 global converted to a lexical variable within sub "_xnew" + $Class global removed and replaced by calls to UNIVERSAL::isa + Thanks to julian(a)mehnle.net for spotting problems related to + using the Lite.pm with mod_perl + 4.001 Thu Jul 6 14:09:01 PDT 2006 + various bug fixes courtesy of Luis Munoz: + changes to Lite.pm v1.01, Util.pm v0.17 see Changes in those distros. + update t/v6-re.t, addconst called as a scalar, should be called to + return the address value ()[1] + 4.000 Mon Jun 19 21:51:10 PDT 2006 + initial release of version 4.000 which includes + full support of ipV6 addresses and drops the requirement + for Math::BigInt and will run on older versions of Perl + at least back to 5.005_03 * Mon May 08 2006 - ms(a)suse.de - update to version 3.32 * Wed Jan 25 2006 - mls(a)suse.de ++++++ NetAddr-IP-4.004.dif ++++++ --- Lite/Util/Util.xs +++ Lite/Util/Util.xs 2007/01/30 10:29:48 @@ -192,8 +192,9 @@ #ifdef host_is_LITTLE_ENDIAN register u_int32_t * a = ap; for (/* -- */;len >0;len--) { - *a++ = (((*a & 0xff000000) >> 24) | ((*a & 0x00ff0000) >> 8) | \ - ((*a & 0x0000ff00) << 8) | ((*a & 0x000000ff) << 24)); + *a = (((*a & 0xff000000) >> 24) | ((*a & 0x00ff0000) >> 8) | \ + ((*a & 0x0000ff00) << 8) | ((*a & 0x000000ff) << 24)); + a++; } #endif } @@ -259,6 +260,7 @@ _128x2(ap); /* times 8 */ (void) adder128(ap,tp,0); /* printf("x %04X:%04X:%04X:%04X\n",*((u_int32_t *)ap),*((u_int32_t *)ap +1),*((u_int32_t *)ap +2),*((u_int32_t *)ap +3)); */ + return 0; } /* multiply 128 bit number by 10, add bcd digit to result ++++++ NetAddr-IP-3.32.tar.gz -> NetAddr-IP-4.004.tar.gz ++++++ ++++ 16572 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nagios-nrpe
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package nagios-nrpe checked in at Tue Jan 30 15:24:03 CET 2007. -------- --- nagios-nrpe/nagios-nrpe.changes 2006-07-01 08:53:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2007-01-30 11:03:46.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 30 11:00:36 CET 2007 - tsieden(a)suse.de + +- update to version 2.6 + * Added -u option to check_nrpe to return UNKNOWN states on socket + timeouts (Bjoern Beutel) + * Added connection_timeout variable to NRPE daemon to catch dead + client connections (Ton Voon) + * Added graceful timeout to check_nrpe to ensure connection to + NRPE daemon is properly closed (Mark Plaksin) + +------------------------------------------------------------------- Old: ---- nrpe-2.5.2.tar.bz2 New: ---- nrpe-2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-nrpe.spec ++++++ --- /var/tmp/diff_new_pack.u27216/_old 2007-01-30 15:23:57.000000000 +0100 +++ /var/tmp/diff_new_pack.u27216/_new 2007-01-30 15:23:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package nagios-nrpe (Version 2.5.2) +# spec file for package nagios-nrpe (Version 2.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,11 +12,11 @@ Name: nagios-nrpe BuildRequires: nagios-plugins openssl-devel tcpd-devel -License: GPL +License: GNU General Public License (GPL) Group: System/Monitoring Requires: nagios-plugins inet-daemon Autoreqprov: on -Version: 2.5.2 +Version: 2.6 Release: 1 Source0: nrpe-%{version}.tar.bz2 Source1: rcnrpe @@ -96,6 +96,14 @@ %config(noreplace) /etc/xinetd.d/nagios-nrpe %changelog -n nagios-nrpe +* Tue Jan 30 2007 - tsieden(a)suse.de +- update to version 2.6 + * Added -u option to check_nrpe to return UNKNOWN states on socket + timeouts (Bjoern Beutel) + * Added connection_timeout variable to NRPE daemon to catch dead + client connections (Ton Voon) + * Added graceful timeout to check_nrpe to ensure connection to + NRPE daemon is properly closed (Mark Plaksin) * Sat Jul 01 2006 - stark(a)suse.de - update to version 2.5.2 * number of bugfixes @@ -145,7 +153,7 @@ * Mon Jan 13 2003 - stark(a)suse.de - update to 1.7 * Syntax changes (-H option specifies host name in check_nrpe, --c option specifies config file in nrpe) + -c option specifies config file in nrpe) * Added command_timeout directive to config file to allow user to specify timeout for executing plugins * Thu Sep 26 2002 - stark(a)suse.de ++++++ nrpe-2.5.2.tar.bz2 -> nrpe-2.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/Changelog new/nrpe-2.6/Changelog --- old/nrpe-2.5.2/Changelog 2006-07-01 00:00:27.000000000 +0200 +++ new/nrpe-2.6/Changelog 2006-12-12 03:03:59.000000000 +0100 @@ -2,6 +2,12 @@ NRPE Changelog ************** +2.6 - 12/11/2006 +------------------ +- Added -u option to check_nrpe to return UNKNOWN states on socket timeouts (Bjoern Beutel) +- Added connection_timeout variable to NRPE daemon to catch dead client connections (Ton Voon) +- Added graceful timeout to check_nrpe to ensure connection to NRPE daemon is properly closed (Mark Plaksin) + 2.5.2 - 06/30/2006 ------------------ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/configure new/nrpe-2.6/configure --- old/nrpe-2.5.2/configure 2006-07-01 00:00:27.000000000 +0200 +++ new/nrpe-2.6/configure 2006-12-12 03:03:59.000000000 +0100 @@ -1294,9 +1294,9 @@ PKG_NAME=nrpe -PKG_VERSION="2.5.2" +PKG_VERSION="2.6" PKG_HOME_URL="http://www.nagios.org/" -PKG_REL_DATE="06-30-2006" +PKG_REL_DATE="12-11-2006" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -5654,7 +5654,8 @@ -for ac_func in strdup strstr strtoul initgroups + +for ac_func in strdup strstr strtoul initgroups closesocket do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/configure.in new/nrpe-2.6/configure.in --- old/nrpe-2.5.2/configure.in 2006-07-01 00:00:27.000000000 +0200 +++ new/nrpe-2.6/configure.in 2006-12-12 03:03:59.000000000 +0100 @@ -9,9 +9,9 @@ AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nrpe -PKG_VERSION="2.5.2" +PKG_VERSION="2.6" PKG_HOME_URL="http://www.nagios.org/" -PKG_REL_DATE="06-30-2006" +PKG_REL_DATE="12-11-2006" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL @@ -95,7 +95,7 @@ AC_DEFINE(HAVE_LIBWRAP) ]) AC_SUBST(LIBWRAPLIBS) -AC_CHECK_FUNCS(strdup strstr strtoul initgroups) +AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket) dnl socklen_t check - from curl AC_CHECK_TYPE([socklen_t], ,[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/common.h new/nrpe-2.6/include/common.h --- old/nrpe-2.5.2/include/common.h 2006-04-10 03:42:29.000000000 +0200 +++ new/nrpe-2.6/include/common.h 2006-12-12 03:03:59.000000000 +0100 @@ -1,8 +1,8 @@ /************************************************************************ * * COMMON.H - NRPE Common Include File - * Copyright (c) 1999-2003 Ethan Galstad (nagios(a)nagios.org) - * Last Modified: 03-05-2003 + * Copyright (c) 1999-2006 Ethan Galstad (nagios(a)nagios.org) + * Last Modified: 12-11-2006 * * License: * @@ -23,8 +23,8 @@ #include "config.h" -#define PROGRAM_VERSION "2.5.1" -#define MODIFICATION_DATE "04-09-2006" +#define PROGRAM_VERSION "2.6" +#define MODIFICATION_DATE "12-11-2006" #define OK 0 #define ERROR -1 @@ -39,6 +39,7 @@ #define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */ +#define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting for connection more than this time */ #define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */ #define MAX_FILENAME_LENGTH 256 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/config.h.in new/nrpe-2.6/include/config.h.in --- old/nrpe-2.5.2/include/config.h.in 2006-01-21 00:44:09.000000000 +0100 +++ new/nrpe-2.6/include/config.h.in 2006-12-12 03:03:59.000000000 +0100 @@ -2,7 +2,7 @@ * * NRPE Common Header File * Copyright (c) 1999-2006 Ethan Galstad (nagios(a)nagios.org) - * Last Modified: 01-20-2006 + * Last Modified: 12-11-2006 * * License: * @@ -43,6 +43,7 @@ #undef HAVE_STRSTR #undef HAVE_STRTOUL #undef HAVE_INITGROUPS +#undef HAVE_CLOSESOCKET #undef SIZEOF_INT #undef SIZEOF_SHORT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/dh.h new/nrpe-2.6/include/dh.h --- old/nrpe-2.5.2/include/dh.h 2006-04-28 18:41:54.000000000 +0200 +++ new/nrpe-2.6/include/dh.h 2006-12-12 03:04:00.000000000 +0100 @@ -4,12 +4,12 @@ DH *get_dh512() { static unsigned char dh512_p[]={ - 0xDD,0xFE,0xAB,0x05,0xB7,0x0F,0xD8,0xDA,0x6D,0xAD,0x7C,0xD8, - 0x5D,0x9E,0xE9,0xE6,0x79,0x28,0x19,0xE7,0xAA,0xA9,0x56,0xD1, - 0xDE,0x11,0xD0,0x89,0x8D,0x63,0x2D,0xB1,0xDD,0x29,0x4F,0x83, - 0x7A,0xAB,0x85,0xAA,0xE8,0xB7,0x4D,0x4F,0x8E,0x16,0x90,0xA3, - 0xBD,0x55,0x57,0xE8,0x21,0x77,0xE9,0x5D,0x87,0x5C,0xF1,0xFA, - 0x81,0xC0,0xD5,0xF3, + 0xF7,0xA2,0x46,0xB0,0x6F,0x77,0xC4,0xD1,0x98,0x62,0xBD,0x55, + 0x3F,0x6C,0x49,0x9E,0x0B,0x2D,0xDE,0xA3,0x51,0x36,0xA5,0xBF, + 0xF8,0x1C,0xC1,0xD3,0xA1,0xD8,0x69,0x06,0xB1,0x21,0x87,0xF2, + 0x9E,0x74,0x30,0x4E,0x56,0x09,0x8C,0x4F,0xD3,0x9A,0xDA,0xB8, + 0x37,0x72,0xA0,0x71,0x69,0x52,0x33,0x62,0x16,0xC3,0xE6,0xA0, + 0x8A,0x98,0xEF,0xFB, }; static unsigned char dh512_g[]={ 0x02, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/nrpe.h new/nrpe-2.6/include/nrpe.h --- old/nrpe-2.5.2/include/nrpe.h 2006-02-23 23:48:26.000000000 +0100 +++ new/nrpe-2.6/include/nrpe.h 2006-12-12 03:04:00.000000000 +0100 @@ -52,6 +52,7 @@ int process_macros(char *,char *,int); int my_system(char *,int,int *,char *,int); /* executes a command via popen(), but also protects against timeouts */ void my_system_sighandler(int); /* handles timeouts when executing commands via my_system() */ +void my_connection_sighandler(int); /* handles timeouts of connection */ void sighandler(int); void child_sighandler(int); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/utils.h new/nrpe-2.6/include/utils.h --- old/nrpe-2.5.2/include/utils.h 2003-10-16 01:21:23.000000000 +0200 +++ new/nrpe-2.6/include/utils.h 2006-12-12 03:04:00.000000000 +0100 @@ -3,9 +3,9 @@ * UTILS.H - NRPE Utilities Include File * * License: GPL - * Copyright (c) 1999-2003 Ethan Galstad (nagios(a)nagios.org) + * Copyright (c) 1999-2006 Ethan Galstad (nagios(a)nagios.org) * - * Last Modified: 10-14-2003 + * Last Modified: 12-11-2006 * * Description: * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/nrpe.spec new/nrpe-2.6/nrpe.spec --- old/nrpe-2.5.2/nrpe.spec 2006-07-01 00:00:27.000000000 +0200 +++ new/nrpe-2.6/nrpe.spec 2006-12-12 03:03:59.000000000 +0100 @@ -1,5 +1,5 @@ %define name nrpe -%define version 2.5.2 +%define version 2.6 %define release 1 %define nsusr nagios %define nsgrp nagios diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/sample-config/nrpe.cfg.in new/nrpe-2.6/sample-config/nrpe.cfg.in --- old/nrpe-2.5.2/sample-config/nrpe.cfg.in 2006-02-23 23:48:26.000000000 +0100 +++ new/nrpe-2.6/sample-config/nrpe.cfg.in 2006-12-12 03:04:00.000000000 +0100 @@ -2,7 +2,7 @@ # Sample NRPE Config File # Written by: Ethan Galstad (nagios(a)nagios.org) # -# Last Modified: 02-23-2006 +# Last Modified: 12-11-2006 # # NOTES: # This is a sample configuration file for the NRPE daemon. It needs to be @@ -127,6 +127,17 @@ +# CONNECTION TIMEOUT +# This specifies the maximum number of seconds that the NRPE daemon will +# wait for a connection to be established before exiting. This is sometimes +# seen where a network problem stops the SSL being established even though +# all network sessions are connected. This causes the nrpe daemons to +# accumulate, eating system resources. Do not set this too low. + +connection_timeout=300 + + + # WEEK RANDOM SEED OPTION # This directive allows you to use SSL even if your system does not have # a /dev/random or /dev/urandom (on purpose or because the necessary patches diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/src/check_nrpe.c new/nrpe-2.6/src/check_nrpe.c --- old/nrpe-2.5.2/src/check_nrpe.c 2006-04-10 03:42:30.000000000 +0200 +++ new/nrpe-2.6/src/check_nrpe.c 2006-12-12 03:04:00.000000000 +0100 @@ -4,7 +4,7 @@ * Copyright (c) 1999-2006 Ethan Galstad (nagios(a)nagios.org) * License: GPL * - * Last Modified: 04-09-2006 + * Last Modified: 12-11-2006 * * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec] * @@ -28,6 +28,7 @@ char *server_name=NULL; char *command_name=NULL; int socket_timeout=DEFAULT_SOCKET_TIMEOUT; +int timeout_return_code=STATE_CRITICAL; int sd; char query[MAX_INPUT_BUFFER]=""; @@ -48,6 +49,7 @@ int process_arguments(int,char **); void alarm_handler(int); +int graceful_close(int,int); @@ -82,10 +84,11 @@ if(result!=OK || show_help==TRUE){ - printf("Usage: check_nrpe -H <host> [-n] [-p <port>] [-t <timeout>] [-c <command>] [-a <arglist...>]\n"); + printf("Usage: check_nrpe -H <host> [-n] [-u] [-p <port>] [-t <timeout>] [-c <command>] [-a <arglist...>]\n"); printf("\n"); printf("Options:\n"); printf(" -n = Do no use SSL\n"); + printf(" -u = Make socket timeouts return an UNKNOWN state instead of CRITICAL\n"); printf(" <host> = The address of the host running the NRPE daemon\n"); printf(" [port] = The port on which the daemon is running (default=%d)\n",DEFAULT_SERVER_PORT); printf(" [timeout] = Number of seconds before connection times out (default=%d)\n",DEFAULT_SOCKET_TIMEOUT); @@ -238,7 +241,7 @@ SSL_CTX_free(ctx); } #endif - close(sd); + graceful_close(sd,1000); /* recv() error */ if(rc<0){ @@ -320,6 +323,7 @@ {"command", required_argument, 0, 'c'}, {"args", required_argument, 0, 'a'}, {"no-ssl", no_argument, 0, 'n'}, + {"unknown-timeout", no_argument, 0, 'u'}, {"timeout", required_argument, 0, 't'}, {"port", required_argument, 0, 'p'}, {"help", no_argument, 0, 'h'}, @@ -332,7 +336,7 @@ if(argc<2) return ERROR; - snprintf(optchars,MAX_INPUT_BUFFER,"H:c:a:t:p:nhl"); + snprintf(optchars,MAX_INPUT_BUFFER,"H:c:a:t:p:nuhl"); while(1){ #ifdef HAVE_GETOPT_LONG @@ -378,6 +382,9 @@ case 'n': use_ssl=FALSE; break; + case 'u': + timeout_return_code=STATE_UNKNOWN; + break; default: return ERROR; break; @@ -417,6 +424,38 @@ printf("CHECK_NRPE: Socket timeout after %d seconds.\n",socket_timeout); - exit(STATE_CRITICAL); + exit(timeout_return_code); } + +/* submitted by Mark Plaksin 08/31/2006 */ +int graceful_close(int sd, int timeout){ + fd_set in; + struct timeval tv; + char buf[1000]; + + shutdown(sd,SHUT_WR); // Send FIN packet + for(;;){ + + FD_ZERO(&in); + FD_SET(sd,&in); + tv.tv_sec=timeout/1000; + tv.tv_usec=(timeout % 1000)*1000; + + /* timeout or error */ + if(1!=select(sd+1,&in,NULL,NULL,&tv)) + break; + + /* no more data (FIN or RST) */ + if(0>=recv(sd,buf,sizeof(buf),0)) + break; + } + +#ifdef HAVE_CLOSESOCKET + closesocket(sd); +#else + close(sd); +#endif + + return OK; + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/src/nrpe.c new/nrpe-2.6/src/nrpe.c --- old/nrpe-2.5.2/src/nrpe.c 2006-04-28 18:41:54.000000000 +0200 +++ new/nrpe-2.6/src/nrpe.c 2006-12-12 03:04:00.000000000 +0100 @@ -4,7 +4,7 @@ * Copyright (c) 1999-2006 Ethan Galstad (nagios(a)nagios.org) * License: GPL * - * Last Modified: 04-28-2006 + * Last Modified: 12-11-2006 * * Command line: nrpe -c <config_file> [--inetd | --daemon] * @@ -52,6 +52,7 @@ char server_address[16]="0.0.0.0"; int socket_timeout=DEFAULT_SOCKET_TIMEOUT; int command_timeout=DEFAULT_COMMAND_TIMEOUT; +int connection_timeout=DEFAULT_CONNECTION_TIMEOUT; char *command_prefix=NULL; command *command_list=NULL; @@ -476,6 +477,14 @@ } } + else if(!strcmp(varname,"connection_timeout")){ + connection_timeout=atoi(varvalue); + if(connection_timeout<1){ + syslog(LOG_ERR,"Invalid connection_timeout specified in config file '%s' - Line %d\n",filename,line); + return ERROR; + } + } + else if(!strcmp(varname,"allow_weak_random_seed")) allow_weak_random_seed=(atoi(varvalue)==1)?TRUE:FALSE; @@ -963,6 +972,10 @@ fcntl(sock,F_SETFL,O_NONBLOCK); #endif + /* set connection handler */ + signal(SIGALRM,my_connection_sighandler); + alarm(connection_timeout); + #ifdef HAVE_SSL /* do SSL handshake */ if(result==STATE_OK && use_ssl==TRUE){ @@ -1072,6 +1085,9 @@ if(debug==TRUE) syslog(LOG_DEBUG,"Host is asking for command '%s' to be run...",receive_packet.buffer); + /* disable connection alarm - a new alarm will be setup during my_system */ + alarm(0); + /* if this is the version check command, just spew it out */ if(!strcmp(command_name,NRPE_HELLO_COMMAND)){ @@ -1400,6 +1416,14 @@ } +/* handle errors where connection takes too long */ +void my_connection_sighandler(int sig) { + + syslog(LOG_ERR,"Connection has taken too long to establish. Exiting..."); + + exit(STATE_CRITICAL); + } + /* drops privileges */ int drop_privileges(char *user, char *group){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/src/utils.c new/nrpe-2.6/src/utils.c --- old/nrpe-2.5.2/src/utils.c 2003-10-16 01:14:27.000000000 +0200 +++ new/nrpe-2.6/src/utils.c 2006-12-12 03:04:01.000000000 +0100 @@ -3,9 +3,9 @@ * UTILS.C - NRPE Utility Functions * * License: GPL - * Copyright (c) 1999-2003 Ethan Galstad (nagios(a)nagios.org) + * Copyright (c) 1999-2006 Ethan Galstad (nagios(a)nagios.org) * - * Last Modified: 10-14-2003 + * Last Modified: 12-11-2006 * * Description: * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/update-version new/nrpe-2.6/update-version --- old/nrpe-2.5.2/update-version 2003-10-16 01:14:25.000000000 +0200 +++ new/nrpe-2.6/update-version 2006-12-12 03:03:59.000000000 +0100 @@ -1,18 +1,45 @@ #!/bin/sh +# Get date (two formats) +if [ -n "$2" ]; then + LONGDATE=`date -d "$2" "+%B %d, %Y"` + SHORTDATE=`date -d "$2" "+%m-%d-%Y"` +else + LONGDATE=`date "+%B %d, %Y"` + SHORTDATE=`date "+%m-%d-%Y"` +fi + +# Current version number +CURRENTVERSION=2.6 + +# Last date +LASTDATE=12-11-2006 + if [ "x$1" = "x" ] then - echo "Usage: $0 <release number>" - exit 1 + echo "Usage: $0 <version number | \"newdate\"> [revision date]" + echo "" + echo "Run this script with the name of the new version (i.e \"2.6\") to" + echo "update version number and modification date in files." + echo "Use the \"newdate\" argument if you want to keep the current version" + echo "number and just update the modification date." + echo "" + echo "Current version=$CURRENTVERSION" + echo "Current Modification date=$LASTDATE" + echo "" + exit 1 fi -# Get date (two formats) -LONGDATE=`date "+%B %d, %Y"` -SHORTDATE=`date "+%m-%d-%Y"` +newversion=$1 +if [ "x$newversion" = "xnewdate" ] +then + newversion=$CURRENTVERSION +fi # Update version number and release date in common code perl -i -p -e "s/VERSION \".*\"/VERSION \"$1\"/;" include/common.h perl -i -p -e "s/MODIFICATION_DATE \".*\"/MODIFICATION_DATE \"$SHORTDATE\"/;" include/common.h +perl -i -p -e "s/Last Modified: [0-9].*/Last Modified: $SHORTDATE/;" include/common.h # Update version number and release date in main code perl -i -p -e "s/Last Modified: [0-9].*/Last Modified: $SHORTDATE/;" src/nrpe.c @@ -26,3 +53,7 @@ # Update RPM spec file with version number perl -i -p -e "s/%define version .*/%define version $1/;" nrpe.spec + +# Update this file with version number and last date +perl -i -p -e "s/^CURRENTVERSION=.*/CURRENTVERSION=$newversion/;" update-version +perl -i -p -e "s/^LASTDATE=.*/LASTDATE=$SHORTDATE/;" update-version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lilo
by root＠Hilbert.suse.de 30 Jan '07

30 Jan '07

Hello community, here is the log from the commit of package lilo checked in at Tue Jan 30 15:23:51 CET 2007. -------- --- arch/ppc/lilo/lilo.changes 2007-01-15 12:51:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2007-01-30 14:39:20.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 30 14:38:41 CET 2007 - olh(a)suse.de + +- increase the append= size from 200 to 512 chars in yaboot + +------------------------------------------------------------------- +Fri Jan 26 15:04:43 CET 2007 - olh(a)suse.de + +- /etc/initiatorname.iscsi moved to /etc/iscsi/initiatorname.iscsi + (238738) + +------------------------------------------------------------------- Old: ---- yaboot-10.1.22-r925.tar.bz2 New: ---- yaboot-10.1.22-r928.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.v26462/_old 2007-01-30 15:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.v26462/_new 2007-01-30 15:23:38.000000000 +0100 @@ -11,7 +11,7 @@ # norootforbuild Name: lilo -%define yaboot_vers 10.1.22-r925 +%define yaboot_vers 10.1.22-r928 Group: System/Boot License: BSD License and BSD-like Summary: The Linux Loader, a Boot Menu @@ -24,7 +24,7 @@ Requires: binutils Requires: parted Version: 10.1.22 -Release: 2 +Release: 3 Source0: lilo-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 # $Id: lilo.spec 870 2006-11-07 12:31:45Z olh $ @@ -157,6 +157,11 @@ %doc %{_mandir}/*/* %changelog -n lilo +* Tue Jan 30 2007 - olh(a)suse.de +- increase the append= size from 200 to 512 chars in yaboot +* Fri Jan 26 2007 - olh(a)suse.de +- /etc/initiatorname.iscsi moved to /etc/iscsi/initiatorname.iscsi + (238738) * Mon Jan 15 2007 - olh(a)suse.de - print newline after wrong label in yaboot label tab completion * Tue Jan 09 2007 - olh(a)suse.de ++++++ lilo-10.1.22.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.22/show_of_path.sh new/lilo-10.1.22/show_of_path.sh --- old/lilo-10.1.22/show_of_path.sh 2006-12-08 15:06:28.000000000 +0100 +++ new/lilo-10.1.22/show_of_path.sh 2007-01-26 15:05:22.000000000 +0100 @@ -2,7 +2,7 @@ # vim: syntax=off # set -ex # -# $Id: show_of_path.sh 917 2006-12-08 14:06:28Z olh $ +# $Id: show_of_path.sh 926 2007-01-26 14:05:22Z olh $ # find a OF bootpath on Apple PowerMacintosh Newworld machines # Copyright (C) 2000, 2004 Olaf Hering <olh(a)suse.de>, # 2005 Joachim Plack <jplack(a)suse.de> @@ -62,7 +62,7 @@ shopt -s extglob -read d myversion d <<< "$Date: 2006-12-08 14:06:28 +0000 (Fri, 08 Dec 2006) $" +read d myversion d <<< "$Date: 2007-01-26 14:05:22 +0000 (Fri, 26 Jan 2007) $" function error() { @@ -536,6 +536,15 @@ else # no 'devspec' found case "$file_full_sysfs_path" in */host+([0-9])/session+([0-9])/*) + if test -f /etc/initiatorname.iscsi + then + iscsi_initiatorname_conf=/etc/initiatorname.iscsi + elif test -f /etc/iscsi/initiatorname.iscsi + then + iscsi_initiatorname_conf=/etc/iscsi/initiatorname.iscsi + else + error "initiatorname.iscsi config file not found" + fi iscsi_session="${file_full_sysfs_path%/*}" iscsi_session="${iscsi_session%/*}" iscsi_session="${iscsi_session##*/}" @@ -545,7 +554,7 @@ set -- $iscsi_network_interface iscsi_network_interface=$1 iscsi_network_card="` cat /sys/class/net/$iscsi_network_interface/device/devspec `" - iscsi_itname="` awk ' BEGIN { FS="=" ; foo="" } ; /^InitiatorName=/{ if (foo == "") { foo=$2 } } ; END { print foo } ' /etc/initiatorname.iscsi `" + iscsi_itname="` awk ' BEGIN { FS="=" ; foo="" } ; /^InitiatorName=/{ if (foo == "") { foo=$2 } } ; END { print foo } ' "$iscsi_initiatorname_conf" `" iscsi_ciaddr="` ip addr show dev $iscsi_network_interface | awk ' BEGIN { foo="" } ; / inet /{ if (foo == "") { foo=$2 } } ; END { print foo } ' `" iscsi_giaddr="` ip route show dev $iscsi_network_interface | awk ' BEGIN { foo="" } ; /default via /{ if (foo == "") { foo=$3 } } ; END { print foo } ' `" # FIXME ++++++ yaboot-10.1.22-r925.tar.bz2 -> yaboot-10.1.22-r928.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.22-r925/Changelog.SuSE new/yaboot-10.1.22-r928/Changelog.SuSE --- old/yaboot-10.1.22-r925/Changelog.SuSE 2007-01-15 13:36:09.000000000 +0100 +++ new/yaboot-10.1.22-r928/Changelog.SuSE 2007-01-30 14:41:11.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------------ +r928 | olh | 2007-01-30 13:39:20 +0000 (Tue, 30 Jan 2007) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/cfg.c + ++- increase the append= size from 200 to 512 chars in yaboot + +------------------------------------------------------------------------ +r927 | olh | 2007-01-30 13:31:08 +0000 (Tue, 30 Jan 2007) | 1 line +Changed paths: + M /trunk/yaboot/second/cfg.c + +remove unused define MAX_VAR_NAME +------------------------------------------------------------------------ r925 | olh | 2007-01-15 11:51:58 +0000 (Mon, 15 Jan 2007) | 2 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.22-r925/Makefile new/yaboot-10.1.22-r928/Makefile --- old/yaboot-10.1.22-r925/Makefile 2007-01-15 13:36:09.000000000 +0100 +++ new/yaboot-10.1.22-r928/Makefile 2007-01-30 14:41:11.000000000 +0100 @@ -6,7 +6,7 @@ include Config -VERSION = 10.1.22-r925 +VERSION = 10.1.22-r928 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.22-r925/second/cfg.c new/yaboot-10.1.22-r928/second/cfg.c --- old/yaboot-10.1.22-r925/second/cfg.c 2006-12-15 15:22:48.000000000 +0100 +++ new/yaboot-10.1.22-r928/second/cfg.c 2007-01-30 14:39:20.000000000 +0100 @@ -37,8 +37,7 @@ void *data; } CONFIG; -#define MAX_TOKEN 200 -#define MAX_VAR_NAME MAX_TOKEN +#define MAX_TOKEN 512 #define EOF -1 static const char *archimage; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0