August 2015 - crux-commits

ports/opt (3.2): firefox: added zip to the Deps
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 2f56f028a40c10c6a6b0bcdcc40a9503de66ad3e Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Aug 5 00:34:50 2015 +0200 firefox: added zip to the Deps diff --git a/firefox/Pkgfile b/firefox/Pkgfile index 12a24ea..d8ea413 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -1,7 +1,7 @@ # Description: The Mozilla Firefox browser # URL: http://www.mozilla.com/firefox/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: nss, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base +# Depends on: nss, zip, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base name=firefox version=39.0

1 0

ports/opt (3.1): cups: don't try to build with clang, use cc resp. c++
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit ecd6d664877f5cf0e79874045152dd4aaecca890 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Aug 4 20:37:30 2015 +0200 cups: don't try to build with clang, use cc resp. c++ diff --git a/cups/Pkgfile b/cups/Pkgfile index d63b7b9..f62a5ab 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -12,6 +12,7 @@ source=(http://www.cups.org/software/$version/$name-$version-source.tar.bz2 build () { cd $name-$version + CC=cc CXX=c++ \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \

1 0

ports/core (3.2): util-linux: update to 2.27-rc1
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 4024dbae116c0c231985928f5e72aa3504efe167 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Aug 4 15:15:44 2015 +0200 util-linux: update to 2.27-rc1 diff --git a/util-linux/.footprint b/util-linux/.footprint index f3b45a6..32057a8 100644 --- a/util-linux/.footprint +++ b/util-linux/.footprint @@ -75,6 +75,7 @@ lrwxrwxrwx root/root usr/bin/linux64 -> setarch -rwxr-xr-x root/root usr/bin/logger -rwxr-xr-x root/root usr/bin/look -rwxr-xr-x root/root usr/bin/lscpu +-rwxr-xr-x root/root usr/bin/lsipc -rwxr-xr-x root/root usr/bin/lslocks -rwxr-xr-x root/root usr/bin/lslogins -rwxr-xr-x root/root usr/bin/mcookie @@ -170,6 +171,7 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/logger.1.gz -rw-r--r-- root/root usr/share/man/man1/look.1.gz -rw-r--r-- root/root usr/share/man/man1/lscpu.1.gz +-rw-r--r-- root/root usr/share/man/man1/lsipc.1.gz -rw-r--r-- root/root usr/share/man/man1/lslogins.1.gz -rw-r--r-- root/root usr/share/man/man1/mcookie.1.gz -rw-r--r-- root/root usr/share/man/man1/mesg.1.gz diff --git a/util-linux/.md5sum b/util-linux/.md5sum index 07fa975..4481496 100644 --- a/util-linux/.md5sum +++ b/util-linux/.md5sum @@ -1 +1 @@ -9bdf368c395f1b70325d0eb22c7f48fb util-linux-2.26.2.tar.xz +500b9de1acc3601a69d6a0b2310da471 util-linux-2.27-rc1.tar.xz diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile index dcab97d..c25302f 100644 --- a/util-linux/Pkgfile +++ b/util-linux/Pkgfile @@ -4,9 +4,9 @@ # Depends on: eudev ncurses zlib name=util-linux -version=2.26.2 -release=2 -source=(https://www.kernel.org/pub/linux/utils/$name/v2.26/$name-$version.tar.xz) +version=2.27-rc1 +release=1 +source=(https://www.kernel.org/pub/linux/utils/$name/v2.27/$name-$version.tar.xz) build() { cd $name-$version

1 0

