[prev in list] [next in list] [prev in thread] [next in thread]
List: mingw-cvs
Subject: MinGW-cvs Digest, Vol 31, Issue 3
From: mingw-cvs-request () lists ! sourceforge ! net
Date: 2010-08-09 18:46:54
Message-ID: mailman.845378.1281379614.4911.mingw-cvs () lists ! sourceforge ! net
[Download RAW message or body]
Send MinGW-cvs mailing list submissions to
mingw-cvs@lists.sourceforge.net
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
or, via email, send a message with subject or body 'help' to
mingw-cvs-request@lists.sourceforge.net
You can reach the person managing the list at
mingw-cvs-owner@lists.sourceforge.net
When replying, please edit your Subject line so it is more specific
than "Re: Contents of MinGW-cvs digest..."
This list will notify you of updates to the code stored in CVS. Typically only \
developers with access to update the CVS are interested in this list. However, this \
list can be beneficial to see what is happening with your changes. If you wish to \
unsubscribe please do so at https://lists.sourceforge.net/lists/listinfo/mingw-cvs.
Today's Topics:
1. mingw-get/src tarproc.cpp,1.7,1.8 pkgproc.h,1.3,1.4
(Keith Marshall)
2. mingw-dist/msys issue.log, 1.6, 1.7 msys-base.xml, 1.4, 1.5
msys-cygutils.xml, 1.2, 1.3 msys-file.xml, 1.2, 1.3
msys-make.xml, 1.2, 1.3 msys-package-list.xml, 1.4, 1.5
msys-popt.xml, 1.2, 1.3 msys-texinfo.xml, 1.2, 1.3 msys-zlib.xml,
1.6, 1.7 (Keith Marshall)
----------------------------------------------------------------------
Message: 1
Date: Fri, 06 Aug 2010 22:34:51 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get/src tarproc.cpp,1.7,1.8
pkgproc.h,1.3,1.4
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1OhVV5-0001sF-Q9@sfp-cvsdas-4.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7136/src
Modified Files:
tarproc.cpp pkgproc.h
Log Message:
Handle the GNU long name tar header format.
Index: pkgproc.h
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgproc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pkgproc.h 4 Apr 2010 15:25:36 -0000 1.3
--- pkgproc.h 6 Aug 2010 22:34:39 -0000 1.4
***************
*** 126,129 ****
--- 126,130 ----
#define TAR_ENTITY_TYPE_BLKDEV '4'
#define TAR_ENTITY_TYPE_DIRECTORY '5'
+ #define TAR_ENTITY_TYPE_GNU_LONGNAME 'L'
/* Some older style tar archives may use '\0' as an alternative to '0',
***************
*** 160,163 ****
--- 161,165 ----
virtual int GetArchiveEntry();
virtual int ProcessEntityData( int );
+ virtual char *EntityDataAsString();
/* ...those for which each specialisation is expected to
Index: tarproc.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/tarproc.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tarproc.cpp 11 May 2010 18:13:01 -0000 1.7
--- tarproc.cpp 6 Aug 2010 22:34:39 -0000 1.8
***************
*** 232,241 ****
while( GetArchiveEntry() > 0 )
{
/* Found an archive entry; map it to an equivalent file system
* path name, within the designated sysroot hierarchy.
*/
! char *prefix = *header.field.prefix ? header.field.prefix : NULL;
! char pathname[mkpath( NULL, sysroot_path, header.field.name, prefix )];
! mkpath( pathname, sysroot_path, header.field.name, prefix );
/* Direct further processing to the appropriate handler; (this
--- 232,270 ----
while( GetArchiveEntry() > 0 )
{
+ char *prefix = *header.field.prefix ? header.field.prefix : NULL;
+ char *name = header.field.name;
+
+ /* Handle the GNU long name header format.
+ * If the pathname overflows the name field, GNU tar creates a special
+ * entry type, where the data contains the full pathname for the
+ * following entry.
+ */
+ char *longname = NULL;
+ if( *header.field.typeflag == TAR_ENTITY_TYPE_GNU_LONGNAME )
+ {
+ /* Extract the full pathname from the data of this entry.
+ */
+ longname = EntityDataAsString();
+ if( !longname )
+ dmh_notify( DMH_ERROR, "Unable to read a long name entry\n" );
+
+ /* Read the entry for which this long name is intended.
+ */
+ if( GetArchiveEntry() <= 0 )
+ dmh_notify( DMH_ERROR, "Expected a new entry after a long name entry\n" );
+
+ /* Use the previously determined long name as the pathname for this entry.
+ */
+ prefix = NULL;
+ name = longname;
+ }
+
/* Found an archive entry; map it to an equivalent file system
* path name, within the designated sysroot hierarchy.
*/
! char pathname[mkpath( NULL, sysroot_path, name, prefix )];
! mkpath( pathname, sysroot_path, name, prefix );
!
! free( longname );
/* Direct further processing to the appropriate handler; (this
***************
*** 389,392 ****
--- 418,460 ----
}
+ char *pkgTarArchiveProcessor::EntityDataAsString()
+ {
+ /* Read the data associated with a specific header within a tar archive
+ * and return it as a string. The return value is stored in memory which
+ * is allocated by malloc; it should be freed when no longer required.
+ *
+ * It is assumed that the return data can be accommodated within available
+ * heap memory. Since the length isn't returned, we assume that the string
+ * is NUL-terminated, and that it contains no embedded NULs.
+ *
+ * In the event of any error, NULL is returned.
+ */
+ char *data;
+ uint64_t bytes_to_copy = octval( header.field.size );
+
+ /* Round the buffer size to the smallest multiple of the record size.
+ */
+ bytes_to_copy += sizeof( header ) - 1;
+ bytes_to_copy -= bytes_to_copy % sizeof( header );
+
+ /* Allocate the data buffer.
+ */
+ data = (char*)(malloc( bytes_to_copy ));
+ if( !data )
+ return NULL;
+
+ /* Read the data into the buffer.
+ */
+ size_t count = stream->Read( data, bytes_to_copy );
+ if( count < bytes_to_copy )
+ {
+ /* Failure to fully populate the transfer buffer, (i.e. a short
+ * read), indicates a corrupt archive.
+ */
+ free( data );
+ return NULL;
+ }
+ return data;
+ }
/*******************
------------------------------
Message: 2
Date: Mon, 09 Aug 2010 18:46:46 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-dist/msys issue.log, 1.6, 1.7
msys-base.xml, 1.4, 1.5 msys-cygutils.xml, 1.2, 1.3 msys-file.xml,
1.2, 1.3 msys-make.xml, 1.2, 1.3 msys-package-list.xml, 1.4, 1.5
msys-popt.xml, 1.2, 1.3 msys-texinfo.xml, 1.2, 1.3 msys-zlib.xml, 1.6,
1.7
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1OiXN0-0000ia-UX@sfp-cvsdas-4.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-dist/msys
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2491
Modified Files:
issue.log msys-base.xml msys-cygutils.xml msys-file.xml
msys-make.xml msys-package-list.xml msys-popt.xml
msys-texinfo.xml msys-zlib.xml
Log Message:
Add make, file, texinfo and dos2unix (cygutils) to msys-base.
Index: msys-zlib.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-zlib.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** msys-zlib.xml 11 Jul 2010 19:27:10 -0000 1.6
--- msys-zlib.xml 9 Aug 2010 18:46:44 -0000 1.7
***************
*** 1,6 ****
--- 1,10 ----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> +
+ <!-- File: msys-zlib.xml -->
+
<package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
<package name="msys-zlib">
<description lang="en" title="ZLib (msys): A Massively Spiffy Yet Delicately \
Unobtrusive Compression Library">
***************
*** 10,38 ****
</paragraph>
</description>
! <!-- note: for historical reasons, the zlib dll component does not
! specify a soname -->
<component class="dll">
! <release tarname="zlib-1.2.3-1-msys-1.0.11-dll.tar.gz" />
<release tarname="zlib-1.2.3-2-msys-1.0.13-dll.tar.lzma" />
<requires eq="msys-core-*-msys-*-bin.tar" />
</component>
<component class="dev">
- <release tarname="zlib-1.2.3-1-msys-1.0.11-dev.tar.gz" />
<release tarname="zlib-1.2.3-2-msys-1.0.13-dev.tar.lzma" />
<requires eq="msys-zlib-%-msys-%-dll.tar" />
</component>
<component class="doc">
- <release tarname="zlib-1.2.3-1-msys-1.0.11-doc.tar.gz" />
<release tarname="zlib-1.2.3-2-msys-1.0.13-doc.tar.lzma" />
</component>
<component class="lic">
- <release tarname="zlib-1.2.3-1-msys-1.0.11-lic.tar.gz" />
<release tarname="zlib-1.2.3-2-msys-1.0.13-lic.tar.lzma" />
</component>
- <licence tarname="zlib-%-msys-%-lic.tar" />
- <source tarname="zlib-%-msys-%-src.tar" />
</package>
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
!
--- 14,44 ----
</paragraph>
</description>
!
! <source tarname="zlib-%-msys-%-src.tar" />
! <licence tarname="zlib-%-msys-%-lic.tar" />
!
<component class="dll">
! <!-- note: for historical reasons,
! the zlib dll component does not specify a soname
! -->
<release tarname="zlib-1.2.3-2-msys-1.0.13-dll.tar.lzma" />
<requires eq="msys-core-*-msys-*-bin.tar" />
</component>
+
<component class="dev">
<release tarname="zlib-1.2.3-2-msys-1.0.13-dev.tar.lzma" />
<requires eq="msys-zlib-%-msys-%-dll.tar" />
</component>
+
<component class="doc">
<release tarname="zlib-1.2.3-2-msys-1.0.13-doc.tar.lzma" />
</component>
+
<component class="lic">
<release tarname="zlib-1.2.3-2-msys-1.0.13-lic.tar.lzma" />
</component>
</package>
+
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 \
shiftwidth=2: -->
Index: msys-cygutils.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-cygutils.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys-cygutils.xml 11 Jul 2010 19:27:10 -0000 1.2
--- msys-cygutils.xml 9 Aug 2010 18:46:44 -0000 1.3
***************
*** 1,4 ****
--- 1,7 ----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> +
+ <!-- File: msys-cygutils.xml -->
+
<package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
***************
*** 33,54 ****
</paragraph>
</description>
<component class="bin">
- <release tarname="cygutils-1.3.4-3-msys-1.0.11-bin.tar.lzma" />
- <release tarname="cygutils-1.3.4-4-msys-1.0.13-bin.tar.lzma" />
<requires eq="msys-core-*-msys-*-bin.tar" />
! <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
</component>
<component class="doc">
- <release tarname="cygutils-1.3.4-3-msys-1.0.11-doc.tar.lzma" />
<release tarname="cygutils-1.3.4-4-msys-1.0.13-doc.tar.lzma" />
</component>
<component class="lic">
- <release tarname="cygutils-1.3.4-3-msys-1.0.11-lic.tar.lzma" />
<release tarname="cygutils-1.3.4-4-msys-1.0.13-lic.tar.lzma" />
</component>
- <licence tarname="cygutils-%-msys-%-lic.tar" />
- <source tarname="cygutils-%-msys-%-src.tar" />
</package>
! <package name="msys-cygutils-dos2unix">
<affiliate group="MSYS Base System" />
<description lang="en" title="cygutils-dos2unix (msys): line-ending \
conversion utilities" >
--- 36,60 ----
</paragraph>
</description>
+
+ <source tarname="cygutils-%-msys-%-src.tar" />
+ <licence tarname="cygutils-%-msys-%-lic.tar" />
+
<component class="bin">
<requires eq="msys-core-*-msys-*-bin.tar" />
! <release tarname="cygutils-1.3.4-4-msys-1.0.13-bin.tar.lzma">
! <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
! </release>
</component>
+
<component class="doc">
<release tarname="cygutils-1.3.4-4-msys-1.0.13-doc.tar.lzma" />
</component>
+
<component class="lic">
<release tarname="cygutils-1.3.4-4-msys-1.0.13-lic.tar.lzma" />
</component>
</package>
!
! <package name="msys-cygutils-dos2unix" alias="msys-dos2unix">
<affiliate group="MSYS Base System" />
<description lang="en" title="cygutils-dos2unix (msys): line-ending \
conversion utilities" >
***************
*** 73,87 ****
</paragraph>
</description>
<component class="bin">
- <release tarname="cygutils-dos2unix-1.3.4-3-msys-1.0.11-bin.tar.lzma" />
- <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-bin.tar.lzma" />
<requires eq="msys-core-*-msys-*-bin.tar" />
! <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
</component>
- <licence tarname="cygutils-%-msys-%-lic.tar" />
- <source tarname="cygutils-%-msys-%-src.tar" />
</package>
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
!
--- 79,95 ----
</paragraph>
</description>
+
+ <source tarname="cygutils-%-msys-%-src.tar" />
+ <licence tarname="cygutils-%-msys-%-lic.tar" />
+
<component class="bin">
<requires eq="msys-core-*-msys-*-bin.tar" />
! <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-bin.tar.lzma">
! <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
! </release>
</component>
</package>
+
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 \
shiftwidth=2: -->
Index: msys-package-list.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-package-list.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** msys-package-list.xml 6 Aug 2010 17:40:22 -0000 1.4
--- msys-package-list.xml 9 Aug 2010 18:46:44 -0000 1.5
***************
*** 33,41 ****
<!--package-list catalogue="msys-crypt" /-->
<!--package-list catalogue="msys-cvs" /-->
! <!--package-list catalogue="msys-cygutils" /-->
<!--package-list catalogue="msys-dash" /-->
<package-list catalogue="msys-diffutils" />
<!--package-list catalogue="msys-expat" /-->
! <!--package-list catalogue="msys-file" /-->
<package-list catalogue="msys-findutils" />
<!--package-list catalogue="msys-flex" /-->
--- 33,41 ----
<!--package-list catalogue="msys-crypt" /-->
<!--package-list catalogue="msys-cvs" /-->
! <package-list catalogue="msys-cygutils" />
<!--package-list catalogue="msys-dash" /-->
<package-list catalogue="msys-diffutils" />
<!--package-list catalogue="msys-expat" /-->
! <package-list catalogue="msys-file" />
<package-list catalogue="msys-findutils" />
<!--package-list catalogue="msys-flex" /-->
***************
*** 58,62 ****
<!--package-list catalogue="msys-lpr-enhanced" /-->
<!--package-list catalogue="msys-m4" /-->
! <!--package-list catalogue="msys-make" /-->
<!--package-list catalogue="msys-man" /-->
<!--package-list catalogue="msys-minires" /-->
--- 58,62 ----
<!--package-list catalogue="msys-lpr-enhanced" /-->
<!--package-list catalogue="msys-m4" /-->
! <package-list catalogue="msys-make" />
<!--package-list catalogue="msys-man" /-->
<!--package-list catalogue="msys-minires" /-->
***************
*** 66,70 ****
<!--package-list catalogue="msys-patch" /-->
<!--package-list catalogue="msys-perl" /-->
! <!--package-list catalogue="msys-popt" /-->
<!--package-list catalogue="msys-rebase" /-->
<package-list catalogue="msys-regex" />
--- 66,70 ----
<!--package-list catalogue="msys-patch" /-->
<!--package-list catalogue="msys-perl" /-->
! <package-list catalogue="msys-popt" />
<!--package-list catalogue="msys-rebase" /-->
<package-list catalogue="msys-regex" />
***************
*** 73,77 ****
<package-list catalogue="msys-tar" />
<package-list catalogue="msys-termcap" />
! <!--package-list catalogue="msys-texinfo" /-->
<!--package-list catalogue="msys-unzip" /-->
<!--package-list catalogue="msys-vim" /-->
--- 73,77 ----
<package-list catalogue="msys-tar" />
<package-list catalogue="msys-termcap" />
! <package-list catalogue="msys-texinfo" />
<!--package-list catalogue="msys-unzip" /-->
<!--package-list catalogue="msys-vim" /-->
***************
*** 80,84 ****
<package-list catalogue="msys-xz" />
<!--package-list catalogue="msys-zip" /-->
! <!--package-list catalogue="msys-zlib" /-->
<!-- "virtual" packages -->
--- 80,84 ----
<package-list catalogue="msys-xz" />
<!--package-list catalogue="msys-zip" /-->
! <package-list catalogue="msys-zlib" />
<!-- "virtual" packages -->
Index: msys-texinfo.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-texinfo.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys-texinfo.xml 11 Jul 2010 19:27:10 -0000 1.2
--- msys-texinfo.xml 9 Aug 2010 18:46:44 -0000 1.3
***************
*** 1,9 ****
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> <package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
<package name="msys-texinfo">
<affiliate group="MSYS Base System" />
! <description lang="en" title="texinfo: Documentatino system for on-line \
information and printed output" >
<paragraph>Texinfo is the official documentation format of the GNU
project. It was invented by Richard Stallman and Bob Chassell
--- 1,13 ----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> +
+ <!-- File: msys-texinfo.xml -->
+
<package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
<package name="msys-texinfo">
<affiliate group="MSYS Base System" />
! <description lang="en" title="texinfo: Documentation system for on-screen and \
printed manuals" >
<paragraph>Texinfo is the official documentation format of the GNU
project. It was invented by Richard Stallman and Bob Chassell
***************
*** 23,62 ****
correctly in an info/ directory and updating the info/dir
manifest; and info, a viewer for info documentation files. Note
! that generating .dvi or .pdf output requires an full-fledged TeX
implementation, which is not available as part of the MinGW/MSYS
distribution -- MikTeX may be of some assistance.
</paragraph>
</description>
<component class="bin">
! <release tarname="texinfo-4.13a-1-msys-1.0.11-bin.tar.lzma" />
! <release tarname="texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma" >
<requires eq="msys-libintl-*-msys-*-dll-8.tar" />
<requires eq="msys-libtermcap-*-msys-*-dll-0.tar" />
</release>
! <requires eq="msys-core-*-msys-*-bin.tar" />
! <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
<!-- the following are required by the texi2dvi script -->
<requires eq="msys-bash-*-msys-*-bin.tar" />
<requires eq="msys-coreutils-*-msys-*-bin.tar" />
- <requires eq="msys-grep-*-msys-*-bin.tar" />
<requires eq="msys-diffutils-*-msys-*-bin.tar" />
<requires eq="msys-tar-*-msys-*-bin.tar" />
</component>
<component class="lang">
<release tarname="texinfo-4.13a-2-msys-1.0.13-lang.tar.lzma" />
</component>
<component class="doc">
- <release tarname="texinfo-4.13a-1-msys-1.0.11-doc.tar.lzma" />
<release tarname="texinfo-4.13a-2-msys-1.0.13-doc.tar.lzma" />
</component>
<component class="lic">
- <release tarname="texinfo-4.13a-1-msys-1.0.11-lic.tar.lzma" />
<release tarname="texinfo-4.13a-2-msys-1.0.13-lic.tar.lzma" />
</component>
- <licence tarname="texinfo-%-msys-%-lic.tar" />
- <source tarname="texinfo-%-msys-%-src.tar" />
</package>
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
!
--- 27,70 ----
correctly in an info/ directory and updating the info/dir
manifest; and info, a viewer for info documentation files. Note
! that generating .dvi or .pdf output requires a fully-fledged TeX
implementation, which is not available as part of the MinGW/MSYS
distribution -- MikTeX may be of some assistance.
</paragraph>
</description>
+
+ <source tarname="texinfo-%-msys-%-src.tar" />
+ <licence tarname="texinfo-%-msys-%-lic.tar" />
+
<component class="bin">
! <requires eq="msys-core-*-msys-*-bin.tar" />
!
! <release tarname="texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma">
<requires eq="msys-libintl-*-msys-*-dll-8.tar" />
<requires eq="msys-libtermcap-*-msys-*-dll-0.tar" />
+ <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
</release>
!
<!-- the following are required by the texi2dvi script -->
<requires eq="msys-bash-*-msys-*-bin.tar" />
<requires eq="msys-coreutils-*-msys-*-bin.tar" />
<requires eq="msys-diffutils-*-msys-*-bin.tar" />
+ <requires eq="msys-grep-*-msys-*-bin.tar" />
<requires eq="msys-tar-*-msys-*-bin.tar" />
</component>
+
<component class="lang">
<release tarname="texinfo-4.13a-2-msys-1.0.13-lang.tar.lzma" />
</component>
+
<component class="doc">
<release tarname="texinfo-4.13a-2-msys-1.0.13-doc.tar.lzma" />
</component>
+
<component class="lic">
<release tarname="texinfo-4.13a-2-msys-1.0.13-lic.tar.lzma" />
</component>
</package>
+
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 \
shiftwidth=2: -->
Index: msys-make.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-make.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys-make.xml 11 Jul 2010 19:27:10 -0000 1.2
--- msys-make.xml 9 Aug 2010 18:46:44 -0000 1.3
***************
*** 1,6 ****
--- 1,10 ----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> +
+ <!-- File: msys-make.xml -->
+
<package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
<package name="msys-make">
<affiliate group="MSYS Base System" />
***************
*** 31,58 ****
</paragraph>
</description>
<component class="bin">
! <release tarname="make-3.81-2-msys-1.0.11-bin.tar.lzma" />
<release tarname="make-3.81-3-msys-1.0.13-bin.tar.lzma" >
<requires eq="msys-libintl-*-msys-*-dll-8.tar" />
</release>
- <requires eq="msys-core-*-msys-*-bin.tar" />
</component>
<component class="lang">
- <release tarname="make-3.81-2-msys-1.0.11-lang.tar.lzma" />
<release tarname="make-3.81-3-msys-1.0.13-lang.tar.lzma" />
</component>
<component class="doc">
- <release tarname="make-3.81-2-msys-1.0.11-doc.tar.lzma" />
<release tarname="make-3.81-3-msys-1.0.13-doc.tar.lzma" />
</component>
<component class="lic">
- <release tarname="make-3.81-2-msys-1.0.11-lic.tar.lzma" />
<release tarname="make-3.81-3-msys-1.0.13-lic.tar.lzma" />
</component>
- <licence tarname="make-%-msys-%-lic.tar" />
- <source tarname="make-%-msys-%-src.tar" />
</package>
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
!
--- 35,64 ----
</paragraph>
</description>
+
+ <source tarname="make-%-msys-%-src.tar" />
+ <licence tarname="make-%-msys-%-lic.tar" />
+
<component class="bin">
! <requires eq="msys-core-*-msys-*-bin.tar" />
!
<release tarname="make-3.81-3-msys-1.0.13-bin.tar.lzma" >
<requires eq="msys-libintl-*-msys-*-dll-8.tar" />
</release>
</component>
+
<component class="lang">
<release tarname="make-3.81-3-msys-1.0.13-lang.tar.lzma" />
</component>
+
<component class="doc">
<release tarname="make-3.81-3-msys-1.0.13-doc.tar.lzma" />
</component>
+
<component class="lic">
<release tarname="make-3.81-3-msys-1.0.13-lic.tar.lzma" />
</component>
</package>
+
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 \
shiftwidth=2: -->
Index: msys-file.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-file.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys-file.xml 11 Jul 2010 19:27:10 -0000 1.2
--- msys-file.xml 9 Aug 2010 18:46:44 -0000 1.3
***************
*** 1,6 ****
--- 1,10 ----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> +
+ <!-- File: msys-file.xml -->
+
<package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
<package name="msys-file">
<affiliate group="MSYS Base System" />
***************
*** 17,37 ****
</paragraph>
</description>
<component class="bin">
! <release tarname="file-5.03-1-msys-1.0.11-bin.tar.lzma" />
! <release tarname="file-5.04-1-msys-1.0.13-bin.tar.lzma" />
! <requires eq="msys-core-*-msys-*-bin.tar" />
! <requires eq="msys-libmagic-%-msys-%-dll-1.tar" />
</component>
<component class="doc">
- <release tarname="file-5.03-1-msys-1.0.11-doc.tar.lzma" />
<release tarname="file-5.04-1-msys-1.0.13-doc.tar.lzma" />
</component>
<component class="lic">
- <release tarname="file-5.03-1-msys-1.0.11-lic.tar.lzma" />
<release tarname="file-5.04-1-msys-1.0.13-lic.tar.lzma" />
</component>
- <licence tarname="file-%-msys-%-lic.tar" />
- <source tarname="file-%-msys-%-src.tar" />
</package>
<package name="msys-libmagic">
<description lang="en" title="libmagic: library for determining file type" >
--- 21,47 ----
</paragraph>
</description>
+
+ <source tarname="file-%-msys-%-src.tar" />
+ <licence tarname="file-%-msys-%-lic.tar" />
+
<component class="bin">
! <!-- Although every MSYS package requires msys-core-bin,
! we do not specify that here; instead, we rely on implicit
! inclusion via the locally specified libmagic dependency.
! -->
! <release tarname="file-5.04-1-msys-1.0.13-bin.tar.lzma">
! <requires eq="msys-libmagic-%-msys-%-dll-1.tar" />
! </release>
</component>
+
<component class="doc">
<release tarname="file-5.04-1-msys-1.0.13-doc.tar.lzma" />
</component>
+
<component class="lic">
<release tarname="file-5.04-1-msys-1.0.13-lic.tar.lzma" />
</component>
</package>
+
<package name="msys-libmagic">
<description lang="en" title="libmagic: library for determining file type" >
***************
*** 47,67 ****
</paragraph>
</description>
<component class="dll">
! <release tarname="libmagic-5.03-1-msys-1.0.11-dll-1.tar.lzma" />
! <release tarname="libmagic-5.04-1-msys-1.0.13-dll-1.tar.lzma" />
<requires eq="msys-core-*-msys-*-bin.tar" />
<requires eq="msys-zlib-*-msys-*-dll.tar" />
! <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
</component>
<component class="dev">
! <release tarname="libmagic-5.03-1-msys-1.0.11-dev.tar.lzma" />
! <release tarname="libmagic-5.04-1-msys-1.0.13-dev.tar.lzma" />
! <requires eq="msys-libmagic-%-msys-%-dll-1.tar" />
</component>
- <licence tarname="file-%-msys-%-lic.tar" />
- <source tarname="file-%-msys-%-src.tar" />
</package>
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
!
--- 57,85 ----
</paragraph>
</description>
+
+ <source tarname="file-%-msys-%-src.tar" />
+ <licence tarname="file-%-msys-%-lic.tar" />
+
<component class="dll">
! <!-- Requirements common to all releases:
! Every MSYS package requires msys-core-bin; this one also
! requires zlib dll, which lacks an ABI version qualifier.
! -->
<requires eq="msys-core-*-msys-*-bin.tar" />
<requires eq="msys-zlib-*-msys-*-dll.tar" />
!
! <release tarname="libmagic-5.04-1-msys-1.0.13-dll-1.tar.lzma">
! <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
! </release>
</component>
+
<component class="dev">
! <release tarname="libmagic-5.04-1-msys-1.0.13-dev.tar.lzma">
! <requires eq="msys-libmagic-%-msys-%-dll-1.tar" />
! </release>
</component>
</package>
+
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 \
shiftwidth=2: -->
Index: msys-base.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-base.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** msys-base.xml 6 Aug 2010 17:40:22 -0000 1.4
--- msys-base.xml 9 Aug 2010 18:46:44 -0000 1.5
***************
*** 47,58 ****
--- 47,62 ----
<requires eq="msys-core-*-msys-*-ext.tar" />
<requires eq="msys-coreutils-*-msys-*-bin.tar" />
+ <requires eq="msys-cygutils-dos2unix-*-msys-*-bin.tar" />
<requires eq="msys-diffutils-*-msys-*-bin.tar" />
<requires eq="msys-findutils-*-msys-*-bin.tar" />
+ <requires eq="msys-file-*-msys-*-bin.tar" />
<requires eq="msys-gawk-*-msys-*-bin.tar" />
<requires eq="msys-grep-*-msys-*-bin.tar" />
<requires eq="msys-gzip-*-msys-*-bin.tar" />
<requires eq="msys-less-*-msys-*-bin.tar" />
+ <requires eq="msys-make-*-msys-*-bin.tar" />
<requires eq="msys-sed-*-msys-*-bin.tar" />
<requires eq="msys-tar-*-msys-*-bin.tar" />
+ <requires eq="msys-texinfo-*-msys-*-bin.tar" />
<requires eq="msys-xz-*-msys-*-bin.tar" />
</component>
Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/issue.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** issue.log 6 Aug 2010 17:40:22 -0000 1.6
--- issue.log 9 Aug 2010 18:46:44 -0000 1.7
***************
*** 24,33 ****
# arising from the use of this software.
#
! msys-base.xml:2010080600
msys-bash.xml:2010071901
msys-bzip2.xml:2010080500
msys-coreutils.xml:2010071901
msys-core.xml:2010080500
msys-diffutils.xml:2010072800
msys-findutils.xml:2010080600
msys-gawk.xml:2010072600
--- 24,35 ----
# arising from the use of this software.
#
! msys-base.xml:2010080900
msys-bash.xml:2010071901
msys-bzip2.xml:2010080500
msys-coreutils.xml:2010071901
msys-core.xml:2010080500
+ msys-cygutils.xml:2010080900
msys-diffutils.xml:2010072800
+ msys-file.xml:2010080900
msys-findutils.xml:2010080600
msys-gawk.xml:2010072600
***************
*** 37,46 ****
msys-less.xml:2010080500
msys-libiconv.xml:2010071900
! msys-package-list.xml:2010080600
msys-regex.xml:2010080500
msys-sed.xml:2010072600
msys-tar.xml:2010072800
msys-termcap.xml:2010071900
msys-xz.xml:2010080500
#
# $RCSfile$: end of file
--- 39,52 ----
msys-less.xml:2010080500
msys-libiconv.xml:2010071900
! msys-make.xml:2010080900
! msys-package-list.xml:2010080900
! msys-popt.xml:2010080900
msys-regex.xml:2010080500
msys-sed.xml:2010072600
msys-tar.xml:2010072800
msys-termcap.xml:2010071900
+ msys-texinfo.xml:2010080900
msys-xz.xml:2010080500
+ msys-zlib.xml:2010080900
#
# $RCSfile$: end of file
Index: msys-popt.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-popt.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msys-popt.xml 11 Jul 2010 19:27:10 -0000 1.2
--- msys-popt.xml 9 Aug 2010 18:46:44 -0000 1.3
***************
*** 1,6 ****
--- 1,10 ----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<software-distribution project="MinGW" home="http://mingw.org" \
issue="@YYYYMMDDNN@"> +
+ <!-- File: msys-popt.xml -->
+
<package-collection subsystem="msys">
<download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
<package name="msys-popt">
<description lang="en" title="popt (msys): Command line option parsing \
library" >
***************
*** 16,30 ****
</paragraph>
</description>
<component class="doc">
- <release tarname="popt-1.15-1-msys-1.0.11-doc.tar.lzma" />
<release tarname="popt-1.15-2-msys-1.0.13-doc.tar.lzma" />
</component>
<component class="lic">
- <release tarname="popt-1.15-1-msys-1.0.11-lic.tar.lzma" />
<release tarname="popt-1.15-2-msys-1.0.13-lic.tar.lzma" />
</component>
- <licence tarname="popt-%-msys-%-lic.tar" />
- <source tarname="popt-%-msys-%-src.tar" />
</package>
<package name="msys-libpopt">
<description lang="en" title="libpopt (msys): Command line option parsing \
library" >
--- 20,36 ----
</paragraph>
</description>
+
+ <source tarname="popt-%-msys-%-src.tar" />
+ <licence tarname="popt-%-msys-%-lic.tar" />
+
<component class="doc">
<release tarname="popt-1.15-2-msys-1.0.13-doc.tar.lzma" />
</component>
+
<component class="lic">
<release tarname="popt-1.15-2-msys-1.0.13-lic.tar.lzma" />
</component>
</package>
+
<package name="msys-libpopt">
<description lang="en" title="libpopt (msys): Command line option parsing \
library" >
***************
*** 40,63 ****
</paragraph>
</description>
<component class="dll">
! <release tarname="libpopt-1.15-1-msys-1.0.11-dll-0.tar.lzma" />
<release tarname="libpopt-1.15-2-msys-1.0.13-dll-0.tar.lzma" >
! <requires eq="msys-libintl-%-msys-%-dll-8.tar" />
</release>
- <requires eq="msys-core-*-msys-*-bin.tar" />
</component>
<component class="dev">
! <release tarname="libpopt-1.15-1-msys-1.0.11-dev.tar.lzma" />
! <release tarname="libpopt-1.15-2-msys-1.0.13-dev.tar.lzma" />
! <requires eq="msys-libpopt-%-msys-%-dll-0.tar" />
</component>
<component class="lang">
<release tarname="libpopt-1.15-2-msys-1.0.13-lang.tar.lzma" />
</component>
- <licence tarname="popt-%-msys-%-lic.tar" />
- <source tarname="popt-%-msys-%-src.tar" />
</package>
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
!
--- 46,72 ----
</paragraph>
</description>
+
+ <source tarname="popt-%-msys-%-src.tar" />
+ <licence tarname="popt-%-msys-%-lic.tar" />
+
<component class="dll">
! <requires eq="msys-core-*-msys-*-bin.tar" />
<release tarname="libpopt-1.15-2-msys-1.0.13-dll-0.tar.lzma" >
! <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
</release>
</component>
+
<component class="dev">
! <release tarname="libpopt-1.15-2-msys-1.0.13-dev.tar.lzma">
! <requires eq="msys-libpopt-%-msys-%-dll-0.tar" />
! </release>
</component>
+
<component class="lang">
<release tarname="libpopt-1.15-2-msys-1.0.13-lang.tar.lzma" />
</component>
</package>
+
</package-collection>
</software-distribution>
! <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 \
shiftwidth=2: -->
------------------------------
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
------------------------------
_______________________________________________
MinGW-cvs mailing list
MinGW-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
End of MinGW-cvs Digest, Vol 31, Issue 3
****************************************
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic