Author: bdubbs
Date: 2005-10-30 08:39:00 -0700 (Sun, 30 Oct 2005)
New Revision: 1222
Added:
trunk/apache-ant/apache-ant-1.6.5-blfs_install-1.patch
trunk/cpio/cpio-2.6-security_fixes-1.patch
trunk/cvs/cvs-1.11.21-zlib-1.patch
trunk/flac/
trunk/flac/flac-1.1.2-xmms_plugin_fix-1.patch
trunk/gcc/gcc-3.3.6-linkonce-1.patch
trunk/gcc/gcc-3.3.6-no_fixincludes-1.patch
trunk/gnome-vfs/gnome-vfs-2.12.1-samba_3.0.20-1.patch
trunk/gnumeric/
trunk/gnumeric/gnumeric-1.4.3-libgsf-1.patch
trunk/guile/guile-1.6.7-slib_3a2-1.patch
trunk/id3lib/
trunk/id3lib/id3lib-3.8.3-test_suite-1.patch
Log:
Adding current BLFS patches-installment 1
Added: trunk/apache-ant/apache-ant-1.6.5-blfs_install-1.patch
===================================================================
--- trunk/apache-ant/apache-ant-1.6.5-blfs_install-1.patch 2005-10-30
06:58:13 UTC (rev 1221)
+++ trunk/apache-ant/apache-ant-1.6.5-blfs_install-1.patch 2005-10-30
15:39:00 UTC (rev 1222)
@@ -0,0 +1,66 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-08-19
+Initial Package Version: 1.6.5 (modified version of the 1.6.2 patch - more
than a rediff)
+Upstream Status: Not submitted (LFS/FHS specific)
+Origin: Randy McMurchy
+Description: Modifies the installation layout to conform with
+ LFS and FHS Guidelines
+
+$LastChangedBy: randy $
+$Date: 2005-08-19 15:59:19 -0500 (Fri, 19 Aug 2005) $
+
+
+diff -Naur apache-ant-1.6.5-orig/build.xml apache-ant-1.6.5/build.xml
+--- apache-ant-1.6.5-orig/build.xml 2005-06-02 13:19:54.000000000 +0000
++++ apache-ant-1.6.5/build.xml 2005-08-19 18:55:55.000000000 +0000
+@@ -125,7 +125,8 @@
+ <property name="dist.bin" value="${dist.dir}/bin"/>
+ <property name="dist.lib" value="${dist.dir}/lib"/>
+ <property name="dist.docs" value="${dist.dir}/docs"/>
+- <property name="dist.etc" value="${dist.dir}/etc"/>
++ <property name="dist.readme" value="${dist.dir}/docs/readme"/>
++ <property name="dist.etc" value="/etc/ant"/>
+ <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
+
+ <property name="src.dist.dir" value="dist-src"/>
+@@ -902,6 +903,7 @@
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${dist.bin}"/>
+ <mkdir dir="${dist.lib}"/>
++ <mkdir dir="${dist.readme}"/>
+
+ <copy todir="${dist.lib}">
+ <fileset dir="${build.lib}">
+@@ -980,7 +982,7 @@
+ </fileset>
+ </copy>
+
+- <copy todir="${dist.dir}">
++ <copy todir="${dist.readme}">
+ <fileset dir=".">
+ <include name="README"/>
+ <include name="INSTALL"/>
+
+diff -Naur apache-ant-1.6.5-orig/src/script/ant apache-ant-1.6.5/src/script/ant
+--- apache-ant-1.6.5-orig/src/script/ant 2005-06-02 13:19:04.000000000
+0000
++++ apache-ant-1.6.5/src/script/ant 2005-08-19 18:55:55.000000000 +0000
+@@ -44,8 +44,8 @@
+ usejikes=$use_jikes_default
+ else
+ # load system-wide ant configuration
+- if [ -f "/etc/ant.conf" ] ; then
+- . /etc/ant.conf
++ if [ -f "/etc/ant/ant.conf" ] ; then
++ . /etc/ant/ant.conf
+ fi
+
+ # load user ant configuration
+@@ -241,7 +241,7 @@
+ echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+ echo 'Script Options:'
+ echo ' --help, --h print this message and ant help'
+- echo ' --noconfig suppress sourcing of /etc/ant.conf,'
++ echo ' --noconfig suppress sourcing of /etc/ant/ant.conf,'
+ echo ' $HOME/.ant/ant.conf, and $HOME/.antrc'
+ echo ' configuration files'
+ echo ' --usejikes enable use of jikes by default, unless'
Added: trunk/cpio/cpio-2.6-security_fixes-1.patch
===================================================================
--- trunk/cpio/cpio-2.6-security_fixes-1.patch 2005-10-30 06:58:13 UTC (rev
1221)
+++ trunk/cpio/cpio-2.6-security_fixes-1.patch 2005-10-30 15:39:00 UTC (rev
1222)
@@ -0,0 +1,370 @@
+Submitted By: Ken Moffat <[EMAIL PROTECTED]>
+Date: 2005-07-29
+Initial Package Version: 2.6
+Upstream Status: Unknown
+Origin: from Mandrake
+Description: Vulnerability fixes, rediffed so that they all apply with
+ -p1 and consolidated to single patch. Also applicable to earlier versions.
+(1.) CAN-1999-1572 (still seems to apply to 2.6) cpio uses a 0 umask when
+creating files with -O or -F options, which creates the files with mode 0666
+and allows local users to overwrite them. Fix originally fom debian.
+(2.) CAN-2005-1111 Race condition in 2.6 and earlier allows local users to
+modify permissions of arbitrary files via a hard-link attack. Fix
+originally from fedora.
+(3.) CAN-2005-1229 Directory traversal vulnerability allows remote
+attackers to write to arbitrary directories via a dot dot in a cpio file.
+Fix by Peter Vrabec at RedHat.
+
+diff -Naur cpio-2.6.vanilla/doc/cpio.1 cpio-2.6/doc/cpio.1
+--- cpio-2.6.vanilla/doc/cpio.1 2004-08-30 17:21:48.000000000 +0100
++++ cpio-2.6/doc/cpio.1 2005-07-29 13:46:42.000000000 +0100
+@@ -20,7 +20,7 @@
+ [\-\-unconditional] [\-\-verbose] [\-\-block-size=blocks] [\-\-swap-halfwords]
+ [\-\-io-size=bytes] [\-\-pattern-file=file] [\-\-format=format]
+ [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message]
+-[\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse]
++[\-\-force\-local] [\-\-absolute\-filenames] [\-\-sparse]
+ [\-\-only\-verify\-crc] [\-\-quiet] [\-\-rsh-command=command] [\-\-help]
+ [\-\-version] [pattern...] [< archive]
+
+diff -Naur cpio-2.6.vanilla/doc/cpio.info cpio-2.6/doc/cpio.info
+--- cpio-2.6.vanilla/doc/cpio.info 2004-02-27 12:42:01.000000000 +0000
++++ cpio-2.6/doc/cpio.info 2005-07-29 13:46:42.000000000 +0100
+@@ -203,7 +203,7 @@
+ [--swap-halfwords] [--io-size=bytes] [--pattern-file=file]
+ [--format=format] [--owner=[user][:.][group]]
+ [--no-preserve-owner] [--message=message] [--help] [--version]
+- [-no-absolute-filenames] [--sparse] [-only-verify-crc] [-quiet]
++ [--absolute-filenames] [--sparse] [-only-verify-crc] [-quiet]
+ [--rsh-command=command] [pattern...] [< archive]
+
+
+@@ -358,9 +358,9 @@
+ Show numeric UID and GID instead of translating them into names
+ when using the `--verbose option'.
+
+-`--no-absolute-filenames'
+- Create all files relative to the current directory in copy-in
+- mode, even if they have an absolute file name in the archive.
++`--absolute-filenames'
++ Do not strip leading file name components that contain ".."
++ and leading slashes from file names in copy-in mode
+
+ `--no-preserve-owner'
+ Do not change the ownership of the files; leave them owned by the
+diff -Naur cpio-2.6.vanilla/src/copyin.c cpio-2.6/src/copyin.c
+--- cpio-2.6.vanilla/src/copyin.c 2004-09-08 12:10:02.000000000 +0100
++++ cpio-2.6/src/copyin.c 2005-07-29 13:46:42.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include "dstring.h"
+ #include "extern.h"
+ #include "defer.h"
++#include "dirname.h"
+ #include <rmt.h>
+ #ifndef FNM_PATHNAME
+ #include <fnmatch.h>
+@@ -389,19 +390,26 @@
+ continue;
+ }
+
+- if (close (out_file_des) < 0)
+- error (0, errno, "%s", d->header.c_name);
+-
++ /*
++ * Avoid race condition.
++ * Set chown and chmod before closing the file desc.
++ * [EMAIL PROTECTED]
++ */
++
+ /* File is now copied; set attributes. */
+ if (!no_chown_flag)
+- if ((chown (d->header.c_name,
++ if ((fchown (out_file_des,
+ set_owner_flag ? set_owner : d->header.c_uid,
+ set_group_flag ? set_group : d->header.c_gid) < 0)
+ && errno != EPERM)
+ error (0, errno, "%s", d->header.c_name);
+ /* chown may have turned off some permissions we wanted. */
+- if (chmod (d->header.c_name, (int) d->header.c_mode) < 0)
++ if (fchmod (out_file_des, (int) d->header.c_mode) < 0)
+ error (0, errno, "%s", d->header.c_name);
++
++ if (close (out_file_des) < 0)
++ error (0, errno, "%s", d->header.c_name);
++
+ if (retain_time_flag)
+ {
+ times.actime = times.modtime = d->header.c_mtime;
+@@ -557,6 +565,25 @@
+ write (out_file_des, "", 1);
+ delayed_seek_count = 0;
+ }
++
++ /*
++ * Avoid race condition.
++ * Set chown and chmod before closing the file desc.
++ * [EMAIL PROTECTED]
++ */
++
++ /* File is now copied; set attributes. */
++ if (!no_chown_flag)
++ if ((fchown (out_file_des,
++ set_owner_flag ? set_owner : file_hdr->c_uid,
++ set_group_flag ? set_group : file_hdr->c_gid) < 0)
++ && errno != EPERM)
++ error (0, errno, "%s", file_hdr->c_name);
++
++ /* chown may have turned off some permissions we wanted. */
++ if (fchmod (out_file_des, (int) file_hdr->c_mode) < 0)
++ error (0, errno, "%s", file_hdr->c_name);
++
+ if (close (out_file_des) < 0)
+ error (0, errno, "%s", file_hdr->c_name);
+
+@@ -567,18 +594,6 @@
+ file_hdr->c_name, crc, file_hdr->c_chksum);
+ }
+
+- /* File is now copied; set attributes. */
+- if (!no_chown_flag)
+- if ((chown (file_hdr->c_name,
+- set_owner_flag ? set_owner : file_hdr->c_uid,
+- set_group_flag ? set_group : file_hdr->c_gid) < 0)
+- && errno != EPERM)
+- error (0, errno, "%s", file_hdr->c_name);
+-
+- /* chown may have turned off some permissions we wanted. */
+- if (chmod (file_hdr->c_name, (int) file_hdr->c_mode) < 0)
+- error (0, errno, "%s", file_hdr->c_name);
+-
+ if (retain_time_flag)
+ {
+ struct utimbuf times; /* For setting file times. */
+@@ -589,7 +604,7 @@
+ if (utime (file_hdr->c_name, ×) < 0)
+ error (0, errno, "%s", file_hdr->c_name);
+ }
+-
++
+ tape_skip_padding (in_file_des, file_hdr->c_filesize);
+ if (file_hdr->c_nlink > 1
+ && (archive_format == arf_newascii || archive_format == arf_crcascii) )
+@@ -1335,6 +1350,53 @@
+ }
+ }
+
++/* Return a safer suffix of FILE_NAME, or "." if it has no safer
++ suffix. Check for fully specified file names and other atrocities. */
++
++static const char *
++safer_name_suffix (char const *file_name)
++{
++ char const *p;
++
++ /* Skip file system prefixes, leading file name components that contain
++ "..", and leading slashes. */
++
++ size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (file_name);
++
++ for (p = file_name + prefix_len; *p;)
++ {
++ if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
++ prefix_len = p + 2 - file_name;
++
++ do
++ {
++ char c = *p++;
++ if (ISSLASH (c))
++ break;
++ }
++ while (*p);
++ }
++
++ for (p = file_name + prefix_len; ISSLASH (*p); p++)
++ continue;
++ prefix_len = p - file_name;
++
++ if (prefix_len)
++ {
++ char *prefix = alloca (prefix_len + 1);
++ memcpy (prefix, file_name, prefix_len);
++ prefix[prefix_len] = '\0';
++
++
++ error (0, 0, _("Removing leading `%s' from member names"), prefix);
++ }
++
++ if (!*p)
++ p = ".";
++
++ return p;
++}
++
+ /* Read the collection from standard input and create files
+ in the file system. */
+
+@@ -1445,18 +1507,11 @@
+
+ /* Do we have to ignore absolute paths, and if so, does the filename
+ have an absolute path? */
+- if (no_abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0] == '/')
++ if (!abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0])
+ {
+- char *p;
++ const char *p = safer_name_suffix (file_hdr.c_name);
+
+- p = file_hdr.c_name;
+- while (*p == '/')
+- ++p;
+- if (*p == '\0')
+- {
+- strcpy (file_hdr.c_name, ".");
+- }
+- else
++ if (p != file_hdr.c_name)
+ {
+ /* Debian hack: file_hrd.c_name is sometimes set to
+ point to static memory by code in tar.c. This
+diff -Naur cpio-2.6.vanilla/src/copypass.c cpio-2.6/src/copypass.c
+--- cpio-2.6.vanilla/src/copypass.c 2004-09-06 13:09:04.000000000 +0100
++++ cpio-2.6/src/copypass.c 2005-07-29 13:46:07.000000000 +0100
+@@ -181,19 +181,25 @@
+ }
+ if (close (in_file_des) < 0)
+ error (0, errno, "%s", input_name.ds_string);
+- if (close (out_file_des) < 0)
+- error (0, errno, "%s", output_name.ds_string);
+-
++ /*
++ * Avoid race condition.
++ * Set chown and chmod before closing the file desc.
++ * [EMAIL PROTECTED]
++ */
+ /* Set the attributes of the new file. */
+ if (!no_chown_flag)
+- if ((chown (output_name.ds_string,
++ if ((fchown (out_file_des,
+ set_owner_flag ? set_owner : in_file_stat.st_uid,
+ set_group_flag ? set_group : in_file_stat.st_gid) < 0)
+ && errno != EPERM)
+ error (0, errno, "%s", output_name.ds_string);
+ /* chown may have turned off some permissions we wanted. */
+- if (chmod (output_name.ds_string, in_file_stat.st_mode) < 0)
++ if (fchmod (out_file_des, in_file_stat.st_mode) < 0)
++ error (0, errno, "%s", output_name.ds_string);
++
++ if (close (out_file_des) < 0)
+ error (0, errno, "%s", output_name.ds_string);
++
+ if (reset_time_flag)
+ {
+ times.actime = in_file_stat.st_atime;
+diff -Naur cpio-2.6.vanilla/src/extern.h cpio-2.6/src/extern.h
+--- cpio-2.6.vanilla/src/extern.h 2004-09-08 11:49:57.000000000 +0100
++++ cpio-2.6/src/extern.h 2005-07-29 13:47:34.000000000 +0100
+@@ -46,7 +46,7 @@
+ extern int sparse_flag;
+ extern int quiet_flag;
+ extern int only_verify_crc_flag;
+-extern int no_abs_paths_flag;
++extern int abs_paths_flag;
+ extern unsigned int warn_option;
+
+ /* Values for warn_option */
+@@ -91,6 +91,7 @@
+ extern char input_is_seekable;
+ extern char output_is_seekable;
+ extern char *program_name;
++extern mode_t sys_umask;
+ extern int (*xstat) ();
+ extern void (*copy_function) ();
+
+diff -Naur cpio-2.6.vanilla/src/global.c cpio-2.6/src/global.c
+--- cpio-2.6.vanilla/src/global.c 2004-09-08 11:23:44.000000000 +0100
++++ cpio-2.6/src/global.c 2005-07-29 13:47:34.000000000 +0100
+@@ -100,7 +100,7 @@
+ int only_verify_crc_flag = false;
+
+ /* If true, don't use any absolute paths, prefix them by `./'. */
+-int no_abs_paths_flag = false;
++int abs_paths_flag = false;
+
+ #ifdef DEBUG_CPIO
+ /* If true, print debugging information. */
+@@ -195,6 +195,9 @@
+ /* The name this program was run with. */
+ char *program_name;
+
++/* Debian hack to make the -d option honor the umask. */
++mode_t sys_umask;
++
+ /* A pointer to either lstat or stat, depending on whether
+ dereferencing of symlinks is done for input files. */
+ int (*xstat) ();
+diff -Naur cpio-2.6.vanilla/src/main.c cpio-2.6/src/main.c
+--- cpio-2.6.vanilla/src/main.c 2004-11-23 00:42:18.000000000 +0000
++++ cpio-2.6/src/main.c 2005-07-29 13:47:34.000000000 +0100
+@@ -41,6 +41,7 @@
+
+ enum cpio_options {
+ NO_ABSOLUTE_FILENAMES_OPTION=256,
++ ABSOLUTE_FILENAMES_OPTION,
+ NO_PRESERVE_OWNER_OPTION,
+ ONLY_VERIFY_CRC_OPTION,
+ RENAME_BATCH_FILE_OPTION,
+@@ -134,6 +135,8 @@
+ N_("In copy-in mode, read additional patterns specifying filenames to
extract or list from FILE"), 210},
+ {"no-absolute-filenames", NO_ABSOLUTE_FILENAMES_OPTION, 0, 0,
+ N_("Create all files relative to the current directory"), 210},
++ {"absolute-filenames", ABSOLUTE_FILENAMES_OPTION, 0, 0,
++ N_("do not strip leading file name components that contain \"..\" and
leading slashes from file names"), 210},
+ {"only-verify-crc", ONLY_VERIFY_CRC_OPTION, 0, 0,
+ N_("When reading a CRC format archive in copy-in mode, only verify the
CRC's of each file in the archive, don't actually extract the files"), 210},
+ {"rename", 'r', 0, 0,
+@@ -392,7 +395,11 @@
+ break;
+
+ case NO_ABSOLUTE_FILENAMES_OPTION: /*
--no-absolute-filenames */
+- no_abs_paths_flag = true;
++ abs_paths_flag = false;
++ break;
++
++ case ABSOLUTE_FILENAMES_OPTION: /* --absolute-filenames */
++ abs_paths_flag = true;
+ break;
+
+ case NO_PRESERVE_OWNER_OPTION: /* --no-preserve-owner */
+@@ -631,7 +638,7 @@
+ _("--append is used but no archive file name is given
(use -F or -O options")));
+
+ CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--create");
+- CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames", "--create");
++ CHECK_USAGE(abs_paths_flag, "--absolute-pathnames", "--create");
+ CHECK_USAGE(input_archive_name, "-I", "--create");
+ if (archive_name && output_archive_name)
+ USAGE_ERROR ((0, 0, _("Both -O and -F are used in copy-out mode")));
+@@ -658,7 +665,7 @@
+ CHECK_USAGE(rename_flag, "--rename", "--pass-through");
+ CHECK_USAGE(append_flag, "--append", "--pass-through");
+ CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--pass-through");
+- CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames",
++ CHECK_USAGE(abs_paths_flag, "--absolute-pathnames",
+ "--pass-through");
+ CHECK_USAGE(to_stdout_option, "--to-stdout", "--pass-through");
+
+@@ -740,7 +747,6 @@
+ textdomain (PACKAGE);
+
+ program_name = argv[0];
+- umask (0);
+
+ #ifdef __TURBOC__
+ _fmode = O_BINARY; /* Put stdin and stdout in binary mode. */
+@@ -751,6 +757,7 @@
+ #endif
+
+ process_args (argc, argv);
++ sys_umask = umask (0);
+
+ initialize_buffers ();
+
Added: trunk/cvs/cvs-1.11.21-zlib-1.patch
===================================================================
--- trunk/cvs/cvs-1.11.21-zlib-1.patch 2005-10-30 06:58:13 UTC (rev 1221)
+++ trunk/cvs/cvs-1.11.21-zlib-1.patch 2005-10-30 15:39:00 UTC (rev 1222)
@@ -0,0 +1,53 @@
+Submitted By: Matthew Burgess <[EMAIL PROTECTED]>
+Date: 2004-11-12
+Initial Package Version: 1.11.2
+Upstream Status: Not submitted
+Origin: BLFS Dev Post
+Description: Links against system zlib instead of the
+ internal zlib.
+
+$LastChangedBy: igor $
+$Date: 2005-10-28 09:20:09 -0500 (Fri, 28 Oct 2005) $
+
+diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
+--- cvs-1.11.18.orig/src/Makefile.in 2004-11-11 18:17:20.000000000 +0000
++++ cvs-1.11.18/src/Makefile.in 2004-11-12 19:58:14.962293296 +0000
+@@ -86,7 +86,7 @@
+ version.$(OBJEXT) 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
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -199,7 +199,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_SCRIPTS = cvsbug
+
+ # The cvs executable
+@@ -278,7 +278,7 @@
+ cvs_LDADD = \
+ ../diff/libdiff.a \
+ ../lib/libcvs.a \
+- ../zlib/libz.a
++ -lz
+
+
+ # extra clean targets
+diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
+--- cvs-1.11.18.orig/src/zlib.c 2004-03-19 19:18:57.000000000 +0000
++++ cvs-1.11.18/src/zlib.c 2004-11-12 19:58:55.531125896 +0000
+@@ -22,7 +22,7 @@
+
+ #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+
+-#include "zlib.h"
++#include <zlib.h>
+
+ /* OS/2 doesn't have EIO. FIXME: this whole notion of turning
+ a different error into EIO strikes me as pretty dubious. */
Added: trunk/flac/flac-1.1.2-xmms_plugin_fix-1.patch
===================================================================
--- trunk/flac/flac-1.1.2-xmms_plugin_fix-1.patch 2005-10-30 06:58:13 UTC
(rev 1221)
+++ trunk/flac/flac-1.1.2-xmms_plugin_fix-1.patch 2005-10-30 15:39:00 UTC
(rev 1222)
@@ -0,0 +1,24 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-08-28
+Initial Package Version: 1.1.2
+Upstream Status: Not submitted
+Origin: Arch Linix CVS
+
(http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/multimedia/flac/xmms-plugin.patch)
+Description: Fixes the XMMS plugin so that it doesn't crash XMMS
+
+$LastChangedBy: randy $
+$Date: 2005-08-28 12:59:03 -0500 (Sun, 28 Aug 2005) $
+
+
+diff -Naur flac-1.1.2-orig/src/plugin_xmms/configure.c
flac-1.1.2/src/plugin_xmms/configure.c
+--- flac-1.1.2-orig/src/plugin_xmms/configure.c 2005-01-25
04:26:29.000000000 +0000
++++ flac-1.1.2/src/plugin_xmms/configure.c 2005-08-28 01:42:44.000000000
+0000
+@@ -61,7 +61,7 @@
+ "", /* proxy_user */
+ "", /* proxy_pass */
+ FALSE, /* save_http_stream */
+- "", /* save_http_path */
++ FALSE, /* save_http_path */
+ FALSE, /* cast_title_streaming */
+ FALSE /* use_udp_channel */
+ },
Added: trunk/gcc/gcc-3.3.6-linkonce-1.patch
===================================================================
--- trunk/gcc/gcc-3.3.6-linkonce-1.patch 2005-10-30 06:58:13 UTC (rev
1221)
+++ trunk/gcc/gcc-3.3.6-linkonce-1.patch 2005-10-30 15:39:00 UTC (rev
1222)
@@ -0,0 +1,359 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2004-12-19
+Initial Package Version: 3.3.3
+Origin: gcc-3.4.1-linkonce-1.patch
+Upstream Status: Applied
+Description: Fixes linkone/comdat issue
+ Details of this patch can be found on the following link
+ http://gcc.gnu.org/ml/gcc-patches/2004-08/msg00653.html
+
+$LastChangedBy: randy $
+$Date: 2005-08-17 11:33:20 -0500 (Wed, 17 Aug 2005) $
+
+diff -Naur gcc-3.3.3-orig/gcc/config/alpha/alpha.c
gcc-3.3.3/gcc/config/alpha/alpha.c
+--- gcc-3.3.3-orig/gcc/config/alpha/alpha.c 2004-01-11 17:53:17.000000000
-0600
++++ gcc-3.3.3/gcc/config/alpha/alpha.c 2004-12-19 22:51:55.974168040 -0600
+@@ -250,6 +250,8 @@
+ # define TARGET_SECTION_TYPE_FLAGS unicosmk_section_type_flags
+ # undef TARGET_ASM_UNIQUE_SECTION
+ # define TARGET_ASM_UNIQUE_SECTION unicosmk_unique_section
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ # undef TARGET_ASM_GLOBALIZE_LABEL
+ # define TARGET_ASM_GLOBALIZE_LABEL hook_FILEptr_constcharptr_void
+ #endif
+diff -Naur gcc-3.3.3-orig/gcc/config/arm/pe.h gcc-3.3.3/gcc/config/arm/pe.h
+--- gcc-3.3.3-orig/gcc/config/arm/pe.h 2002-05-19 00:23:00.000000000 -0500
++++ gcc-3.3.3/gcc/config/arm/pe.h 2004-12-19 22:51:56.018161352 -0600
+@@ -101,6 +101,7 @@
+ #define MULTIPLE_SYMBOL_SPACES
+
+ #define TARGET_ASM_UNIQUE_SECTION arm_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+
+ #define SUPPORTS_ONE_ONLY 1
+
+diff -Naur gcc-3.3.3-orig/gcc/config/avr/avr.c gcc-3.3.3/gcc/config/avr/avr.c
+--- gcc-3.3.3-orig/gcc/config/avr/avr.c 2002-10-24 15:07:21.000000000
-0500
++++ gcc-3.3.3/gcc/config/avr/avr.c 2004-12-19 22:51:56.042157704 -0600
+@@ -221,6 +221,8 @@
+ #define TARGET_ATTRIBUTE_TABLE avr_attribute_table
+ #undef TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION avr_unique_section
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #undef TARGET_ENCODE_SECTION_INFO
+ #define TARGET_ENCODE_SECTION_INFO avr_encode_section_info
+ #undef TARGET_SECTION_TYPE_FLAGS
+diff -Naur gcc-3.3.3-orig/gcc/config/darwin.h gcc-3.3.3/gcc/config/darwin.h
+--- gcc-3.3.3-orig/gcc/config/darwin.h 2003-08-08 16:17:57.000000000 -0500
++++ gcc-3.3.3/gcc/config/darwin.h 2004-12-19 22:51:56.091150256 -0600
+@@ -677,6 +677,9 @@
+ #undef TARGET_ASM_SELECT_RTX_SECTION
+ #define TARGET_ASM_SELECT_RTX_SECTION machopic_select_rtx_section
+
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
++
+ #define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME) \
+ do { \
+ if (FILE) { \
+diff -Naur gcc-3.3.3-orig/gcc/config/i386/cygwin.h
gcc-3.3.3/gcc/config/i386/cygwin.h
+--- gcc-3.3.3-orig/gcc/config/i386/cygwin.h 2003-04-29 08:56:28.000000000
-0500
++++ gcc-3.3.3/gcc/config/i386/cygwin.h 2004-12-19 22:51:56.112147064 -0600
+@@ -331,6 +331,7 @@
+
+ extern void i386_pe_unique_section PARAMS ((TREE, int));
+ #define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+
+ #define SUPPORTS_ONE_ONLY 1
+
+diff -Naur gcc-3.3.3-orig/gcc/config/i386/i386-interix.h
gcc-3.3.3/gcc/config/i386/i386-interix.h
+--- gcc-3.3.3-orig/gcc/config/i386/i386-interix.h 2002-11-25
22:54:48.000000000 -0600
++++ gcc-3.3.3/gcc/config/i386/i386-interix.h 2004-12-19 22:51:56.113146912
-0600
+@@ -330,6 +330,7 @@
+
+ extern void i386_pe_unique_section PARAMS ((tree, int));
+ #define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+
+ #define SUPPORTS_ONE_ONLY 1
+ #endif /* 0 */
+diff -Naur gcc-3.3.3-orig/gcc/config/ip2k/ip2k.c
gcc-3.3.3/gcc/config/ip2k/ip2k.c
+--- gcc-3.3.3-orig/gcc/config/ip2k/ip2k.c 2003-01-14 14:13:45.000000000
-0600
++++ gcc-3.3.3/gcc/config/ip2k/ip2k.c 2004-12-19 22:51:56.167138704 -0600
+@@ -95,6 +95,9 @@
+ #undef TARGET_ENCODE_SECTION_INFO
+ #define TARGET_ENCODE_SECTION_INFO encode_section_info
+
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
++
+ #undef TARGET_ATTRIBUTE_TABLE
+ #define TARGET_ATTRIBUTE_TABLE ip2k_attribute_table
+
+diff -Naur gcc-3.3.3-orig/gcc/config/mcore/mcore.c
gcc-3.3.3/gcc/config/mcore/mcore.c
+--- gcc-3.3.3-orig/gcc/config/mcore/mcore.c 2003-12-31 18:24:24.000000000
-0600
++++ gcc-3.3.3/gcc/config/mcore/mcore.c 2004-12-19 22:51:56.199133840 -0600
+@@ -157,6 +157,8 @@
+ #define TARGET_ATTRIBUTE_TABLE mcore_attribute_table
+ #undef TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION mcore_unique_section
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #undef TARGET_ENCODE_SECTION_INFO
+ #define TARGET_ENCODE_SECTION_INFO mcore_encode_section_info
+ #undef TARGET_STRIP_NAME_ENCODING
+diff -Naur gcc-3.3.3-orig/gcc/config/rs6000/xcoff.h
gcc-3.3.3/gcc/config/rs6000/xcoff.h
+--- gcc-3.3.3-orig/gcc/config/rs6000/xcoff.h 2002-10-22 18:05:22.000000000
-0500
++++ gcc-3.3.3/gcc/config/rs6000/xcoff.h 2004-12-19 22:51:56.246126696
-0600
+@@ -164,6 +164,7 @@
+ #define TARGET_ASM_SELECT_SECTION rs6000_xcoff_select_section
+ #define TARGET_ASM_SELECT_RTX_SECTION rs6000_xcoff_select_rtx_section
+ #define TARGET_ASM_UNIQUE_SECTION rs6000_xcoff_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #define TARGET_ENCODE_SECTION_INFO rs6000_xcoff_encode_section_info
+ #define TARGET_STRIP_NAME_ENCODING rs6000_xcoff_strip_name_encoding
+ #define TARGET_SECTION_TYPE_FLAGS rs6000_xcoff_section_type_flags
+diff -Naur gcc-3.3.3-orig/gcc/doc/tm.texi gcc-3.3.3/gcc/doc/tm.texi
+--- gcc-3.3.3-orig/gcc/doc/tm.texi 2003-12-12 10:10:09.000000000 -0600
++++ gcc-3.3.3/gcc/doc/tm.texi 2004-12-19 22:51:56.317115904 -0600
+@@ -5902,6 +5902,15 @@
+ Whatever the actual target object format, this is often good enough.
+ @end deftypefn
+
[EMAIL PROTECTED] {Target Hook} void TARGET_ASM_FUNCTION_RODATA_SECTION (tree
@var{decl})
++Switches to a readonly data section associated with
[EMAIL PROTECTED] (@var{decl})}.
++The default version of this function switches to @code{.gnu.linkonce.r.name}
++section if function's section is @code{.gnu.linkonce.t.name}, to
[EMAIL PROTECTED] if function is in @code{.text.name} section
++and otherwise switches to the normal readonly data section.
[EMAIL PROTECTED] deftypefn
++
+ @deftypefn {Target Hook} void TARGET_ASM_SELECT_RTX_SECTION (enum
machine_mode @var{mode}, rtx @var{x}, unsigned HOST_WIDE_INT @var{align})
+ Switches to the appropriate section for output of constant pool entry
+ @var{x} in @var{mode}. You can assume that @var{x} is some kind of
+diff -Naur gcc-3.3.3-orig/gcc/final.c gcc-3.3.3/gcc/final.c
+--- gcc-3.3.3-orig/gcc/final.c 2003-12-01 02:18:36.000000000 -0600
++++ gcc-3.3.3/gcc/final.c 2004-12-19 22:51:56.373107392 -0600
+@@ -2258,7 +2258,7 @@
+ {
+ int log_align;
+
+- readonly_data_section ();
++ targetm.asm_out.function_rodata_section
(current_function_decl);
+
+ #ifdef ADDR_VEC_ALIGN
+ log_align = ADDR_VEC_ALIGN (NEXT_INSN (insn));
+diff -Naur gcc-3.3.3-orig/gcc/output.h gcc-3.3.3/gcc/output.h
+--- gcc-3.3.3-orig/gcc/output.h 2002-12-12 18:17:20.000000000 -0600
++++ gcc-3.3.3/gcc/output.h 2004-12-19 22:51:56.420100248 -0600
+@@ -525,6 +525,8 @@
+ unsigned HOST_WIDE_INT, int));
+ extern void default_unique_section PARAMS ((tree, int));
+ extern void default_unique_section_1 PARAMS ((tree, int, int));
++extern void default_function_rodata_section (tree);
++extern void default_no_function_rodata_section (tree);
+ extern void default_select_rtx_section PARAMS ((enum machine_mode, rtx,
+ unsigned HOST_WIDE_INT));
+ extern void default_elf_select_rtx_section PARAMS ((enum machine_mode, rtx,
+diff -Naur gcc-3.3.3-orig/gcc/target-def.h gcc-3.3.3/gcc/target-def.h
+--- gcc-3.3.3-orig/gcc/target-def.h 2002-12-09 17:53:59.000000000 -0600
++++ gcc-3.3.3/gcc/target-def.h 2004-12-19 22:51:56.443096752 -0600
+@@ -75,6 +75,10 @@
+ #define TARGET_ASM_UNIQUE_SECTION default_unique_section
+ #endif
+
++#ifndef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_function_rodata_section
++#endif
++
+ #ifndef TARGET_ASM_SELECT_RTX_SECTION
+ #define TARGET_ASM_SELECT_RTX_SECTION default_select_rtx_section
+ #endif
+@@ -175,6 +179,7 @@
+ TARGET_ASM_SELECT_SECTION, \
+ TARGET_ASM_SELECT_RTX_SECTION, \
+ TARGET_ASM_UNIQUE_SECTION, \
++ TARGET_ASM_FUNCTION_RODATA_SECTION, \
+ TARGET_ASM_CONSTRUCTOR, \
+ TARGET_ASM_DESTRUCTOR, \
+ TARGET_ASM_OUTPUT_MI_THUNK, \
+diff -Naur gcc-3.3.3-orig/gcc/target.h gcc-3.3.3/gcc/target.h
+--- gcc-3.3.3-orig/gcc/target.h 2002-12-09 17:53:59.000000000 -0600
++++ gcc-3.3.3/gcc/target.h 2004-12-19 22:51:56.463093712 -0600
+@@ -114,6 +114,10 @@
+ for SELECT_SECTION. */
+ void (* unique_section) PARAMS ((tree, int));
+
++ /* Tell assembler to switch to the readonly data section associated
++ with function DECL. */
++ void (* function_rodata_section) (tree);
++
+ /* Output a constructor for a symbol with a given priority. */
+ void (* constructor) PARAMS ((rtx, int));
+
+diff -Naur gcc-3.3.3-orig/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc
gcc-3.3.3/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc
+--- gcc-3.3.3-orig/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc
1969-12-31 18:00:00.000000000 -0600
++++ gcc-3.3.3/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc
2004-12-19 22:51:56.484090520 -0600
+@@ -0,0 +1,40 @@
++extern void
++bar (int x);
++
++inline void
++foo (int i)
++{
++ switch (i)
++ {
++ case 3:
++ case 5:
++ case 6:
++ case 9:
++ case 15:
++ bar (1);
++ break;
++ case 2:
++ case 4:
++ case 7:
++ case 10:
++ case 11:
++ case 12:
++ bar (2);
++ break;
++ case 0:
++ case 1:
++ case 8:
++ case 13:
++ case 16:
++ bar (3);
++ break;
++ case 14:
++ bar (4);
++ break;
++ default:
++ bar (5);
++ break;
++ }
++}
++
++void *fooaddr2 = (void *) foo;
+diff -Naur gcc-3.3.3-orig/gcc/testsuite/g++.old-deja/g++.other/comdat4.C
gcc-3.3.3/gcc/testsuite/g++.old-deja/g++.other/comdat4.C
+--- gcc-3.3.3-orig/gcc/testsuite/g++.old-deja/g++.other/comdat4.C
1969-12-31 18:00:00.000000000 -0600
++++ gcc-3.3.3/gcc/testsuite/g++.old-deja/g++.other/comdat4.C 2004-12-19
22:51:56.485090368 -0600
+@@ -0,0 +1,57 @@
++// PR c++/16276
++// { dg-do link }
++// { dg-additional-sources " comdat4-aux.cc" }
++// { dg-options "-O2" }
++
++extern void
++bar (int x);
++
++inline void
++foo (int i)
++{
++ switch (i)
++ {
++ case 3:
++ case 5:
++ case 6:
++ case 9:
++ case 15:
++ bar (1);
++ break;
++ case 2:
++ case 4:
++ case 7:
++ case 10:
++ case 11:
++ case 12:
++ bar (2);
++ break;
++ case 0:
++ case 1:
++ case 8:
++ case 13:
++ case 16:
++ bar (3);
++ break;
++ case 14:
++ bar (4);
++ break;
++ default:
++ bar (5);
++ break;
++ }
++}
++
++void *fooaddr = (void *) foo;
++
++void
++bar (int x)
++{
++ __asm __volatile ("" : : "r" (x));
++}
++
++int
++main (void)
++{
++ return 0;
++}
+diff -Naur gcc-3.3.3-orig/gcc/varasm.c gcc-3.3.3/gcc/varasm.c
+--- gcc-3.3.3-orig/gcc/varasm.c 2004-01-12 12:23:08.000000000 -0600
++++ gcc-3.3.3/gcc/varasm.c 2004-12-19 22:51:56.528083832 -0600
+@@ -568,6 +568,53 @@
+ text_section ();
+ }
+
++/* Switch to read-only data section associated with function DECL. */
++
++void
++default_function_rodata_section (tree decl)
++{
++ if (decl != NULL_TREE && DECL_SECTION_NAME (decl))
++ {
++ const char *name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl));
++
++ /* For .gnu.linkonce.t.foo we want to use .gnu.linkonce.r.foo. */
++ if (DECL_ONE_ONLY (decl) && strncmp (name, ".gnu.linkonce.t.", 16) == 0)
++ {
++ size_t len = strlen (name) + 1;
++ char *rname = alloca (len);
++
++ memcpy (rname, name, len);
++ rname[14] = 'r';
++ named_section_flags (rname, SECTION_LINKONCE);
++ return;
++ }
++ /* For .text.foo we want to use .rodata.foo. */
++ else if (flag_function_sections && flag_data_sections
++ && strncmp (name, ".text.", 6) == 0)
++ {
++ size_t len = strlen (name) + 1;
++ char *rname = alloca (len + 2);
++
++ memcpy (rname, ".rodata", 7);
++ memcpy (rname + 7, name + 5, len - 5);
++ named_section_flags (rname, 0);
++ return;
++ }
++ }
++
++ readonly_data_section ();
++}
++
++/* Switch to read-only data section associated with function DECL
++ for targets where that section should be always the single
++ readonly data section. */
++
++void
++default_no_function_rodata_section (tree decl ATTRIBUTE_UNUSED)
++{
++ readonly_data_section ();
++}
++
+ /* Switch to section for variable DECL. RELOC is the same as the
+ argument to SELECT_SECTION. */
+
Added: trunk/gcc/gcc-3.3.6-no_fixincludes-1.patch
===================================================================
--- trunk/gcc/gcc-3.3.6-no_fixincludes-1.patch 2005-10-30 06:58:13 UTC (rev
1221)
+++ trunk/gcc/gcc-3.3.6-no_fixincludes-1.patch 2005-10-30 15:39:00 UTC (rev
1222)
@@ -0,0 +1,30 @@
+Submitted By: Ronald Hummelink <ronald at hummelink dot xs4all dot nl>
+Date: 2003-08-16
+Initial Package Version: 3.3.1
+Origin: Originally developed for GCC 3.2 by Greg Schafer <gschafer at zip dot
com dot au>
+Description: Prevent fixincludes script from running.
+
+$LastChangedBy: randy $
+$Date: 2005-08-17 11:33:20 -0500 (Wed, 17 Aug 2005) $
+
+--- gcc-3.3.1.orig/gcc/Makefile.in 2003-08-03 15:48:36.000000000 +0000
++++ gcc-3.3.1/gcc/Makefile.in 2003-08-15 23:40:28.000000000 +0000
+@@ -2335,10 +2335,6 @@
+ rm -f include/limits.h
+ cp xlimits.h include/limits.h
+ chmod a+r include/limits.h
+-# Install the README
+- rm -f include/README
+- cp $(srcdir)/README-fixinc include/README
+- chmod a+r include/README
+ $(STAMP) $@
+
+ # fixinc.sh depends on this, not on specs directly.
+@@ -2369,7 +2365,6 @@
+ (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
+ SHELL='$(SHELL)' ;\
+ export TARGET_MACHINE srcdir SHELL ; \
+- $(SHELL) ./fixinc.sh `${PWD_COMMAND}`/include $(SYSTEM_HEADER_DIR)
$(OTHER_FIXINCLUDES_DIRS); \
+ rm -f include/syslimits.h; \
+ if [ -f include/limits.h ]; then \
+ mv include/limits.h include/syslimits.h; \
Added: trunk/gnome-vfs/gnome-vfs-2.12.1-samba_3.0.20-1.patch
===================================================================
--- trunk/gnome-vfs/gnome-vfs-2.12.1-samba_3.0.20-1.patch 2005-10-30
06:58:13 UTC (rev 1221)
+++ trunk/gnome-vfs/gnome-vfs-2.12.1-samba_3.0.20-1.patch 2005-10-30
15:39:00 UTC (rev 1222)
@@ -0,0 +1,24 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-09-10
+Initial Package Version: 2.12.0
+Upstream Status: Unknown
+Origin: Randy McMurchy
+Description: Fixes linking to libsmbclient if you have Samba
+ version greater than 3.0.14a
+
+$LastChangedBy: randy $
+$Date: 2005-10-10 13:02:07 -0500 (Mon, 10 Oct 2005) $
+
+
+diff -Naur gnome-vfs-2.12.0-orig/modules/smb-method.c
gnome-vfs-2.12.0/modules/smb-method.c
+--- gnome-vfs-2.12.0-orig/modules/smb-method.c 2005-06-08 07:19:54.000000000
+0000
++++ gnome-vfs-2.12.0/modules/smb-method.c 2005-09-11 03:33:39.000000000
+0000
+@@ -1486,7 +1486,7 @@
+
+ /* Important: perform_authentication leaves and re-enters the
lock! */
+ while (perform_authentication (&actx) > 0) {
+- r = smb_context->close (smb_context, handle->file);
++ r = smb_context->close_fn (smb_context, handle->file);
+ actx.res = (r >= 0) ? GNOME_VFS_OK :
gnome_vfs_result_from_errno ();
+ }
+
Added: trunk/gnumeric/gnumeric-1.4.3-libgsf-1.patch
===================================================================
--- trunk/gnumeric/gnumeric-1.4.3-libgsf-1.patch 2005-10-30 06:58:13 UTC
(rev 1221)
+++ trunk/gnumeric/gnumeric-1.4.3-libgsf-1.patch 2005-10-30 15:39:00 UTC
(rev 1222)
@@ -0,0 +1,256 @@
+Submitted By: Hugo Villeneuve
+Date: 2005-09-19
+Initial Package Version: 1.4.3
+Upstream Status: Unknown
+Origin:
http://mail-index.netbsd.org/tech-pkg/2005/09/05/0001.html
+Description: Updated to new GSF_CLASS_FULL signature
+
+$LastChangedBy: randy $
+$Date: 2005-09-25 13:12:55 -0500 (Sun, 25 Sep 2005) $
+
+
+diff -Naur gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c
gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c
+--- gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c 2004-09-24
16:35:15.000000000 -0400
++++ gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c 2005-09-19
00:44:06.889772528 -0400
+@@ -313,8 +313,8 @@
+ }
+
+ GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba,
+- wbcc_class_init, wbcc_init,
+- WORKBOOK_CONTROL_TYPE, 0,
++ NULL, NULL,wbcc_class_init, NULL,
++ wbcc_init, WORKBOOK_CONTROL_TYPE, 0,
+ GSF_INTERFACE (wbcc_gnm_cmd_context_init,
+ GNM_CMD_CONTEXT_TYPE))
+
+diff -Naur gnumeric-1.4.3-orig/src/command-context-stderr.c
gnumeric-1.4.3-patched/src/command-context-stderr.c
+--- gnumeric-1.4.3-orig/src/command-context-stderr.c 2004-06-13
14:48:34.000000000 -0400
++++ gnumeric-1.4.3-patched/src/command-context-stderr.c 2005-09-19
00:44:06.891772224 -0400
+@@ -107,6 +107,6 @@
+ }
+
+ GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
+- NULL, ccs_init,
+- G_TYPE_OBJECT, 0,
++ NULL, NULL, NULL, NULL,
++ ccs_init, G_TYPE_OBJECT, 0,
+ GSF_INTERFACE (ccs_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c
gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c
2005-02-09 16:54:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c
2005-09-19 00:44:06.896771464 -0400
+@@ -1678,8 +1678,8 @@
+ }
+
+ GSF_CLASS_FULL (GogAxis, gog_axis,
+- gog_axis_class_init, gog_axis_init,
+- GOG_STYLED_OBJECT_TYPE, 0,
++ NULL, NULL, gog_axis_class_init, NULL,
++ gog_axis_init, GOG_STYLED_OBJECT_TYPE, 0,
+ GSF_INTERFACE (gog_axis_dataset_init, GOG_DATASET_TYPE))
+
+
+diff -Naur
gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
2004-12-02 08:57:26.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
2005-09-19 00:44:06.899771008 -0400
+@@ -488,8 +488,8 @@
+ }
+
+ GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
+- gog_error_bar_class_init, gog_error_bar_init,
+- G_TYPE_OBJECT, 0,
++ NULL, NULL, gog_error_bar_class_init, NULL,
++ gog_error_bar_init, G_TYPE_OBJECT, 0,
+ GSF_INTERFACE (gog_error_bar_persist_init, GOG_PERSIST_TYPE))
+
+
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c
gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c
2004-10-25 16:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c
2005-09-19 00:44:06.901770704 -0400
+@@ -176,8 +176,8 @@
+ }
+
+ GSF_CLASS_FULL (GogLabel, gog_label,
+- gog_label_class_init, NULL,
+- GOG_OUTLINED_OBJECT_TYPE, 0,
++ NULL, NULL, gog_label_class_init, NULL,
++ NULL, GOG_STYLED_OBJECT_TYPE, 0,
+ GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
+
+ /************************************************************************/
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c
gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c
2005-01-05 13:05:53.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c
2005-09-19 00:44:06.904770248 -0400
+@@ -589,8 +589,8 @@
+ }
+
+ GSF_CLASS_FULL (GogSeries, gog_series,
+- gog_series_class_init, gog_series_init,
+- GOG_STYLED_OBJECT_TYPE, 0,
++ NULL, NULL, gog_series_class_init, NULL,
++ gog_series_init, GOG_STYLED_OBJECT_TYPE, 0,
+ GSF_INTERFACE (gog_series_dataset_init, GOG_DATASET_TYPE))
+
+ /**
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c
gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c
2004-11-19 10:49:12.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c
2005-09-19 00:44:06.908769640 -0400
+@@ -1687,8 +1687,8 @@
+ }
+
+ GSF_CLASS_FULL (GogStyle, gog_style,
+- gog_style_class_init, gog_style_init,
+- G_TYPE_OBJECT, 0,
++ NULL, NULL, gog_style_class_init, NULL,
++ gog_style_init, G_TYPE_OBJECT, 0,
+ GSF_INTERFACE (gog_style_persist_init, GOG_PERSIST_TYPE))
+
+ gboolean
+diff -Naur gnumeric-1.4.3-orig/src/gnm-so-filled.c
gnumeric-1.4.3-patched/src/gnm-so-filled.c
+--- gnumeric-1.4.3-orig/src/gnm-so-filled.c 2004-10-16 22:36:05.000000000
-0400
++++ gnumeric-1.4.3-patched/src/gnm-so-filled.c 2005-09-19 00:44:06.911769184
-0400
+@@ -113,7 +113,7 @@
+ typedef FooCanvasGroup FilledFooView;
+ typedef FooCanvasGroupClass FilledFooViewClass;
+ static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view,
+- NULL, NULL,
++ NULL, NULL, NULL, NULL, NULL,
+ FOO_TYPE_CANVAS_GROUP, 0,
+ GSF_INTERFACE (so_filled_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+@@ -632,7 +632,7 @@
+ typedef FooCanvasPolygon PolygonFooView;
+ typedef FooCanvasPolygonClass PolygonFooViewClass;
+ static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view,
+- NULL, NULL,
++ NULL, NULL, NULL, NULL, NULL,
+ FOO_TYPE_CANVAS_POLYGON, 0,
+ GSF_INTERFACE (so_polygon_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+diff -Naur gnumeric-1.4.3-orig/src/gnm-so-line.c
gnumeric-1.4.3-patched/src/gnm-so-line.c
+--- gnumeric-1.4.3-orig/src/gnm-so-line.c 2004-11-30 13:37:07.000000000
-0500
++++ gnumeric-1.4.3-patched/src/gnm-so-line.c 2005-09-19 00:44:06.913768880
-0400
+@@ -111,7 +111,7 @@
+ typedef FooCanvasLine LineFooView;
+ typedef FooCanvasLineClass LineFooViewClass;
+ static GSF_CLASS_FULL (LineFooView, so_line_foo_view,
+- NULL, NULL,
++ NULL, NULL,NULL, NULL,NULL,
+ FOO_TYPE_CANVAS_LINE, 0,
+ GSF_INTERFACE (so_line_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+diff -Naur gnumeric-1.4.3-orig/src/io-context-gtk.c
gnumeric-1.4.3-patched/src/io-context-gtk.c
+--- gnumeric-1.4.3-orig/src/io-context-gtk.c 2004-10-29 23:51:35.000000000
-0400
++++ gnumeric-1.4.3-patched/src/io-context-gtk.c 2005-09-19
00:44:06.915768576 -0400
+@@ -367,8 +367,8 @@
+ }
+
+ GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
+- icg_class_init, icg_init,
+- TYPE_IO_CONTEXT, 0,
++ NULL, NULL, icg_class_init, NULL,
++ icg_init, TYPE_IO_CONTEXT, 0,
+ GSF_INTERFACE (icg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+
+ void
+diff -Naur gnumeric-1.4.3-orig/src/io-context.c
gnumeric-1.4.3-patched/src/io-context.c
+--- gnumeric-1.4.3-orig/src/io-context.c 2004-07-19 20:37:13.000000000
-0400
++++ gnumeric-1.4.3-patched/src/io-context.c 2005-09-19 00:44:06.917768272
-0400
+@@ -117,8 +117,8 @@
+ }
+
+ GSF_CLASS_FULL (IOContext, io_context,
+- io_context_class_init, io_context_init,
+- G_TYPE_OBJECT, 0,
++ NULL,NULL,io_context_class_init,NULL,
++ io_context_init,G_TYPE_OBJECT, 0,
+ GSF_INTERFACE (io_context_gnm_cmd_context_init,
GNM_CMD_CONTEXT_TYPE))
+
+ IOContext *
+diff -Naur gnumeric-1.4.3-orig/src/sheet-filter.c
gnumeric-1.4.3-patched/src/sheet-filter.c
+--- gnumeric-1.4.3-orig/src/sheet-filter.c 2004-10-16 22:36:05.000000000
-0400
++++ gnumeric-1.4.3-patched/src/sheet-filter.c 2005-09-19 00:44:06.920767816
-0400
+@@ -563,7 +563,7 @@
+ typedef FooCanvasWidget FilterFooView;
+ typedef FooCanvasWidgetClass FilterFooViewClass;
+ static GSF_CLASS_FULL (FilterFooView, filter_foo_view,
+- NULL, NULL,
++ NULL, NULL, NULL, NULL, NULL,
+ FOO_TYPE_CANVAS_WIDGET, 0,
+ GSF_INTERFACE (filter_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c
gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c
+--- gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c 2005-01-14
00:48:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c 2005-09-19
00:44:06.922767512 -0400
+@@ -123,7 +123,7 @@
+ typedef FooCanvasPolygon CommentFooView;
+ typedef FooCanvasPolygonClass CommentFooViewClass;
+ static GSF_CLASS_FULL (CommentFooView, comment_foo_view,
+- NULL, NULL,
++ NULL, NULL,NULL,NULL,NULL,
+ FOO_TYPE_CANVAS_POLYGON, 0,
+ GSF_INTERFACE (comment_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-graph.c
gnumeric-1.4.3-patched/src/sheet-object-graph.c
+--- gnumeric-1.4.3-orig/src/sheet-object-graph.c 2004-10-29
00:13:13.000000000 -0400
++++ gnumeric-1.4.3-patched/src/sheet-object-graph.c 2005-09-19
00:44:06.925767056 -0400
+@@ -94,7 +94,7 @@
+ typedef GogControlFooCanvas SOGraphFooView;
+ typedef GogControlFooCanvasClass SOGraphFooViewClass;
+ static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
+- NULL, NULL,
++ NULL, NULL, NULL, NULL, NULL,
+ GOG_CONTROL_FOOCANVAS_TYPE, 0,
+ GSF_INTERFACE (so_graph_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-image.c
gnumeric-1.4.3-patched/src/sheet-object-image.c
+--- gnumeric-1.4.3-orig/src/sheet-object-image.c 2004-12-17
23:48:37.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-image.c 2005-09-19
00:44:06.929766448 -0400
+@@ -90,7 +90,7 @@
+ typedef FooCanvasPixbuf SOImageFooView;
+ typedef FooCanvasPixbufClass SOImageFooViewClass;
+ static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view,
+- NULL, NULL,
++ NULL, NULL, NULL, NULL, NULL,
+ FOO_TYPE_CANVAS_PIXBUF, 0,
+ GSF_INTERFACE (so_image_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-widget.c
gnumeric-1.4.3-patched/src/sheet-object-widget.c
+--- gnumeric-1.4.3-orig/src/sheet-object-widget.c 2005-02-09
16:54:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-widget.c 2005-09-19
00:44:06.933765840 -0400
+@@ -99,7 +99,7 @@
+ typedef FooCanvasWidget SOWidgetFooView;
+ typedef FooCanvasWidgetClass SOWidgetFooViewClass;
+ static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view,
+- NULL, NULL,
++ NULL, NULL, NULL, NULL, NULL,
+ FOO_TYPE_CANVAS_WIDGET, 0,
+ GSF_INTERFACE (so_widget_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+
+diff -Naur gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c
gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c
+--- gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c 2004-09-07
15:28:41.000000000 -0400
++++ gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c 2005-09-19
00:44:06.937765232 -0400
+@@ -503,8 +503,8 @@
+ }
+
+ GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry,
+- gee_class_init, gee_init,
+- GTK_TYPE_HBOX, 0,
++ NULL, NULL, gee_class_init, NULL,
++ gee_init, GTK_TYPE_HBOX, 0,
+ GSF_INTERFACE (gee_cell_editable_init, GTK_TYPE_CELL_EDITABLE))
+
+ /**
+diff -Naur gnumeric-1.4.3-orig/src/workbook-control-gui.c
gnumeric-1.4.3-patched/src/workbook-control-gui.c
+--- gnumeric-1.4.3-orig/src/workbook-control-gui.c 2005-03-12
19:05:45.000000000 -0500
++++ gnumeric-1.4.3-patched/src/workbook-control-gui.c 2005-09-19
00:44:06.943764320 -0400
+@@ -2545,8 +2545,8 @@
+ }
+
+ GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui,
+- workbook_control_gui_class_init, workbook_control_gui_init,
+- WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
++ NULL,NULL,workbook_control_gui_class_init,NULL,
++ workbook_control_gui_init,WORKBOOK_CONTROL_TYPE,
G_TYPE_FLAG_ABSTRACT,
+ GSF_INTERFACE (wbcg_go_plot_data_allocator_init,
GOG_DATA_ALLOCATOR_TYPE);
+ GSF_INTERFACE (wbcg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+
Added: trunk/guile/guile-1.6.7-slib_3a2-1.patch
===================================================================
--- trunk/guile/guile-1.6.7-slib_3a2-1.patch 2005-10-30 06:58:13 UTC (rev
1221)
+++ trunk/guile/guile-1.6.7-slib_3a2-1.patch 2005-10-30 15:39:00 UTC (rev
1222)
@@ -0,0 +1,89 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-10-04
+Initial Package Version: 1.6.7
+Upstream Status: Unknown
+Origin:
http://article.gmane.org/gmane.comp.gnome.apps.gnucash.devel/13956
+Description: Fixes Guile with SLIB-3a2
+
+$LastChangedBy: randy $
+$Date: 2005-10-04 20:31:25 -0500 (Tue, 04 Oct 2005) $
+
+
+diff -Naur guile-1.6.7-orig/ice-9/slib.scm guile-1.6.7/ice-9/slib.scm
+--- guile-1.6.7-orig/ice-9/slib.scm 2004-08-11 20:04:21.000000000 -0500
++++ guile-1.6.7/ice-9/slib.scm 2005-10-04 19:48:04.000000000 -0500
+@@ -388,3 +388,74 @@
+
+ (define (make-exchanger obj)
+ (lambda (rep) (let ((old obj)) (set! obj rep) old)))
++
++(define software-type
++ (if (string<? (version) "1.6")
++ (lambda () 'UNIX)
++ (lambda () 'unix)))
++
++(define (user-vicinity)
++ (case (software-type)
++ ((VMS) "[.]")
++ (else "")))
++
++(define vicinity:suffix?
++ (let ((suffi
++ (case (software-type)
++ ((amiga) '(#\: #\/))
++ ((macos thinkc) '(#\:))
++ ((ms-dos windows atarist os/2) '(#\\ #\/))
++ ((nosve) '(#\: #\.))
++ ((unix coherent plan9) '(#\/))
++ ((vms) '(#\: #\]))
++ (else
++ (warn "require.scm" 'unknown 'software-type (software-type))
++ "/"))))
++ (lambda (chr) (and (memv chr suffi) #t))))
++
++(define (pathname->vicinity pathname)
++ (let loop ((i (- (string-length pathname) 1)))
++ (cond ((negative? i) "")
++ ((vicinity:suffix? (string-ref pathname i))
++ (substring pathname 0 (+ i 1)))
++ (else (loop (- i 1))))))
++
++(define (program-vicinity)
++ (define clp (current-load-port))
++ (if clp
++ (pathname->vicinity (port-filename clp))
++ (slib:error 'program-vicinity " called; use slib:load to load")))
++
++(define sub-vicinity
++ (case (software-type)
++ ((VMS) (lambda
++ (vic name)
++ (let ((l (string-length vic)))
++ (if (or (zero? (string-length vic))
++ (not (char=? #\] (string-ref vic (- l 1)))))
++ (string-append vic "[" name "]")
++ (string-append (substring vic 0 (- l 1))
++ "." name "]")))))
++ (else (let ((*vicinity-suffix*
++ (case (software-type)
++ ((NOSVE) ".")
++ ((MACOS THINKC) ":")
++ ((MS-DOS WINDOWS ATARIST OS/2) "\\")
++ ((unix COHERENT PLAN9 AMIGA) "/"))))
++ (lambda (vic name)
++ (string-append vic name *vicinity-suffix*))))))
++
++(define with-load-pathname
++ (let ((exchange
++ (lambda (new)
++ (let ((old program-vicinity))
++ (set! program-vicinity new)
++ old))))
++ (lambda (path thunk)
++ (define old #f)
++ (define vic (pathname->vicinity path))
++ (dynamic-wind
++ (lambda () (set! old (exchange (lambda () vic))))
++ thunk
++ (lambda () (exchange old))))))
++
Added: trunk/id3lib/id3lib-3.8.3-test_suite-1.patch
===================================================================
--- trunk/id3lib/id3lib-3.8.3-test_suite-1.patch 2005-10-30 06:58:13 UTC
(rev 1221)
+++ trunk/id3lib/id3lib-3.8.3-test_suite-1.patch 2005-10-30 15:39:00 UTC
(rev 1222)
@@ -0,0 +1,93 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-08-27
+Initial Package Version: 3.8.3
+Upstream Status: Not submitted
+Origin: Randy McMurchy and Gentoo CVS
+
(http://www.gentoo.org/cgi-bin/viewcvs.cgi/media-libs/\
+ id3lib/files/id3lib-3.8.3-test_io.patch?view=markup)
+Description: Fixes a problem with one of the test suite source
files
+ and adds a few things to actually do some tests
+
+$LastChangedBy: randy $
+$Date: 2005-08-27 19:54:44 -0500 (Sat, 27 Aug 2005) $
+
+
+diff -Naur id3lib-3.8.3-orig/examples/Makefile.in
id3lib-3.8.3/examples/Makefile.in
+--- id3lib-3.8.3-orig/examples/Makefile.in 2003-03-02 00:23:00.000000000
+0000
++++ id3lib-3.8.3/examples/Makefile.in 2005-08-28 00:15:42.000000000 +0000
+@@ -895,6 +895,8 @@
+ done
+ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
++ chmod 755 run_tests
++ ./run_tests
+ check: check-am
+ all-am: Makefile $(PROGRAMS)
+
+
+diff -Naur id3lib-3.8.3-orig/examples/run_tests id3lib-3.8.3/examples/run_tests
+--- id3lib-3.8.3-orig/examples/run_tests 1970-01-01 00:00:00.000000000
+0000
++++ id3lib-3.8.3/examples/run_tests 2005-08-28 00:15:42.000000000 +0000
+@@ -0,0 +1,50 @@
++#!/bin/sh
++
++echo
++echo "Running tests..."
++echo
++
++./testremove
++
++if [ $? ]; then
++ echo
++ echo "----------------------------"
++ echo "Tag remove test: PASSED"
++ echo "----------------------------"
++else
++ echo
++ echo "----------------------------"
++ echo "Tag remove test: FAILED"
++ echo "----------------------------"
++fi
++
++./testcompression
++cmp 230-compressed.tag test-230-compressed.tag >/dev/null 2>&1
++
++if [ $? ]; then
++ echo
++ echo "----------------------------"
++ echo "Tag compression test: PASSED"
++ echo "----------------------------"
++else
++ echo
++ echo "----------------------------"
++ echo "Tag compression test: FAILED"
++ echo "----------------------------"
++fi
++
++./testpic
++cmp 230-picture.tag test-230-picture.tag >/dev/null 2>&1
++
++if [ $? ]; then
++ echo
++ echo "----------------------------"
++ echo "Picture test: PASSED"
++ echo "----------------------------"
++else
++ echo
++ echo "----------------------------"
++ echo "Picture test: FAILED"
++ echo "----------------------------"
++fi
++
+
+diff -Naur id3lib-3.8.3-orig/examples/test_io.cpp
id3lib-3.8.3/examples/test_io.cpp
+--- id3lib-3.8.3-orig/examples/test_io.cpp 2003-03-02 00:23:00.000000000
+0000
++++ id3lib-3.8.3/examples/test_io.cpp 2005-08-28 00:15:42.000000000 +0000
+@@ -16,6 +16,7 @@
+ using std::cerr;
+
+ using namespace dami;
++using namespace std;
+
+ int
+ main(size_t argc, const char** argv)
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