ports/core (3.2): ncurses: add sysmlink to curses.h (FS#667)
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit a3c340909d7681441869606799eaed3a6dd6b49c Author: Juergen Daubert <jue(a)jue.li> Date: Tue Aug 4 14:57:36 2015 +0200 ncurses: add sysmlink to curses.h (FS#667) diff --git a/ncurses/.footprint b/ncurses/.footprint index 25f49d9..6f2e2dc 100644 --- a/ncurses/.footprint +++ b/ncurses/.footprint @@ -32,6 +32,8 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/nc_tparm.h lrwxrwxrwx root/root usr/include/ncurses.h -> curses.h -rw-r--r-- root/root usr/include/ncurses_dll.h +drwxr-xr-x root/root usr/include/ncursesw/ +lrwxrwxrwx root/root usr/include/ncursesw/ncurses.h -> ../curses.h -rw-r--r-- root/root usr/include/panel.h -rw-r--r-- root/root usr/include/term.h -rw-r--r-- root/root usr/include/term_entry.h diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile index d3d307e..daa79c7 100644 --- a/ncurses/Pkgfile +++ b/ncurses/Pkgfile @@ -4,7 +4,7 @@ name=ncurses version=5.9 -release=4 +release=5 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz $name-$version-gcc5_buildfixes-1.patch) @@ -34,11 +34,13 @@ build() { make make install - install -d $PKG/lib + install -d $PKG/{lib,usr/include/ncursesw} for i in w ''; do mv $PKG/usr/lib/libncurses$i.so.* $PKG/lib ln -sf libncurses$i.so $PKG/usr/lib/libcurses$i.so ln -sf ../../lib/libncurses$i.so.$version $PKG/usr/lib/libncurses$i.so done + + ln -s ../curses.h $PKG/usr/include/ncursesw/ncurses.h }

1 0

ports/core (3.2): binutils: removed extra manpages
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit a0f1173db7377b3dce9fd01ae0524ef8d860ea09 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Aug 4 13:23:58 2015 +0200 binutils: removed extra manpages diff --git a/binutils/.footprint b/binutils/.footprint index 0119603..9d16827 100644 --- a/binutils/.footprint +++ b/binutils/.footprint @@ -113,11 +113,9 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/ar.1.gz -rw-r--r-- root/root usr/share/man/man1/as.1.gz -rw-r--r-- root/root usr/share/man/man1/c++filt.1.gz --rw-r--r-- root/root usr/share/man/man1/dlltool.1.gz -rw-r--r-- root/root usr/share/man/man1/elfedit.1.gz -rw-r--r-- root/root usr/share/man/man1/gprof.1.gz -rw-r--r-- root/root usr/share/man/man1/ld.1.gz --rw-r--r-- root/root usr/share/man/man1/nlmconv.1.gz -rw-r--r-- root/root usr/share/man/man1/nm.1.gz -rw-r--r-- root/root usr/share/man/man1/objcopy.1.gz -rw-r--r-- root/root usr/share/man/man1/objdump.1.gz @@ -126,5 +124,3 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/size.1.gz -rw-r--r-- root/root usr/share/man/man1/strings.1.gz -rw-r--r-- root/root usr/share/man/man1/strip.1.gz --rw-r--r-- root/root usr/share/man/man1/windmc.1.gz --rw-r--r-- root/root usr/share/man/man1/windres.1.gz diff --git a/binutils/Pkgfile b/binutils/Pkgfile index 636bd2f..ae8d168 100644 --- a/binutils/Pkgfile +++ b/binutils/Pkgfile @@ -5,7 +5,7 @@ name=binutils version=2.25.1 -release=1 +release=2 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2) build() { @@ -28,5 +28,6 @@ build() { install -m 0644 ../$name-$version/include/libiberty.h $PKG/usr/include rm -r $PKG/usr/share/info + rm $PKG/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}.1 sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/lib{bfd,opcodes}.la }

1 0

ports/core (3.2): lilo: tweaked example lilo.conf. closes FS#1198
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 6b68514d22a5dc42140e30f7e0fefc4eac7bac0c Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Aug 4 13:01:35 2015 +0200 lilo: tweaked example lilo.conf. closes FS#1198 diff --git a/lilo/lilo.conf b/lilo/lilo.conf index 518abad..05682dd 100644 --- a/lilo/lilo.conf +++ b/lilo/lilo.conf @@ -7,8 +7,7 @@ install=text boot=/dev/#DEVICE# image=/boot/vmlinuz label=CRUX - root=/dev/#ROOT_DEVICE# read-only - append="quiet" + append="root=/dev/#ROOT_DEVICE#" # End of file

1 0

ports/opt (3.2): opt: added copyright and a copy of the gpl v3.
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 803b48dc48ae13790cec4d5a99737904132b760d Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Aug 4 12:34:30 2015 +0200 opt: added copyright and a copy of the gpl v3. diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..db6721a --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,7 @@ +COPYRIGHT + +All package build scripts in CRUX (in package categories core, opt, xorg, and compat-32) +are Copyright © 2000-2015 by Per Lidén and the CRUX development team, and licensed through +the GNU General Public License. + +

1 0

ports/opt (3.2): unzip: moved from core
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 26b587855f2859bc36d97d2dc4886ad260e1ef4e Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Aug 4 12:32:48 2015 +0200 unzip: moved from core diff --git a/unzip/.footprint b/unzip/.footprint new file mode 100644 index 0000000..fa863ce --- /dev/null +++ b/unzip/.footprint @@ -0,0 +1,15 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/funzip +-rwxr-xr-x root/root usr/bin/unzip +-rwxr-xr-x root/root usr/bin/unzipsfx +-rwxr-xr-x root/root usr/bin/zipgrep +lrwxrwxrwx root/root usr/bin/zipinfo -> unzip +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/funzip.1.gz +-rw-r--r-- root/root usr/share/man/man1/unzip.1.gz +-rw-r--r-- root/root usr/share/man/man1/unzipsfx.1.gz +-rw-r--r-- root/root usr/share/man/man1/zipgrep.1.gz +-rw-r--r-- root/root usr/share/man/man1/zipinfo.1.gz diff --git a/unzip/.md5sum b/unzip/.md5sum new file mode 100644 index 0000000..0a5b32b --- /dev/null +++ b/unzip/.md5sum @@ -0,0 +1,6 @@ +19341ef8810558e0cb4e3fe25b3eff70 unzip-6.0-attribs-overflow.patch +cf3e3a98ff85d784c5d3843758645874 unzip-6.0-cve-2014-8139.patch +4f6a01093e9a05fe0d2916170d961e29 unzip-6.0-cve-2014-8140.patch +2a05a5d2f21511c5e393b62e4044e913 unzip-6.0-cve-2014-8141.patch +40ae64ba09670480195539bcdf92c0ef unzip-6.0-overflow.patch +62b490407489521db863b523a7f86375 unzip60.tar.gz diff --git a/unzip/Pkgfile b/unzip/Pkgfile new file mode 100644 index 0000000..110f4c3 --- /dev/null +++ b/unzip/Pkgfile @@ -0,0 +1,26 @@ +# Description: Decompress utility for zipfiles +# URL: http://infozip.sourceforge.net/UnZip.html +# Maintainer: CRUX System Team, core-ports at crux dot nu + +name=unzip +version=6.0 +release=6 +source=(http://downloads.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz \ + unzip-6.0-overflow.patch unzip-6.0-attribs-overflow.patch \ + unzip-6.0-cve-2014-8139.patch \ + unzip-6.0-cve-2014-8140.patch \ + unzip-6.0-cve-2014-8141.patch) + +build() { + cd ${name}${version//./} + patch -p1 -i $SRC/unzip-6.0-overflow.patch + patch -p1 -i $SRC/unzip-6.0-attribs-overflow.patch + patch -p1 -i $SRC/unzip-6.0-cve-2014-8139.patch + patch -p1 -i $SRC/unzip-6.0-cve-2014-8140.patch + patch -p1 -i $SRC/unzip-6.0-cve-2014-8141.patch + + sed -i 's/-O3//' unix/configure + make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" generic + make -f unix/Makefile prefix=$PKG/usr MANDIR=$PKG/usr/share/man/man1 install + ln -sf unzip $PKG/usr/bin/zipinfo +} diff --git a/unzip/unzip-6.0-attribs-overflow.patch b/unzip/unzip-6.0-attribs-overflow.patch new file mode 100644 index 0000000..3122325 --- /dev/null +++ b/unzip/unzip-6.0-attribs-overflow.patch @@ -0,0 +1,12 @@ +diff -up unzip60/zipinfo.c.attribs-overflow unzip60/zipinfo.c +--- unzip60/zipinfo.c.attribs-overflow 2009-11-30 09:55:39.000000000 +0100 ++++ unzip60/zipinfo.c 2009-11-30 09:56:42.844263244 +0100 +@@ -1881,7 +1881,7 @@ static int zi_short(__G) /* return PK- + #endif + int k, error, error_in_archive=PK_COOL; + unsigned hostnum, hostver, methid, methnum, xattr; +- char *p, workspace[12], attribs[16]; ++ char *p, workspace[12], attribs[17]; + char methbuf[5]; + static ZCONST char dtype[5]="NXFS"; /* normal, maximum, fast, superfast */ + static ZCONST char Far os[NUM_HOSTS+1][4] = { diff --git a/unzip/unzip-6.0-cve-2014-8139.patch b/unzip/unzip-6.0-cve-2014-8139.patch new file mode 100644 index 0000000..226b35a --- /dev/null +++ b/unzip/unzip-6.0-cve-2014-8139.patch @@ -0,0 +1,79 @@ +diff --git a/extract.c b/extract.c +index 9ef80b3..c741b5f 100644 +--- a/extract.c ++++ b/extract.c +@@ -1,5 +1,5 @@ + /* +- Copyright (c) 1990-2009 Info-ZIP. All rights reserved. ++ Copyright (c) 1990-2014 Info-ZIP. All rights reserved. + + See the accompanying file LICENSE, version 2009-Jan-02 or later + (the contents of which are also included in unzip.h) for terms of use. +@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] = + #ifndef SFX + static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \ + EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n"; ++ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \ ++ EF block length (%u bytes) invalid (< %d)\n"; + static ZCONST char Far InvalidComprDataEAs[] = + " invalid compressed data for EAs\n"; + # if (defined(WIN32) && defined(NTSD_EAS)) +@@ -2020,7 +2022,8 @@ static int TestExtraField(__G__ ef, ef_len) + ebID = makeword(ef); + ebLen = (unsigned)makeword(ef+EB_LEN); + +- if (ebLen > (ef_len - EB_HEADSIZE)) { ++ if (ebLen > (ef_len - EB_HEADSIZE)) ++ { + /* Discovered some extra field inconsistency! */ + if (uO.qflag) + Info(slide, 1, ((char *)slide, "%-22s ", +@@ -2155,11 +2158,29 @@ static int TestExtraField(__G__ ef, ef_len) + } + break; + case EF_PKVMS: +- if (makelong(ef+EB_HEADSIZE) != +- crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4), +- (extent)(ebLen-4))) +- Info(slide, 1, ((char *)slide, +- LoadFarString(BadCRC_EAs))); ++ /* 2015-01-30 SMS. Added sufficient-bytes test/message ++ * here. (Removed defective ebLen test above.) ++ * ++ * If sufficient bytes (EB_PKVMS_MINLEN) are available, ++ * then compare the stored CRC value with the calculated ++ * CRC for the remainder of the data (and complain about ++ * a mismatch). ++ */ ++ if (ebLen < EB_PKVMS_MINLEN) ++ { ++ /* Insufficient bytes available. */ ++ Info( slide, 1, ++ ((char *)slide, LoadFarString( TooSmallEBlength), ++ ebLen, EB_PKVMS_MINLEN)); ++ } ++ else if (makelong(ef+ EB_HEADSIZE) != ++ crc32(CRCVAL_INITIAL, ++ (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN), ++ (extent)(ebLen- EB_PKVMS_MINLEN))) ++ { ++ Info(slide, 1, ((char *)slide, ++ LoadFarString(BadCRC_EAs))); ++ } + break; + case EF_PKW32: + case EF_PKUNIX: +diff --git a/unzpriv.h b/unzpriv.h +index 005cee0..5c83a6e 100644 +--- a/unzpriv.h ++++ b/unzpriv.h +@@ -1806,6 +1806,8 @@ + #define EB_NTSD_VERSION 4 /* offset of NTSD version byte */ + #define EB_NTSD_MAX_VER (0) /* maximum version # we know how to handle */ + ++#define EB_PKVMS_MINLEN 4 /* minimum data length of PKVMS extra block */ ++ + #define EB_ASI_CRC32 0 /* offset of ASI Unix field's crc32 checksum */ + #define EB_ASI_MODE 4 /* offset of ASI Unix permission mode field */ + + diff --git a/unzip/unzip-6.0-cve-2014-8140.patch b/unzip/unzip-6.0-cve-2014-8140.patch new file mode 100644 index 0000000..b9eba92 --- /dev/null +++ b/unzip/unzip-6.0-cve-2014-8140.patch @@ -0,0 +1,25 @@ +diff --git a/extract.c b/extract.c +index c741b5f..e4a4c7b 100644 +--- a/extract.c ++++ b/extract.c +@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + if (compr_offset < 4) /* field is not compressed: */ + return PK_OK; /* do nothing and signal OK */ + ++ /* Return no/bad-data error status if any problem is found: ++ * 1. eb_size is too small to hold the uncompressed size ++ * (eb_ucsize). (Else extract eb_ucsize.) ++ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS. ++ * 3. eb_ucsize is positive, but eb_size is too small to hold ++ * the compressed data header. ++ */ + if ((eb_size < (EB_UCSIZE_P + 4)) || +- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L && +- eb_size <= (compr_offset + EB_CMPRHEADLEN))) +- return IZ_EF_TRUNC; /* no compressed data! */ ++ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || ++ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) ++ return IZ_EF_TRUNC; /* no/bad compressed data! */ + + method = makeword(eb + (EB_HEADSIZE + compr_offset)); + if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize)) diff --git a/unzip/unzip-6.0-cve-2014-8141.patch b/unzip/unzip-6.0-cve-2014-8141.patch new file mode 100644 index 0000000..584c576 --- /dev/null +++ b/unzip/unzip-6.0-cve-2014-8141.patch @@ -0,0 +1,138 @@ +diff --git a/fileio.c b/fileio.c +index 03fc4be..2a61a30 100644 +--- a/fileio.c ++++ b/fileio.c +@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTrunc[] = + #endif + static ZCONST char Far ExtraFieldTooLong[] = + "warning: extra field too long (%d). Ignoring...\n"; ++static ZCONST char Far ExtraFieldCorrupt[] = ++ "warning: extra field (type: 0x%04x) corrupt. Continuing...\n"; + + #ifdef WINDLL + static ZCONST char Far DiskFullQuery[] = +@@ -2300,7 +2302,13 @@ int do_string(__G__ length, option) /* return PK-type error code */ + length = length2; + } + /* Looks like here is where extra fields are read */ +- getZip64Data(__G__ G.extra_field, length); ++ if (getZip64Data(__G__ G.extra_field, length) != PK_COOL) ++ { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString( ExtraFieldCorrupt), EF_PKSZ64)); ++ error = PK_WARN; ++ } ++ + #ifdef UNICODE_SUPPORT + G.unipath_filename = NULL; + if (G.UzO.U_flag < 2) { +diff --git a/process.c b/process.c +index be6e006..0d57ab4 100644 +--- a/process.c ++++ b/process.c +@@ -1,5 +1,5 @@ + /* +- Copyright (c) 1990-2009 Info-ZIP. All rights reserved. ++ Copyright (c) 1990-2014 Info-ZIP. All rights reserved. + + See the accompanying file LICENSE, version 2009-Jan-02 or later + (the contents of which are also included in unzip.h) for terms of use. +@@ -1894,48 +1894,83 @@ int getZip64Data(__G__ ef_buf, ef_len) + and a 4-byte version of disk start number. + Sets both local header and central header fields. Not terribly clever, + but it means that this procedure is only called in one place. ++ ++ 2014-12-05 SMS. ++ Added checks to ensure that enough data are available before calling ++ makeint64() or makelong(). Replaced various sizeof() values with ++ simple ("4" or "8") constants. (The Zip64 structures do not depend ++ on our variable sizes.) Error handling is crude, but we should now ++ stay within the buffer. + ---------------------------------------------------------------------------*/ + ++#define Z64FLGS 0xffff ++#define Z64FLGL 0xffffffff ++ + if (ef_len == 0 || ef_buf == NULL) + return PK_COOL; + + Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n", + ef_len)); + +- while (ef_len >= EB_HEADSIZE) { ++ while (ef_len >= EB_HEADSIZE) ++ { + eb_id = makeword(EB_ID + ef_buf); + eb_len = makeword(EB_LEN + ef_buf); + +- if (eb_len > (ef_len - EB_HEADSIZE)) { +- /* discovered some extra field inconsistency! */ ++ if (eb_len > (ef_len - EB_HEADSIZE)) ++ { ++ /* Extra block length exceeds remaining extra field length. */ + Trace((stderr, + "getZip64Data: block length %u > rest ef_size %u\n", eb_len, + ef_len - EB_HEADSIZE)); + break; + } +- if (eb_id == EF_PKSZ64) { + ++ if (eb_id == EF_PKSZ64) ++ { + int offset = EB_HEADSIZE; + +- if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){ +- G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf); +- offset += sizeof(G.crec.ucsize); ++ if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL)) ++ { ++ if (offset+ 8 > ef_len) ++ return PK_ERR; ++ ++ G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf); ++ offset += 8; + } +- if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){ +- G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf); +- offset += sizeof(G.crec.csize); ++ ++ if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL)) ++ { ++ if (offset+ 8 > ef_len) ++ return PK_ERR; ++ ++ G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf); ++ offset += 8; + } +- if (G.crec.relative_offset_local_header == 0xffffffff){ ++ ++ if (G.crec.relative_offset_local_header == Z64FLGL) ++ { ++ if (offset+ 8 > ef_len) ++ return PK_ERR; ++ + G.crec.relative_offset_local_header = makeint64(offset + ef_buf); +- offset += sizeof(G.crec.relative_offset_local_header); ++ offset += 8; + } +- if (G.crec.disk_number_start == 0xffff){ ++ ++ if (G.crec.disk_number_start == Z64FLGS) ++ { ++ if (offset+ 4 > ef_len) ++ return PK_ERR; ++ + G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf); +- offset += sizeof(G.crec.disk_number_start); ++ offset += 4; + } ++#if 0 ++ break; /* Expect only one EF_PKSZ64 block. */ ++#endif /* 0 */ + } + +- /* Skip this extra field block */ ++ /* Skip this extra field block. */ + ef_buf += (eb_len + EB_HEADSIZE); + ef_len -= (eb_len + EB_HEADSIZE); + } diff --git a/unzip/unzip-6.0-overflow.patch b/unzip/unzip-6.0-overflow.patch new file mode 100644 index 0000000..1750796 --- /dev/null +++ b/unzip/unzip-6.0-overflow.patch @@ -0,0 +1,27 @@ +diff --git a/extract.c b/extract.c +index a0a4929..9ef80b3 100644 +--- a/extract.c ++++ b/extract.c +@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + ulg eb_ucsize; + uch *eb_ucptr; + int r; ++ ush method; + + if (compr_offset < 4) /* field is not compressed: */ + return PK_OK; /* do nothing and signal OK */ +@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + eb_size <= (compr_offset + EB_CMPRHEADLEN))) + return IZ_EF_TRUNC; /* no compressed data! */ + ++ method = makeword(eb + (EB_HEADSIZE + compr_offset)); ++ if ((method == STORED) && (eb_size - compr_offset != eb_ucsize)) ++ return PK_ERR; /* compressed & uncompressed ++ * should match in STORED ++ * method */ ++ + if ( + #ifdef INT_16BIT + (((ulg)(extent)eb_ucsize) != eb_ucsize) || + +

1 0

ports/core (3.2): unzip: moved to opt
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 40ad027d1bcb6b67ee19cdc8d943176f9aef3425 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Aug 4 12:33:04 2015 +0200 unzip: moved to opt diff --git a/unzip/.footprint b/unzip/.footprint deleted file mode 100644 index fa863ce..0000000 --- a/unzip/.footprint +++ /dev/null @@ -1,15 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/funzip --rwxr-xr-x root/root usr/bin/unzip --rwxr-xr-x root/root usr/bin/unzipsfx --rwxr-xr-x root/root usr/bin/zipgrep -lrwxrwxrwx root/root usr/bin/zipinfo -> unzip -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/funzip.1.gz --rw-r--r-- root/root usr/share/man/man1/unzip.1.gz --rw-r--r-- root/root usr/share/man/man1/unzipsfx.1.gz --rw-r--r-- root/root usr/share/man/man1/zipgrep.1.gz --rw-r--r-- root/root usr/share/man/man1/zipinfo.1.gz diff --git a/unzip/.md5sum b/unzip/.md5sum deleted file mode 100644 index 0a5b32b..0000000 --- a/unzip/.md5sum +++ /dev/null @@ -1,6 +0,0 @@ -19341ef8810558e0cb4e3fe25b3eff70 unzip-6.0-attribs-overflow.patch -cf3e3a98ff85d784c5d3843758645874 unzip-6.0-cve-2014-8139.patch -4f6a01093e9a05fe0d2916170d961e29 unzip-6.0-cve-2014-8140.patch -2a05a5d2f21511c5e393b62e4044e913 unzip-6.0-cve-2014-8141.patch -40ae64ba09670480195539bcdf92c0ef unzip-6.0-overflow.patch -62b490407489521db863b523a7f86375 unzip60.tar.gz diff --git a/unzip/Pkgfile b/unzip/Pkgfile deleted file mode 100644 index 110f4c3..0000000 --- a/unzip/Pkgfile +++ /dev/null @@ -1,26 +0,0 @@ -# Description: Decompress utility for zipfiles -# URL: http://infozip.sourceforge.net/UnZip.html -# Maintainer: CRUX System Team, core-ports at crux dot nu - -name=unzip -version=6.0 -release=6 -source=(http://downloads.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz \ - unzip-6.0-overflow.patch unzip-6.0-attribs-overflow.patch \ - unzip-6.0-cve-2014-8139.patch \ - unzip-6.0-cve-2014-8140.patch \ - unzip-6.0-cve-2014-8141.patch) - -build() { - cd ${name}${version//./} - patch -p1 -i $SRC/unzip-6.0-overflow.patch - patch -p1 -i $SRC/unzip-6.0-attribs-overflow.patch - patch -p1 -i $SRC/unzip-6.0-cve-2014-8139.patch - patch -p1 -i $SRC/unzip-6.0-cve-2014-8140.patch - patch -p1 -i $SRC/unzip-6.0-cve-2014-8141.patch - - sed -i 's/-O3//' unix/configure - make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" generic - make -f unix/Makefile prefix=$PKG/usr MANDIR=$PKG/usr/share/man/man1 install - ln -sf unzip $PKG/usr/bin/zipinfo -} diff --git a/unzip/unzip-6.0-attribs-overflow.patch b/unzip/unzip-6.0-attribs-overflow.patch deleted file mode 100644 index 3122325..0000000 --- a/unzip/unzip-6.0-attribs-overflow.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up unzip60/zipinfo.c.attribs-overflow unzip60/zipinfo.c ---- unzip60/zipinfo.c.attribs-overflow 2009-11-30 09:55:39.000000000 +0100 -+++ unzip60/zipinfo.c 2009-11-30 09:56:42.844263244 +0100 -@@ -1881,7 +1881,7 @@ static int zi_short(__G) /* return PK- - #endif - int k, error, error_in_archive=PK_COOL; - unsigned hostnum, hostver, methid, methnum, xattr; -- char *p, workspace[12], attribs[16]; -+ char *p, workspace[12], attribs[17]; - char methbuf[5]; - static ZCONST char dtype[5]="NXFS"; /* normal, maximum, fast, superfast */ - static ZCONST char Far os[NUM_HOSTS+1][4] = { diff --git a/unzip/unzip-6.0-cve-2014-8139.patch b/unzip/unzip-6.0-cve-2014-8139.patch deleted file mode 100644 index 226b35a..0000000 --- a/unzip/unzip-6.0-cve-2014-8139.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/extract.c b/extract.c -index 9ef80b3..c741b5f 100644 ---- a/extract.c -+++ b/extract.c -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 1990-2009 Info-ZIP. All rights reserved. -+ Copyright (c) 1990-2014 Info-ZIP. All rights reserved. - - See the accompanying file LICENSE, version 2009-Jan-02 or later - (the contents of which are also included in unzip.h) for terms of use. -@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] = - #ifndef SFX - static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \ - EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n"; -+ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \ -+ EF block length (%u bytes) invalid (< %d)\n"; - static ZCONST char Far InvalidComprDataEAs[] = - " invalid compressed data for EAs\n"; - # if (defined(WIN32) && defined(NTSD_EAS)) -@@ -2020,7 +2022,8 @@ static int TestExtraField(__G__ ef, ef_len) - ebID = makeword(ef); - ebLen = (unsigned)makeword(ef+EB_LEN); - -- if (ebLen > (ef_len - EB_HEADSIZE)) { -+ if (ebLen > (ef_len - EB_HEADSIZE)) -+ { - /* Discovered some extra field inconsistency! */ - if (uO.qflag) - Info(slide, 1, ((char *)slide, "%-22s ", -@@ -2155,11 +2158,29 @@ static int TestExtraField(__G__ ef, ef_len) - } - break; - case EF_PKVMS: -- if (makelong(ef+EB_HEADSIZE) != -- crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4), -- (extent)(ebLen-4))) -- Info(slide, 1, ((char *)slide, -- LoadFarString(BadCRC_EAs))); -+ /* 2015-01-30 SMS. Added sufficient-bytes test/message -+ * here. (Removed defective ebLen test above.) -+ * -+ * If sufficient bytes (EB_PKVMS_MINLEN) are available, -+ * then compare the stored CRC value with the calculated -+ * CRC for the remainder of the data (and complain about -+ * a mismatch). -+ */ -+ if (ebLen < EB_PKVMS_MINLEN) -+ { -+ /* Insufficient bytes available. */ -+ Info( slide, 1, -+ ((char *)slide, LoadFarString( TooSmallEBlength), -+ ebLen, EB_PKVMS_MINLEN)); -+ } -+ else if (makelong(ef+ EB_HEADSIZE) != -+ crc32(CRCVAL_INITIAL, -+ (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN), -+ (extent)(ebLen- EB_PKVMS_MINLEN))) -+ { -+ Info(slide, 1, ((char *)slide, -+ LoadFarString(BadCRC_EAs))); -+ } - break; - case EF_PKW32: - case EF_PKUNIX: -diff --git a/unzpriv.h b/unzpriv.h -index 005cee0..5c83a6e 100644 ---- a/unzpriv.h -+++ b/unzpriv.h -@@ -1806,6 +1806,8 @@ - #define EB_NTSD_VERSION 4 /* offset of NTSD version byte */ - #define EB_NTSD_MAX_VER (0) /* maximum version # we know how to handle */ - -+#define EB_PKVMS_MINLEN 4 /* minimum data length of PKVMS extra block */ -+ - #define EB_ASI_CRC32 0 /* offset of ASI Unix field's crc32 checksum */ - #define EB_ASI_MODE 4 /* offset of ASI Unix permission mode field */ - - diff --git a/unzip/unzip-6.0-cve-2014-8140.patch b/unzip/unzip-6.0-cve-2014-8140.patch deleted file mode 100644 index b9eba92..0000000 --- a/unzip/unzip-6.0-cve-2014-8140.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/extract.c b/extract.c -index c741b5f..e4a4c7b 100644 ---- a/extract.c -+++ b/extract.c -@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) - if (compr_offset < 4) /* field is not compressed: */ - return PK_OK; /* do nothing and signal OK */ - -+ /* Return no/bad-data error status if any problem is found: -+ * 1. eb_size is too small to hold the uncompressed size -+ * (eb_ucsize). (Else extract eb_ucsize.) -+ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS. -+ * 3. eb_ucsize is positive, but eb_size is too small to hold -+ * the compressed data header. -+ */ - if ((eb_size < (EB_UCSIZE_P + 4)) || -- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L && -- eb_size <= (compr_offset + EB_CMPRHEADLEN))) -- return IZ_EF_TRUNC; /* no compressed data! */ -+ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || -+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) -+ return IZ_EF_TRUNC; /* no/bad compressed data! */ - - method = makeword(eb + (EB_HEADSIZE + compr_offset)); - if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize)) diff --git a/unzip/unzip-6.0-cve-2014-8141.patch b/unzip/unzip-6.0-cve-2014-8141.patch deleted file mode 100644 index 584c576..0000000 --- a/unzip/unzip-6.0-cve-2014-8141.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/fileio.c b/fileio.c -index 03fc4be..2a61a30 100644 ---- a/fileio.c -+++ b/fileio.c -@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTrunc[] = - #endif - static ZCONST char Far ExtraFieldTooLong[] = - "warning: extra field too long (%d). Ignoring...\n"; -+static ZCONST char Far ExtraFieldCorrupt[] = -+ "warning: extra field (type: 0x%04x) corrupt. Continuing...\n"; - - #ifdef WINDLL - static ZCONST char Far DiskFullQuery[] = -@@ -2300,7 +2302,13 @@ int do_string(__G__ length, option) /* return PK-type error code */ - length = length2; - } - /* Looks like here is where extra fields are read */ -- getZip64Data(__G__ G.extra_field, length); -+ if (getZip64Data(__G__ G.extra_field, length) != PK_COOL) -+ { -+ Info(slide, 0x401, ((char *)slide, -+ LoadFarString( ExtraFieldCorrupt), EF_PKSZ64)); -+ error = PK_WARN; -+ } -+ - #ifdef UNICODE_SUPPORT - G.unipath_filename = NULL; - if (G.UzO.U_flag < 2) { -diff --git a/process.c b/process.c -index be6e006..0d57ab4 100644 ---- a/process.c -+++ b/process.c -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 1990-2009 Info-ZIP. All rights reserved. -+ Copyright (c) 1990-2014 Info-ZIP. All rights reserved. - - See the accompanying file LICENSE, version 2009-Jan-02 or later - (the contents of which are also included in unzip.h) for terms of use. -@@ -1894,48 +1894,83 @@ int getZip64Data(__G__ ef_buf, ef_len) - and a 4-byte version of disk start number. - Sets both local header and central header fields. Not terribly clever, - but it means that this procedure is only called in one place. -+ -+ 2014-12-05 SMS. -+ Added checks to ensure that enough data are available before calling -+ makeint64() or makelong(). Replaced various sizeof() values with -+ simple ("4" or "8") constants. (The Zip64 structures do not depend -+ on our variable sizes.) Error handling is crude, but we should now -+ stay within the buffer. - ---------------------------------------------------------------------------*/ - -+#define Z64FLGS 0xffff -+#define Z64FLGL 0xffffffff -+ - if (ef_len == 0 || ef_buf == NULL) - return PK_COOL; - - Trace((stderr,"\ngetZip64Data: scanning extra field of length %u\n", - ef_len)); - -- while (ef_len >= EB_HEADSIZE) { -+ while (ef_len >= EB_HEADSIZE) -+ { - eb_id = makeword(EB_ID + ef_buf); - eb_len = makeword(EB_LEN + ef_buf); - -- if (eb_len > (ef_len - EB_HEADSIZE)) { -- /* discovered some extra field inconsistency! */ -+ if (eb_len > (ef_len - EB_HEADSIZE)) -+ { -+ /* Extra block length exceeds remaining extra field length. */ - Trace((stderr, - "getZip64Data: block length %u > rest ef_size %u\n", eb_len, - ef_len - EB_HEADSIZE)); - break; - } -- if (eb_id == EF_PKSZ64) { - -+ if (eb_id == EF_PKSZ64) -+ { - int offset = EB_HEADSIZE; - -- if (G.crec.ucsize == 0xffffffff || G.lrec.ucsize == 0xffffffff){ -- G.lrec.ucsize = G.crec.ucsize = makeint64(offset + ef_buf); -- offset += sizeof(G.crec.ucsize); -+ if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL)) -+ { -+ if (offset+ 8 > ef_len) -+ return PK_ERR; -+ -+ G.crec.ucsize = G.lrec.ucsize = makeint64(offset + ef_buf); -+ offset += 8; - } -- if (G.crec.csize == 0xffffffff || G.lrec.csize == 0xffffffff){ -- G.csize = G.lrec.csize = G.crec.csize = makeint64(offset + ef_buf); -- offset += sizeof(G.crec.csize); -+ -+ if ((G.crec.csize == Z64FLGL) || (G.lrec.csize == Z64FLGL)) -+ { -+ if (offset+ 8 > ef_len) -+ return PK_ERR; -+ -+ G.csize = G.crec.csize = G.lrec.csize = makeint64(offset + ef_buf); -+ offset += 8; - } -- if (G.crec.relative_offset_local_header == 0xffffffff){ -+ -+ if (G.crec.relative_offset_local_header == Z64FLGL) -+ { -+ if (offset+ 8 > ef_len) -+ return PK_ERR; -+ - G.crec.relative_offset_local_header = makeint64(offset + ef_buf); -- offset += sizeof(G.crec.relative_offset_local_header); -+ offset += 8; - } -- if (G.crec.disk_number_start == 0xffff){ -+ -+ if (G.crec.disk_number_start == Z64FLGS) -+ { -+ if (offset+ 4 > ef_len) -+ return PK_ERR; -+ - G.crec.disk_number_start = (zuvl_t)makelong(offset + ef_buf); -- offset += sizeof(G.crec.disk_number_start); -+ offset += 4; - } -+#if 0 -+ break; /* Expect only one EF_PKSZ64 block. */ -+#endif /* 0 */ - } - -- /* Skip this extra field block */ -+ /* Skip this extra field block. */ - ef_buf += (eb_len + EB_HEADSIZE); - ef_len -= (eb_len + EB_HEADSIZE); - } diff --git a/unzip/unzip-6.0-overflow.patch b/unzip/unzip-6.0-overflow.patch deleted file mode 100644 index 1750796..0000000 --- a/unzip/unzip-6.0-overflow.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/extract.c b/extract.c -index a0a4929..9ef80b3 100644 ---- a/extract.c -+++ b/extract.c -@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) - ulg eb_ucsize; - uch *eb_ucptr; - int r; -+ ush method; - - if (compr_offset < 4) /* field is not compressed: */ - return PK_OK; /* do nothing and signal OK */ -@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) - eb_size <= (compr_offset + EB_CMPRHEADLEN))) - return IZ_EF_TRUNC; /* no compressed data! */ - -+ method = makeword(eb + (EB_HEADSIZE + compr_offset)); -+ if ((method == STORED) && (eb_size - compr_offset != eb_ucsize)) -+ return PK_ERR; /* compressed & uncompressed -+ * should match in STORED -+ * method */ -+ - if ( - #ifdef INT_16BIT - (((ulg)(extent)eb_ucsize) != eb_ucsize) || - -

1 0

ports/opt (3.2): Merge branch '3.1' into 3.2
by crux＠crux.nu 04 Aug '15

04 Aug '15

commit 50feb31dcda3875ec11571b629d39fc19c0c0316 Merge: 0d07882 0ad9624 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Aug 4 12:20:21 2015 +0200 Merge branch '3.1' into 3.2

1 0