From owner-svn-soc-all@FreeBSD.ORG Sun Jun 16 11:46:28 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CC92A2B5 for ; Sun, 16 Jun 2013 11:46:28 +0000 (UTC) (envelope-from ambarisha@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id A5232168D for ; Sun, 16 Jun 2013 11:46:28 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GBkSSr051750 for ; Sun, 16 Jun 2013 11:46:28 GMT (envelope-from ambarisha@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5GBkS00051749 for svn-soc-all@FreeBSD.org; Sun, 16 Jun 2013 11:46:28 GMT (envelope-from ambarisha@FreeBSD.org) Date: Sun, 16 Jun 2013 11:46:28 GMT Message-Id: <201306161146.r5GBkS00051749@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to ambarisha@FreeBSD.org using -f From: ambarisha@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253027 - soc2013/ambarisha MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2013 11:46:28 -0000 Author: ambarisha Date: Sun Jun 16 11:46:28 2013 New Revision: 253027 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253027 Log: Creating ambarisha user directory Added: soc2013/ambarisha/ From owner-svn-soc-all@FreeBSD.ORG Sun Jun 16 14:25:53 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A2D73E68 for ; Sun, 16 Jun 2013 14:25:53 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 7A4641A86 for ; Sun, 16 Jun 2013 14:25:53 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GEPrF0088426 for ; Sun, 16 Jun 2013 14:25:53 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5GEPrlr088425 for svn-soc-all@FreeBSD.org; Sun, 16 Jun 2013 14:25:53 GMT (envelope-from mattbw@FreeBSD.org) Date: Sun, 16 Jun 2013 14:25:53 GMT Message-Id: <201306161425.r5GEPrlr088425@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253028 - soc2013/mattbw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2013 14:25:53 -0000 Author: mattbw Date: Sun Jun 16 14:25:53 2013 New Revision: 253028 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253028 Log: make directory 'mattbw' Added: soc2013/mattbw/ From owner-svn-soc-all@FreeBSD.ORG Sun Jun 16 17:38:05 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 79CB2515 for ; Sun, 16 Jun 2013 17:38:05 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 6AA9410A4 for ; Sun, 16 Jun 2013 17:38:05 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GHc5N7012727 for ; Sun, 16 Jun 2013 17:38:05 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5GHc5Pd012725 for svn-soc-all@FreeBSD.org; Sun, 16 Jun 2013 17:38:05 GMT (envelope-from mattbw@FreeBSD.org) Date: Sun, 16 Jun 2013 17:38:05 GMT Message-Id: <201306161738.r5GHc5Pd012725@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253035 - soc2013/mattbw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2013 17:38:05 -0000 Author: mattbw Date: Sun Jun 16 17:38:04 2013 New Revision: 253035 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253035 Log: Add GNU GPL from packagekit tarball (required because packagekit is GPL2). Added: soc2013/mattbw/COPYING Added: soc2013/mattbw/COPYING ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/COPYING Sun Jun 16 17:38:04 2013 (r253035) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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 Library General +Public License instead of this License. From owner-svn-soc-all@FreeBSD.ORG Sun Jun 16 23:07:15 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A57AF439 for ; Sun, 16 Jun 2013 23:07:15 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 7CFA51DA4 for ; Sun, 16 Jun 2013 23:07:15 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GN7F5R073128 for ; Sun, 16 Jun 2013 23:07:15 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5GN7FQp073127 for svn-soc-all@FreeBSD.org; Sun, 16 Jun 2013 23:07:15 GMT (envelope-from def@FreeBSD.org) Date: Sun, 16 Jun 2013 23:07:15 GMT Message-Id: <201306162307.r5GN7FQp073127@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253048 - soc2013/def MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2013 23:07:15 -0000 Author: def Date: Sun Jun 16 23:07:15 2013 New Revision: 253048 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253048 Log: Initial commit for 'Unattended encrypted kernel crash dumps'. Added: soc2013/def/ From owner-svn-soc-all@FreeBSD.ORG Sun Jun 16 23:34:34 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 42E7BEC4 for ; Sun, 16 Jun 2013 23:34:34 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 1B0331E87 for ; Sun, 16 Jun 2013 23:34:34 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GNYXEd051323 for ; Sun, 16 Jun 2013 23:34:33 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5GNYXgn051319 for svn-soc-all@FreeBSD.org; Sun, 16 Jun 2013 23:34:33 GMT (envelope-from def@FreeBSD.org) Date: Sun, 16 Jun 2013 23:34:33 GMT Message-Id: <201306162334.r5GNYXgn051319@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253049 - soc2013/def/crashdump-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2013 23:34:34 -0000 Author: def Date: Sun Jun 16 23:34:33 2013 New Revision: 253049 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253049 Log: Create crashdump-head branch. Added: soc2013/def/crashdump-head/ (props changed) - copied from r253048, mirror/FreeBSD/head/ From owner-svn-soc-all@FreeBSD.ORG Sun Jun 16 23:38:55 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4D424FB7 for ; Sun, 16 Jun 2013 23:38:55 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 3F0DC1EAC for ; Sun, 16 Jun 2013 23:38:55 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GNctTN085000 for ; Sun, 16 Jun 2013 23:38:55 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5GNctKe084997 for svn-soc-all@FreeBSD.org; Sun, 16 Jun 2013 23:38:55 GMT (envelope-from mattbw@FreeBSD.org) Date: Sun, 16 Jun 2013 23:38:55 GMT Message-Id: <201306162338.r5GNctKe084997@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253050 - soc2013/mattbw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2013 23:38:55 -0000 Author: mattbw Date: Sun Jun 16 23:38:54 2013 New Revision: 253050 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253050 Log: (very trivial) initial pokings of pkgng and packagekit, mostly for my benefit to make sure both are installed properly Added: soc2013/mattbw/Makefile soc2013/mattbw/test.c Added: soc2013/mattbw/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/Makefile Sun Jun 16 23:38:54 2013 (r253050) @@ -0,0 +1,12 @@ +# To be BSD-ified later. + +PKGS= pkg packagekit-plugin +CC= clang +CFLAGS= `pkg-config --cflags $(PKGS)` +LIBS= `pkg-config --libs $(PKGS)` + +test: test.o + $(CC) $(LIBS) -o test test.o + +test.o: test.c + $(CC) $(CFLAGS) -c -o test.o test.c Added: soc2013/mattbw/test.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/test.c Sun Jun 16 23:38:54 2013 (r253050) @@ -0,0 +1,15 @@ +/* Test to make sure that pkgng and packagekit are both being linked to. */ + +#define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE + +#include +#include "pkg.h" +#include "packagekit-glib2/packagekit.h" + +int +main(int argv, char **argc) +{ + printf("pkgng version: %s\n", PKGVERSION); + printf("packagekit version: %i.%i.%i\n", PK_MAJOR_VERSION, PK_MINOR_VERSION, PK_MICRO_VERSION); + return 0; +} From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 07:52:13 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 46DB8191 for ; Mon, 17 Jun 2013 07:52:13 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 37CBE119C for ; Mon, 17 Jun 2013 07:52:13 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5H7qDFj036424 for ; Mon, 17 Jun 2013 07:52:13 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5H7qCkd036413 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 07:52:12 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 07:52:12 GMT Message-Id: <201306170752.r5H7qCkd036413@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253061 - soc2013/dpl/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 07:52:13 -0000 Author: dpl Date: Mon Jun 17 07:52:12 2013 New Revision: 253061 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253061 Log: Submitted by: dpl Added: soc2013/dpl/bzip2/ soc2013/dpl/bzip2/CHANGES soc2013/dpl/bzip2/FREEBSD-Xlist soc2013/dpl/bzip2/FREEBSD-upgrade soc2013/dpl/bzip2/FREEBSD-vendor soc2013/dpl/bzip2/LICENSE soc2013/dpl/bzip2/Makefile soc2013/dpl/bzip2/README soc2013/dpl/bzip2/README.COMPILATION.PROBLEMS soc2013/dpl/bzip2/blocksort.c soc2013/dpl/bzip2/bzip2.1 soc2013/dpl/bzip2/bzip2.c soc2013/dpl/bzip2/bzip2recover.c soc2013/dpl/bzip2/bzlib.c soc2013/dpl/bzip2/bzlib.h soc2013/dpl/bzip2/bzlib_private.h soc2013/dpl/bzip2/compress.c soc2013/dpl/bzip2/crctable.c soc2013/dpl/bzip2/decompress.c soc2013/dpl/bzip2/huffman.c soc2013/dpl/bzip2/libbz2.def soc2013/dpl/bzip2/randtable.c soc2013/dpl/bzip2/sample1.bz2.uu soc2013/dpl/bzip2/sample1.ref.gz.uu soc2013/dpl/bzip2/sample2.bz2.uu soc2013/dpl/bzip2/sample2.ref.gz.uu soc2013/dpl/bzip2/sample3.bz2.uu soc2013/dpl/bzip2/sample3.ref.gz.uu soc2013/dpl/bzip2/spewG.c soc2013/dpl/bzip2/unzcrash.c soc2013/dpl/bzip2/words0 soc2013/dpl/bzip2/words1 soc2013/dpl/bzip2/words2 soc2013/dpl/bzip2/words3 Added: soc2013/dpl/bzip2/CHANGES ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/CHANGES Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,327 @@ + ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ + + +0.9.0 +~~~~~ +First version. + + +0.9.0a +~~~~~~ +Removed 'ranlib' from Makefile, since most modern Unix-es +don't need it, or even know about it. + + +0.9.0b +~~~~~~ +Fixed a problem with error reporting in bzip2.c. This does not effect +the library in any way. Problem is: versions 0.9.0 and 0.9.0a (of the +program proper) compress and decompress correctly, but give misleading +error messages (internal panics) when an I/O error occurs, instead of +reporting the problem correctly. This shouldn't give any data loss +(as far as I can see), but is confusing. + +Made the inline declarations disappear for non-GCC compilers. + + +0.9.0c +~~~~~~ +Fixed some problems in the library pertaining to some boundary cases. +This makes the library behave more correctly in those situations. The +fixes apply only to features (calls and parameters) not used by +bzip2.c, so the non-fixedness of them in previous versions has no +effect on reliability of bzip2.c. + +In bzlib.c: + * made zero-length BZ_FLUSH work correctly in bzCompress(). + * fixed bzWrite/bzRead to ignore zero-length requests. + * fixed bzread to correctly handle read requests after EOF. + * wrong parameter order in call to bzDecompressInit in + bzBuffToBuffDecompress. Fixed. + +In compress.c: + * changed setting of nGroups in sendMTFValues() so as to + do a bit better on small files. This _does_ effect + bzip2.c. + + +0.9.5a +~~~~~~ +Major change: add a fallback sorting algorithm (blocksort.c) +to give reasonable behaviour even for very repetitive inputs. +Nuked --repetitive-best and --repetitive-fast since they are +no longer useful. + +Minor changes: mostly a whole bunch of small changes/ +bugfixes in the driver (bzip2.c). Changes pertaining to the +user interface are: + + allow decompression of symlink'd files to stdout + decompress/test files even without .bz2 extension + give more accurate error messages for I/O errors + when compressing/decompressing to stdout, don't catch control-C + read flags from BZIP2 and BZIP environment variables + decline to break hard links to a file unless forced with -f + allow -c flag even with no filenames + preserve file ownerships as far as possible + make -s -1 give the expected block size (100k) + add a flag -q --quiet to suppress nonessential warnings + stop decoding flags after --, so files beginning in - can be handled + resolved inconsistent naming: bzcat or bz2cat ? + bzip2 --help now returns 0 + +Programming-level changes are: + + fixed syntax error in GET_LL4 for Borland C++ 5.02 + let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC} + fix overshoot of mode-string end in bzopen_or_bzdopen + wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... } + close file handles under all error conditions + added minor mods so it compiles with DJGPP out of the box + fixed Makefile so it doesn't give problems with BSD make + fix uninitialised memory reads in dlltest.c + +0.9.5b +~~~~~~ +Open stdin/stdout in binary mode for DJGPP. + +0.9.5c +~~~~~~ +Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1. The + 1 +version could cause the sorted order to be wrong in some extremely +obscure cases. Also changed setting of quadrant in blocksort.c. + +0.9.5d +~~~~~~ +The only functional change is to make bzlibVersion() in the library +return the correct string. This has no effect whatsoever on the +functioning of the bzip2 program or library. Added a couple of casts +so the library compiles without warnings at level 3 in MS Visual +Studio 6.0. Included a Y2K statement in the file Y2K_INFO. All other +changes are minor documentation changes. + +1.0 +~~~ +Several minor bugfixes and enhancements: + +* Large file support. The library uses 64-bit counters to + count the volume of data passing through it. bzip2.c + is now compiled with -D_FILE_OFFSET_BITS=64 to get large + file support from the C library. -v correctly prints out + file sizes greater than 4 gigabytes. All these changes have + been made without assuming a 64-bit platform or a C compiler + which supports 64-bit ints, so, except for the C library + aspect, they are fully portable. + +* Decompression robustness. The library/program should be + robust to any corruption of compressed data, detecting and + handling _all_ corruption, instead of merely relying on + the CRCs. What this means is that the program should + never crash, given corrupted data, and the library should + always return BZ_DATA_ERROR. + +* Fixed an obscure race-condition bug only ever observed on + Solaris, in which, if you were very unlucky and issued + control-C at exactly the wrong time, both input and output + files would be deleted. + +* Don't run out of file handles on test/decompression when + large numbers of files have invalid magic numbers. + +* Avoid library namespace pollution. Prefix all exported + symbols with BZ2_. + +* Minor sorting enhancements from my DCC2000 paper. + +* Advance the version number to 1.0, so as to counteract the + (false-in-this-case) impression some people have that programs + with version numbers less than 1.0 are in some way, experimental, + pre-release versions. + +* Create an initial Makefile-libbz2_so to build a shared library. + Yes, I know I should really use libtool et al ... + +* Make the program exit with 2 instead of 0 when decompression + fails due to a bad magic number (ie, an invalid bzip2 header). + Also exit with 1 (as the manual claims :-) whenever a diagnostic + message would have been printed AND the corresponding operation + is aborted, for example + bzip2: Output file xx already exists. + When a diagnostic message is printed but the operation is not + aborted, for example + bzip2: Can't guess original name for wurble -- using wurble.out + then the exit value 0 is returned, unless some other problem is + also detected. + + I think it corresponds more closely to what the manual claims now. + + +1.0.1 +~~~~~ +* Modified dlltest.c so it uses the new BZ2_ naming scheme. +* Modified makefile-msc to fix minor build probs on Win2k. +* Updated README.COMPILATION.PROBLEMS. + +There are no functionality changes or bug fixes relative to version +1.0.0. This is just a documentation update + a fix for minor Win32 +build problems. For almost everyone, upgrading from 1.0.0 to 1.0.1 is +utterly pointless. Don't bother. + + +1.0.2 +~~~~~ +A bug fix release, addressing various minor issues which have appeared +in the 18 or so months since 1.0.1 was released. Most of the fixes +are to do with file-handling or documentation bugs. To the best of my +knowledge, there have been no data-loss-causing bugs reported in the +compression/decompression engine of 1.0.0 or 1.0.1. + +Note that this release does not improve the rather crude build system +for Unix platforms. The general plan here is to autoconfiscate/ +libtoolise 1.0.2 soon after release, and release the result as 1.1.0 +or perhaps 1.2.0. That, however, is still just a plan at this point. + +Here are the changes in 1.0.2. Bug-reporters and/or patch-senders in +parentheses. + +* Fix an infinite segfault loop in 1.0.1 when a directory is + encountered in -f (force) mode. + (Trond Eivind Glomsrod, Nicholas Nethercote, Volker Schmidt) + +* Avoid double fclose() of output file on certain I/O error paths. + (Solar Designer) + +* Don't fail with internal error 1007 when fed a long stream (> 48MB) + of byte 251. Also print useful message suggesting that 1007s may be + caused by bad memory. + (noticed by Juan Pedro Vallejo, fixed by me) + +* Fix uninitialised variable silly bug in demo prog dlltest.c. + (Jorj Bauer) + +* Remove 512-MB limitation on recovered file size for bzip2recover + on selected platforms which support 64-bit ints. At the moment + all GCC supported platforms, and Win32. + (me, Alson van der Meulen) + +* Hard-code header byte values, to give correct operation on platforms + using EBCDIC as their native character set (IBM's OS/390). + (Leland Lucius) + +* Copy file access times correctly. + (Marty Leisner) + +* Add distclean and check targets to Makefile. + (Michael Carmack) + +* Parameterise use of ar and ranlib in Makefile. Also add $(LDFLAGS). + (Rich Ireland, Bo Thorsen) + +* Pass -p (create parent dirs as needed) to mkdir during make install. + (Jeremy Fusco) + +* Dereference symlinks when copying file permissions in -f mode. + (Volker Schmidt) + +* Majorly simplify implementation of uInt64_qrm10. + (Bo Lindbergh) + +* Check the input file still exists before deleting the output one, + when aborting in cleanUpAndFail(). + (Joerg Prante, Robert Linden, Matthias Krings) + +Also a bunch of patches courtesy of Philippe Troin, the Debian maintainer +of bzip2: + +* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore. + +* Spelling changes and minor enhancements in bzip2.1. + +* Avoid race condition between creating the output file and setting its + interim permissions safely, by using fopen_output_safely(). + No changes to bzip2recover since there is no issue with file + permissions there. + +* do not print senseless report with -v when compressing an empty + file. + +* bzcat -f works on non-bzip2 files. + +* do not try to escape shell meta-characters on unix (the shell takes + care of these). + +* added --fast and --best aliases for -1 -9 for gzip compatibility. + + +1.0.3 (15 Feb 05) +~~~~~~~~~~~~~~~~~ +Fixes some minor bugs since the last version, 1.0.2. + +* Further robustification against corrupted compressed data. + There are currently no known bitstreams which can cause the + decompressor to crash, loop or access memory which does not + belong to it. If you are using bzip2 or the library to + decompress bitstreams from untrusted sources, an upgrade + to 1.0.3 is recommended. This fixes CAN-2005-1260. + +* The documentation has been converted to XML, from which html + and pdf can be derived. + +* Various minor bugs in the documentation have been fixed. + +* Fixes for various compilation warnings with newer versions of + gcc, and on 64-bit platforms. + +* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2. + This has been fixed. + + +1.0.4 (20 Dec 06) +~~~~~~~~~~~~~~~~~ +Fixes some minor bugs since the last version, 1.0.3. + +* Fix file permissions race problem (CAN-2005-0953). + +* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD + scan. + +* 'const'/prototype cleanups in the C code. + +* Change default install location to /usr/local, and handle multiple + 'make install's without error. + +* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758 + to the extent that applies to bzgrep. + +* Use 'mktemp' rather than 'tempfile' in bzdiff. + +* Tighten up a couple of assertions in blocksort.c following automated + analysis. + +* Fix minor doc/comment bugs. + + +1.0.5 (10 Dec 07) +~~~~~~~~~~~~~~~~~ +Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + + +1.0.6 (6 Sept 10) +~~~~~~~~~~~~~~~~~ + +* Security fix for CVE-2010-0405. This was reported by Mikolaj + Izdebski. + +* Make the documentation build on Ubuntu 10.04 Added: soc2013/dpl/bzip2/FREEBSD-Xlist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/FREEBSD-Xlist Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,26 @@ +# $FreeBSD: soc2013/dpl/head/contrib/bzip2/FREEBSD-Xlist 241542 2012-09-11 21:16:22Z delphij $ +*Makefile* +*README.XML.STUFF +*bz-common.xsl +*bz-fo.xsl +*bz-html.xsl +*bzdiff +*bzdiff.1 +*bzgrep +*bzgrep.1 +*bzip.css +*bzip2.1.preformatted +*bzip2.txt +*bzmore +*bzmore.1 +*dlltest.* +*entities.xml +*format.pl +*libbz2.dsp +*makefile.msc +*manual.html +*manual.pdf +*manual.ps +*manual.xml +*mk251.c +*xmlproc.sh Added: soc2013/dpl/bzip2/FREEBSD-upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/FREEBSD-upgrade Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,27 @@ +$FreeBSD: soc2013/dpl/head/contrib/bzip2/FREEBSD-upgrade 177466 2008-03-20 02:45:32Z delphij $ + +Julian Seward's bzip2 + originals can be found at: http://www.bzip.org/downloads.html + +Imported by: + + cvs import -m "Virgin import (trimmed) of Bzip2 version 1.0.5." \ + src/contrib/bzip2 BZIP2 v1_0_5 + +Notes: + The following log shows details of trimming: + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + tar xvfz bzip2-1.0.4.tar.gz -X FREEBSD-Xlist + cd bzip2-1.0.4 + uuencode sample1.bz2 sample1.bz2 > sample1.bz2.uu + uuencode sample2.bz2 sample2.bz2 > sample2.bz2.uu + uuencode sample3.bz2 sample3.bz2 > sample3.bz2.uu + gzip -9 sample1.ref sample2.ref sample3.ref + uuencode sample1.ref.gz sample1.ref.gz > sample1.ref.gz.uu + uuencode sample2.ref.gz sample2.ref.gz > sample2.ref.gz.uu + uuencode sample3.ref.gz sample3.ref.gz > sample3.ref.gz.uu + rm sample1.bz2 sample1.ref.gz sample2.bz2 sample2.ref.gz + rm sample3.bz2 sample3.ref.gz + +obrien@FreeBSD.org +15 May 2005 Added: soc2013/dpl/bzip2/FREEBSD-vendor ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/FREEBSD-vendor Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,5 @@ +# $FreeBSD: soc2013/dpl/head/contrib/bzip2/FREEBSD-vendor 196207 2009-08-13 06:07:38Z des $ +Project: bzip2 +ProjectURL: http://www.bzip.org/ +Version: 1.0.5 +License: BSD Added: soc2013/dpl/bzip2/LICENSE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/LICENSE Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,42 @@ + +-------------------------------------------------------------------------- + +This program, "bzip2", the associated library "libbzip2", and all +documentation, are copyright (C) 1996-2010 Julian R Seward. All +rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.6 of 6 September 2010 + +-------------------------------------------------------------------------- Added: soc2013/dpl/bzip2/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/Makefile Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,51 @@ +# $FreeBSD: soc2013/dpl/head/usr.bin/bzip2/Makefile 201429 2010-01-02 10:27:05Z ed $ + +BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +.PATH: ${BZ2DIR} + +PROG= bzip2 +CFLAGS+= -D_FILE_OFFSET_BITS=64 + +WARNS?= 3 + +DPADD= ${LIBBZ2} +LDADD= -lbz2 + +LINKS= ${BINDIR}/bzip2 ${BINDIR}/bunzip2 +LINKS+= ${BINDIR}/bzip2 ${BINDIR}/bzcat +MLINKS= bzip2.1 bunzip2.1 bzip2.1 bzcat.1 + +REFFILES= sample1.ref sample2.ref sample3.ref +DREFFILES= sample1.bz2 sample2.bz2 sample3.bz2 +TESTFILES= ${REFFILES} ${DREFFILES} + +CLEANFILES+= ${TESTFILES} \ + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst + +.for f in ${REFFILES} +${f}: ${f}.gz.uu + uudecode -p ${BZ2DIR}/${f}.gz.uu | gunzip > ${f} +.endfor +.for f in ${DREFFILES} +${f}: ${f}.uu + uudecode ${BZ2DIR}/${f}.uu +.endfor + +test: bzip2 ${TESTFILES} + @cat ${BZ2DIR}/words1 + ./bzip2 -1 < sample1.ref > sample1.rb2 + ./bzip2 -2 < sample2.ref > sample2.rb2 + ./bzip2 -3 < sample3.ref > sample3.rb2 + ./bzip2 -d < sample1.bz2 > sample1.tst + ./bzip2 -d < sample2.bz2 > sample2.tst + ./bzip2 -ds < sample3.bz2 > sample3.tst + cmp sample1.bz2 sample1.rb2 + cmp sample2.bz2 sample2.rb2 + cmp sample3.bz2 sample3.rb2 + cmp sample1.tst sample1.ref + cmp sample2.tst sample2.ref + cmp sample3.tst sample3.ref + @cat ${BZ2DIR}/words3 + +.include Added: soc2013/dpl/bzip2/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/README Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,215 @@ + +This is the README for bzip2/libzip2. +This version is fully compatible with the previous public releases. + +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward + +Please read the WARNING, DISCLAIMER and PATENTS sections in this file. + +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ + +Complete documentation is available in Postscript form (manual.ps), +PDF (manual.pdf) or html (manual.html). A plain-text version of the +manual page is available as bzip2.txt. + + +HOW TO BUILD -- UNIX + +Type 'make'. This builds the library libbz2.a and then the programs +bzip2 and bzip2recover. Six self-tests are run. If the self-tests +complete ok, carry on to installation: + +To install in /usr/local/bin, /usr/local/lib, /usr/local/man and +/usr/local/include, type + + make install + +To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + + make install PREFIX=/xxx/yyy + +If you are (justifiably) paranoid and want to see what 'make install' +is going to do, you can first do + + make -n install or + make -n install PREFIX=/xxx/yyy respectively. + +The -n instructs make to show the commands it would execute, but not +actually execute them. + + +HOW TO BUILD -- UNIX, shared library libbz2.so. + +Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for +Linux-ELF (RedHat 7.2 on an x86 box), with gcc. I make no claims +that it works for any other platform, though I suspect it probably +will work for most platforms employing both ELF and gcc. + +bzip2-shared, a client of the shared library, is also built, but not +self-tested. So I suggest you also build using the normal Makefile, +since that conducts a self-test. A second reason to prefer the +version statically linked to the library is that, on x86 platforms, +building shared objects makes a valuable register (%ebx) unavailable +to gcc, resulting in a slowdown of 10%-20%, at least for bzip2. + +Important note for people upgrading .so's from 0.9.0/0.9.5 to version +1.0.X. All the functions in the library have been renamed, from (eg) +bzCompress to BZ2_bzCompress, to avoid namespace pollution. +Unfortunately this means that the libbz2.so created by +Makefile-libbz2_so will not work with any program which used an older +version of the library. I do encourage library clients to make the +effort to upgrade to use version 1.0, since it is both faster and more +robust than previous versions. + + +HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. + +It's difficult for me to support compilation on all these platforms. +My approach is to collect binaries for these platforms, and put them +on the master web site (http://www.bzip.org). Look there. However +(FWIW), bzip2-1.0.X is very standard ANSI C and should compile +unmodified with MS Visual C. If you have difficulties building, you +might want to read README.COMPILATION.PROBLEMS. + +At least using MS Visual C++ 6, you can build from the unmodified +sources by issuing, in a command shell: + + nmake -f makefile.msc + +(you may need to first run the MSVC-provided script VCVARS32.BAT + so as to set up paths to the MSVC tools correctly). + + +VALIDATION + +Correct operation, in the sense that a compressed file can always be +decompressed to reproduce the original, is obviously of paramount +importance. To validate bzip2, I used a modified version of Mark +Nelson's churn program. Churn is an automated test driver which +recursively traverses a directory structure, using bzip2 to compress +and then decompress each file it encounters, and checking that the +decompressed data is the same as the original. + + + +Please read and be aware of the following: + +WARNING: + + This program and library (attempts to) compress data by + performing several non-trivial transformations on it. + Unless you are 100% familiar with *all* the algorithms + contained herein, and with the consequences of modifying them, + you should NOT meddle with the compression or decompression + machinery. Incorrect changes can and very likely *will* + lead to disastrous loss of data. + + +DISCLAIMER: + + I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE + USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED. + + Every compression of a file implies an assumption that the + compressed file can be decompressed to reproduce the original. + Great efforts in design, coding and testing have been made to + ensure that this program works correctly. However, the complexity + of the algorithms, and, in particular, the presence of various + special cases in the code which occur with very low but non-zero + probability make it impossible to rule out the possibility of bugs + remaining in the program. DO NOT COMPRESS ANY DATA WITH THIS + PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER + SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. + + That is not to say this program is inherently unreliable. + Indeed, I very much hope the opposite is true. bzip2/libbzip2 + has been carefully constructed and extensively tested. + + +PATENTS: + + To the best of my knowledge, bzip2/libbzip2 does not use any + patented algorithms. However, I do not have the resources + to carry out a patent search. Therefore I cannot give any + guarantee of the above statement. + + + +WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ? + + * Approx 10% faster compression, 30% faster decompression + * -t (test mode) is a lot quicker + * Can decompress concatenated compressed files + * Programming interface, so programs can directly read/write .bz2 files + * Less restrictive (BSD-style) licensing + * Flag handling more compatible with GNU gzip + * Much more documentation, i.e., a proper user manual + * Hopefully, improved portability (at least of the library) + +WHAT'S NEW IN 0.9.5 ? + + * Compression speed is much less sensitive to the input + data than in previous versions. Specifically, the very + slow performance caused by repetitive data is fixed. + * Many small improvements in file and flag handling. + * A Y2K statement. + +WHAT'S NEW IN 1.0.0 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.2 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.3 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.4 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.5 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.6 ? + + See the CHANGES file. + + +I hope you find bzip2 useful. Feel free to contact me at + jseward@bzip.org +if you have any suggestions or queries. Many people mailed me with +comments, suggestions and patches after the releases of bzip-0.15, +bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, +1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this +feedback. I thank you for your comments. + +bzip2's "home" is http://www.bzip.org/ + +Julian Seward +jseward@bzip.org +Cambridge, UK. + +18 July 1996 (version 0.15) +25 August 1996 (version 0.21) + 7 August 1997 (bzip2, version 0.1) +29 August 1997 (bzip2, version 0.1pl2) +23 August 1998 (bzip2, version 0.9.0) + 8 June 1999 (bzip2, version 0.9.5) + 4 Sept 1999 (bzip2, version 0.9.5d) + 5 May 2000 (bzip2, version 1.0pre8) +30 December 2001 (bzip2, version 1.0.2pre1) +15 February 2005 (bzip2, version 1.0.3) +20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) + 6 Sept 2010 (bzip2, version 1.0.6) Added: soc2013/dpl/bzip2/README.COMPILATION.PROBLEMS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/README.COMPILATION.PROBLEMS Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,58 @@ +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward + +Please read the WARNING, DISCLAIMER and PATENTS sections in the +README file. + +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ + +bzip2-1.0.6 should compile without problems on the vast majority of +platforms. Using the supplied Makefile, I've built and tested it +myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ +6.0 and nmake, you can build a native Win32 version too. Large file +support seems to work correctly on at least on amd64-linux. + +When I say "large file" I mean a file of size 2,147,483,648 (2^31) +bytes or above. Many older OSs can't handle files above this size, +but many newer ones can. Large files are pretty huge -- most files +you'll encounter are not Large Files. + +Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety +of platforms without difficulty, and I hope this version will continue +in that tradition. However, in order to support large files, I've had +to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This +can cause problems. + +The technique of adding -D_FILE_OFFSET_BITS=64 to get large file +support is, as far as I know, the Recommended Way to get correct large +file support. For more details, see the Large File Support +Specification, published by the Large File Summit, at + + http://ftp.sas.com/standards/large.file + +As a general comment, if you get compilation errors which you think +are related to large file support, try removing the above define from +the Makefile, ie, delete the line + + BIGFILES=-D_FILE_OFFSET_BITS=64 + +from the Makefile, and do 'make clean ; make'. This will give you a +version of bzip2 without large file support, which, for most +applications, is probably not a problem. + +Alternatively, try some of the platform-specific hints listed below. + +You can use the spewG.c program to generate huge files to test bzip2's +large file support, if you are feeling paranoid. Be aware though that +any compilation problems which affect bzip2 will also affect spewG.c, +alas. + +AIX: I have reports that for large file support, you need to specify +-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested +this myself. Added: soc2013/dpl/bzip2/blocksort.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/blocksort.c Mon Jun 17 07:52:12 2013 (r253061) @@ -0,0 +1,1094 @@ + +/*-------------------------------------------------------------*/ +/*--- Block sorting machinery ---*/ +/*--- blocksort.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + +/*---------------------------------------------*/ +/*--- Fallback O(N log(N)^2) sorting ---*/ +/*--- algorithm, for repetitive blocks ---*/ +/*---------------------------------------------*/ + +/*---------------------------------------------*/ +static +__inline__ +void fallbackSimpleSort ( UInt32* fmap, + UInt32* eclass, + Int32 lo, + Int32 hi ) +{ + Int32 i, j, tmp; + UInt32 ec_tmp; + + if (lo == hi) return; + + if (hi - lo > 3) { + for ( i = hi-4; i >= lo; i-- ) { + tmp = fmap[i]; + ec_tmp = eclass[tmp]; + for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 ) + fmap[j-4] = fmap[j]; + fmap[j-4] = tmp; + } + } + + for ( i = hi-1; i >= lo; i-- ) { + tmp = fmap[i]; + ec_tmp = eclass[tmp]; + for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ ) + fmap[j-1] = fmap[j]; + fmap[j-1] = tmp; + } +} + + +/*---------------------------------------------*/ +#define fswap(zz1, zz2) \ + { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } + +#define fvswap(zzp1, zzp2, zzn) \ +{ \ + Int32 yyp1 = (zzp1); \ + Int32 yyp2 = (zzp2); \ + Int32 yyn = (zzn); \ + while (yyn > 0) { \ + fswap(fmap[yyp1], fmap[yyp2]); \ + yyp1++; yyp2++; yyn--; \ + } \ +} + + +#define fmin(a,b) ((a) < (b)) ? (a) : (b) + +#define fpush(lz,hz) { stackLo[sp] = lz; \ + stackHi[sp] = hz; \ + sp++; } + +#define fpop(lz,hz) { sp--; \ + lz = stackLo[sp]; \ + hz = stackHi[sp]; } + +#define FALLBACK_QSORT_SMALL_THRESH 10 +#define FALLBACK_QSORT_STACK_SIZE 100 + + +static +void fallbackQSort3 ( UInt32* fmap, + UInt32* eclass, + Int32 loSt, + Int32 hiSt ) +{ + Int32 unLo, unHi, ltLo, gtHi, n, m; + Int32 sp, lo, hi; + UInt32 med, r, r3; + Int32 stackLo[FALLBACK_QSORT_STACK_SIZE]; + Int32 stackHi[FALLBACK_QSORT_STACK_SIZE]; + + r = 0; + + sp = 0; + fpush ( loSt, hiSt ); + + while (sp > 0) { + + AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 ); + + fpop ( lo, hi ); + if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) { + fallbackSimpleSort ( fmap, eclass, lo, hi ); + continue; + } + + /* Random partitioning. Median of 3 sometimes fails to + avoid bad cases. Median of 9 seems to help but + looks rather expensive. This too seems to work but + is cheaper. Guidance for the magic constants + 7621 and 32768 is taken from Sedgewick's algorithms + book, chapter 35. + */ + r = ((r * 7621) + 1) % 32768; + r3 = r % 3; + if (r3 == 0) med = eclass[fmap[lo]]; else + if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else + med = eclass[fmap[hi]]; + + unLo = ltLo = lo; + unHi = gtHi = hi; + + while (1) { + while (1) { + if (unLo > unHi) break; + n = (Int32)eclass[fmap[unLo]] - (Int32)med; + if (n == 0) { + fswap(fmap[unLo], fmap[ltLo]); + ltLo++; unLo++; + continue; + }; + if (n > 0) break; + unLo++; + } + while (1) { + if (unLo > unHi) break; + n = (Int32)eclass[fmap[unHi]] - (Int32)med; + if (n == 0) { + fswap(fmap[unHi], fmap[gtHi]); + gtHi--; unHi--; + continue; + }; + if (n < 0) break; + unHi--; + } + if (unLo > unHi) break; + fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--; + } + + AssertD ( unHi == unLo-1, "fallbackQSort3(2)" ); + + if (gtHi < ltLo) continue; + + n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n); + m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m); + + n = lo + unLo - ltLo - 1; + m = hi - (gtHi - unHi) + 1; + + if (n - lo > hi - m) { + fpush ( lo, n ); + fpush ( m, hi ); + } else { + fpush ( m, hi ); + fpush ( lo, n ); + } + } +} + +#undef fmin +#undef fpush +#undef fpop +#undef fswap +#undef fvswap +#undef FALLBACK_QSORT_SMALL_THRESH +#undef FALLBACK_QSORT_STACK_SIZE + + +/*---------------------------------------------*/ +/* Pre: + nblock > 0 + eclass exists for [0 .. nblock-1] + ((UChar*)eclass) [0 .. nblock-1] holds block + ptr exists for [0 .. nblock-1] + + Post: + ((UChar*)eclass) [0 .. nblock-1] holds block + All other areas of eclass destroyed + fmap [0 .. nblock-1] holds sorted order + bhtab [ 0 .. 2+(nblock/32) ] destroyed +*/ + +#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) +#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) +#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) +#define WORD_BH(zz) bhtab[(zz) >> 5] +#define UNALIGNED_BH(zz) ((zz) & 0x01f) + +static +void fallbackSort ( UInt32* fmap, + UInt32* eclass, + UInt32* bhtab, + Int32 nblock, + Int32 verb ) +{ + Int32 ftab[257]; + Int32 ftabCopy[256]; + Int32 H, i, j, k, l, r, cc, cc1; + Int32 nNotDone; + Int32 nBhtab; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 09:57:28 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3F92E923 for ; Mon, 17 Jun 2013 09:57:28 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 184DA1853 for ; Mon, 17 Jun 2013 09:57:28 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5H9vRUV054200 for ; Mon, 17 Jun 2013 09:57:27 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5H9vRTh054199 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 09:57:27 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 09:57:27 GMT Message-Id: <201306170957.r5H9vRTh054199@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253067 - soc2013/dpl/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 09:57:28 -0000 Author: dpl Date: Mon Jun 17 09:57:27 2013 New Revision: 253067 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253067 Log: Deleted: soc2013/dpl/bzip2/ From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 09:59:12 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1BB60948 for ; Mon, 17 Jun 2013 09:59:12 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 0BE861863 for ; Mon, 17 Jun 2013 09:59:12 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5H9xBIO054567 for ; Mon, 17 Jun 2013 09:59:11 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5H9xB5d054565 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 09:59:11 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 09:59:11 GMT Message-Id: <201306170959.r5H9xB5d054565@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253068 - soc2013/dpl/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 09:59:12 -0000 Author: dpl Date: Mon Jun 17 09:59:11 2013 New Revision: 253068 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253068 Log: Added: soc2013/dpl/bzip2/ soc2013/dpl/bzip2/blocksort.c soc2013/dpl/bzip2/bzip2 (contents, props changed) soc2013/dpl/bzip2/bzip2.1 soc2013/dpl/bzip2/bzip2.1.gz (contents, props changed) soc2013/dpl/bzip2/bzip2.c soc2013/dpl/bzip2/bzip2recover.c soc2013/dpl/bzip2/bzlib.c soc2013/dpl/bzip2/bzlib.h soc2013/dpl/bzip2/bzlib_private.h soc2013/dpl/bzip2/compress.c soc2013/dpl/bzip2/crctable.c soc2013/dpl/bzip2/decompress.c soc2013/dpl/bzip2/huffman.c soc2013/dpl/bzip2/libbz2.def soc2013/dpl/bzip2/randtable.c soc2013/dpl/bzip2/sample1.bz2.uu soc2013/dpl/bzip2/sample1.ref.gz.uu soc2013/dpl/bzip2/sample2.bz2.uu soc2013/dpl/bzip2/sample2.ref.gz.uu soc2013/dpl/bzip2/sample3.bz2.uu soc2013/dpl/bzip2/sample3.ref.gz.uu soc2013/dpl/bzip2/spewG.c soc2013/dpl/bzip2/unzcrash.c soc2013/dpl/bzip2/words0 soc2013/dpl/bzip2/words1 soc2013/dpl/bzip2/words2 soc2013/dpl/bzip2/words3 Added: soc2013/dpl/bzip2/blocksort.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/bzip2/blocksort.c Mon Jun 17 09:59:11 2013 (r253068) @@ -0,0 +1,1094 @@ + +/*-------------------------------------------------------------*/ +/*--- Block sorting machinery ---*/ +/*--- blocksort.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + +/*---------------------------------------------*/ +/*--- Fallback O(N log(N)^2) sorting ---*/ +/*--- algorithm, for repetitive blocks ---*/ +/*---------------------------------------------*/ + +/*---------------------------------------------*/ +static +__inline__ +void fallbackSimpleSort ( UInt32* fmap, + UInt32* eclass, + Int32 lo, + Int32 hi ) +{ + Int32 i, j, tmp; + UInt32 ec_tmp; + + if (lo == hi) return; + + if (hi - lo > 3) { + for ( i = hi-4; i >= lo; i-- ) { + tmp = fmap[i]; + ec_tmp = eclass[tmp]; + for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 ) + fmap[j-4] = fmap[j]; + fmap[j-4] = tmp; + } + } + + for ( i = hi-1; i >= lo; i-- ) { + tmp = fmap[i]; + ec_tmp = eclass[tmp]; + for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ ) + fmap[j-1] = fmap[j]; + fmap[j-1] = tmp; + } +} + + +/*---------------------------------------------*/ +#define fswap(zz1, zz2) \ + { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } + +#define fvswap(zzp1, zzp2, zzn) \ +{ \ + Int32 yyp1 = (zzp1); \ + Int32 yyp2 = (zzp2); \ + Int32 yyn = (zzn); \ + while (yyn > 0) { \ + fswap(fmap[yyp1], fmap[yyp2]); \ + yyp1++; yyp2++; yyn--; \ + } \ +} + + +#define fmin(a,b) ((a) < (b)) ? (a) : (b) + +#define fpush(lz,hz) { stackLo[sp] = lz; \ + stackHi[sp] = hz; \ + sp++; } + +#define fpop(lz,hz) { sp--; \ + lz = stackLo[sp]; \ + hz = stackHi[sp]; } + +#define FALLBACK_QSORT_SMALL_THRESH 10 +#define FALLBACK_QSORT_STACK_SIZE 100 + + +static +void fallbackQSort3 ( UInt32* fmap, + UInt32* eclass, + Int32 loSt, + Int32 hiSt ) +{ + Int32 unLo, unHi, ltLo, gtHi, n, m; + Int32 sp, lo, hi; + UInt32 med, r, r3; + Int32 stackLo[FALLBACK_QSORT_STACK_SIZE]; + Int32 stackHi[FALLBACK_QSORT_STACK_SIZE]; + + r = 0; + + sp = 0; + fpush ( loSt, hiSt ); + + while (sp > 0) { + + AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 ); + + fpop ( lo, hi ); + if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) { + fallbackSimpleSort ( fmap, eclass, lo, hi ); + continue; + } + + /* Random partitioning. Median of 3 sometimes fails to + avoid bad cases. Median of 9 seems to help but + looks rather expensive. This too seems to work but + is cheaper. Guidance for the magic constants + 7621 and 32768 is taken from Sedgewick's algorithms + book, chapter 35. + */ + r = ((r * 7621) + 1) % 32768; + r3 = r % 3; + if (r3 == 0) med = eclass[fmap[lo]]; else + if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else + med = eclass[fmap[hi]]; + + unLo = ltLo = lo; + unHi = gtHi = hi; + + while (1) { + while (1) { + if (unLo > unHi) break; + n = (Int32)eclass[fmap[unLo]] - (Int32)med; + if (n == 0) { + fswap(fmap[unLo], fmap[ltLo]); + ltLo++; unLo++; + continue; + }; + if (n > 0) break; + unLo++; + } + while (1) { + if (unLo > unHi) break; + n = (Int32)eclass[fmap[unHi]] - (Int32)med; + if (n == 0) { + fswap(fmap[unHi], fmap[gtHi]); + gtHi--; unHi--; + continue; + }; + if (n < 0) break; + unHi--; + } + if (unLo > unHi) break; + fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--; + } + + AssertD ( unHi == unLo-1, "fallbackQSort3(2)" ); + + if (gtHi < ltLo) continue; + + n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n); + m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m); + + n = lo + unLo - ltLo - 1; + m = hi - (gtHi - unHi) + 1; + + if (n - lo > hi - m) { + fpush ( lo, n ); + fpush ( m, hi ); + } else { + fpush ( m, hi ); + fpush ( lo, n ); + } + } +} + +#undef fmin +#undef fpush +#undef fpop +#undef fswap +#undef fvswap +#undef FALLBACK_QSORT_SMALL_THRESH +#undef FALLBACK_QSORT_STACK_SIZE + + +/*---------------------------------------------*/ +/* Pre: + nblock > 0 + eclass exists for [0 .. nblock-1] + ((UChar*)eclass) [0 .. nblock-1] holds block + ptr exists for [0 .. nblock-1] + + Post: + ((UChar*)eclass) [0 .. nblock-1] holds block + All other areas of eclass destroyed + fmap [0 .. nblock-1] holds sorted order + bhtab [ 0 .. 2+(nblock/32) ] destroyed +*/ + +#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) +#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) +#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) +#define WORD_BH(zz) bhtab[(zz) >> 5] +#define UNALIGNED_BH(zz) ((zz) & 0x01f) + +static +void fallbackSort ( UInt32* fmap, + UInt32* eclass, + UInt32* bhtab, + Int32 nblock, + Int32 verb ) +{ + Int32 ftab[257]; + Int32 ftabCopy[256]; + Int32 H, i, j, k, l, r, cc, cc1; + Int32 nNotDone; + Int32 nBhtab; + UChar* eclass8 = (UChar*)eclass; + + /*-- + Initial 1-char radix sort to generate + initial fmap and initial BH bits. + --*/ + if (verb >= 4) + VPrintf0 ( " bucket sorting ...\n" ); + for (i = 0; i < 257; i++) ftab[i] = 0; + for (i = 0; i < nblock; i++) ftab[eclass8[i]]++; + for (i = 0; i < 256; i++) ftabCopy[i] = ftab[i]; + for (i = 1; i < 257; i++) ftab[i] += ftab[i-1]; + + for (i = 0; i < nblock; i++) { + j = eclass8[i]; + k = ftab[j] - 1; + ftab[j] = k; + fmap[k] = i; + } + + nBhtab = 2 + (nblock / 32); + for (i = 0; i < nBhtab; i++) bhtab[i] = 0; + for (i = 0; i < 256; i++) SET_BH(ftab[i]); + + /*-- + Inductively refine the buckets. Kind-of an + "exponential radix sort" (!), inspired by the + Manber-Myers suffix array construction algorithm. + --*/ + + /*-- set sentinel bits for block-end detection --*/ + for (i = 0; i < 32; i++) { + SET_BH(nblock + 2*i); + CLEAR_BH(nblock + 2*i + 1); + } + + /*-- the log(N) loop --*/ + H = 1; + while (1) { + + if (verb >= 4) + VPrintf1 ( " depth %6d has ", H ); + + j = 0; + for (i = 0; i < nblock; i++) { + if (ISSET_BH(i)) j = i; + k = fmap[i] - H; if (k < 0) k += nblock; + eclass[k] = j; + } + + nNotDone = 0; + r = -1; + while (1) { + + /*-- find the next non-singleton bucket --*/ + k = r + 1; + while (ISSET_BH(k) && UNALIGNED_BH(k)) k++; + if (ISSET_BH(k)) { + while (WORD_BH(k) == 0xffffffff) k += 32; + while (ISSET_BH(k)) k++; + } + l = k - 1; + if (l >= nblock) break; + while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++; + if (!ISSET_BH(k)) { + while (WORD_BH(k) == 0x00000000) k += 32; + while (!ISSET_BH(k)) k++; + } + r = k - 1; + if (r >= nblock) break; + + /*-- now [l, r] bracket current bucket --*/ + if (r > l) { + nNotDone += (r - l + 1); + fallbackQSort3 ( fmap, eclass, l, r ); + + /*-- scan bucket and generate header bits-- */ + cc = -1; + for (i = l; i <= r; i++) { + cc1 = eclass[fmap[i]]; + if (cc != cc1) { SET_BH(i); cc = cc1; }; + } + } + } + + if (verb >= 4) + VPrintf1 ( "%6d unresolved strings\n", nNotDone ); + + H *= 2; + if (H > nblock || nNotDone == 0) break; + } + + /*-- + Reconstruct the original block in + eclass8 [0 .. nblock-1], since the + previous phase destroyed it. + --*/ + if (verb >= 4) + VPrintf0 ( " reconstructing block ...\n" ); + j = 0; + for (i = 0; i < nblock; i++) { + while (ftabCopy[j] == 0) j++; + ftabCopy[j]--; + eclass8[fmap[i]] = (UChar)j; + } + AssertH ( j < 256, 1005 ); +} + +#undef SET_BH +#undef CLEAR_BH +#undef ISSET_BH +#undef WORD_BH +#undef UNALIGNED_BH + + +/*---------------------------------------------*/ +/*--- The main, O(N^2 log(N)) sorting ---*/ +/*--- algorithm. Faster for "normal" ---*/ +/*--- non-repetitive blocks. ---*/ +/*---------------------------------------------*/ + +/*---------------------------------------------*/ +static +__inline__ +Bool mainGtU ( UInt32 i1, + UInt32 i2, + UChar* block, + UInt16* quadrant, + UInt32 nblock, + Int32* budget ) +{ + Int32 k; + UChar c1, c2; + UInt16 s1, s2; + + AssertD ( i1 != i2, "mainGtU" ); + /* 1 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 2 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 3 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 4 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 5 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 6 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 7 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 8 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 9 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 10 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 11 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 12 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + + k = nblock + 8; + + do { + /* 1 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 2 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 3 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 4 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 5 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 6 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 7 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 8 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + + if (i1 >= nblock) i1 -= nblock; + if (i2 >= nblock) i2 -= nblock; + + k -= 8; + (*budget)--; + } + while (k >= 0); + + return False; +} + + +/*---------------------------------------------*/ +/*-- + Knuth's increments seem to work better + than Incerpi-Sedgewick here. Possibly + because the number of elems to sort is + usually small, typically <= 20. +--*/ +static +Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280, + 9841, 29524, 88573, 265720, + 797161, 2391484 }; + +static +void mainSimpleSort ( UInt32* ptr, + UChar* block, + UInt16* quadrant, + Int32 nblock, + Int32 lo, + Int32 hi, + Int32 d, + Int32* budget ) +{ + Int32 i, j, h, bigN, hp; + UInt32 v; + + bigN = hi - lo + 1; + if (bigN < 2) return; + + hp = 0; + while (incs[hp] < bigN) hp++; + hp--; + + for (; hp >= 0; hp--) { + h = incs[hp]; + + i = lo + h; + while (True) { + + /*-- copy 1 --*/ + if (i > hi) break; + v = ptr[i]; + j = i; + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget + ) ) { + ptr[j] = ptr[j-h]; + j = j - h; + if (j <= (lo + h - 1)) break; + } + ptr[j] = v; + i++; + + /*-- copy 2 --*/ + if (i > hi) break; + v = ptr[i]; + j = i; + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget + ) ) { + ptr[j] = ptr[j-h]; + j = j - h; + if (j <= (lo + h - 1)) break; + } + ptr[j] = v; + i++; + + /*-- copy 3 --*/ + if (i > hi) break; + v = ptr[i]; + j = i; + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget + ) ) { + ptr[j] = ptr[j-h]; + j = j - h; + if (j <= (lo + h - 1)) break; + } + ptr[j] = v; + i++; + + if (*budget < 0) return; + } + } +} + + +/*---------------------------------------------*/ +/*-- + The following is an implementation of + an elegant 3-way quicksort for strings, + described in a paper "Fast Algorithms for + Sorting and Searching Strings", by Robert + Sedgewick and Jon L. Bentley. +--*/ + +#define mswap(zz1, zz2) \ + { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } + +#define mvswap(zzp1, zzp2, zzn) \ +{ \ + Int32 yyp1 = (zzp1); \ + Int32 yyp2 = (zzp2); \ + Int32 yyn = (zzn); \ + while (yyn > 0) { \ + mswap(ptr[yyp1], ptr[yyp2]); \ + yyp1++; yyp2++; yyn--; \ + } \ +} + +static +__inline__ +UChar mmed3 ( UChar a, UChar b, UChar c ) +{ + UChar t; + if (a > b) { t = a; a = b; b = t; }; + if (b > c) { + b = c; + if (a > b) b = a; + } + return b; +} + +#define mmin(a,b) ((a) < (b)) ? (a) : (b) + +#define mpush(lz,hz,dz) { stackLo[sp] = lz; \ + stackHi[sp] = hz; \ + stackD [sp] = dz; \ + sp++; } + +#define mpop(lz,hz,dz) { sp--; \ + lz = stackLo[sp]; \ + hz = stackHi[sp]; \ + dz = stackD [sp]; } + + +#define mnextsize(az) (nextHi[az]-nextLo[az]) + +#define mnextswap(az,bz) \ + { Int32 tz; \ + tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \ + tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \ + tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; } + + +#define MAIN_QSORT_SMALL_THRESH 20 +#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT) +#define MAIN_QSORT_STACK_SIZE 100 + +static +void mainQSort3 ( UInt32* ptr, + UChar* block, + UInt16* quadrant, + Int32 nblock, + Int32 loSt, + Int32 hiSt, + Int32 dSt, + Int32* budget ) +{ + Int32 unLo, unHi, ltLo, gtHi, n, m, med; + Int32 sp, lo, hi, d; + + Int32 stackLo[MAIN_QSORT_STACK_SIZE]; + Int32 stackHi[MAIN_QSORT_STACK_SIZE]; + Int32 stackD [MAIN_QSORT_STACK_SIZE]; + + Int32 nextLo[3]; + Int32 nextHi[3]; + Int32 nextD [3]; + + sp = 0; + mpush ( loSt, hiSt, dSt ); + + while (sp > 0) { + + AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 ); + + mpop ( lo, hi, d ); + if (hi - lo < MAIN_QSORT_SMALL_THRESH || + d > MAIN_QSORT_DEPTH_THRESH) { + mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget ); + if (*budget < 0) return; + continue; + } + + med = (Int32) + mmed3 ( block[ptr[ lo ]+d], + block[ptr[ hi ]+d], + block[ptr[ (lo+hi)>>1 ]+d] ); + + unLo = ltLo = lo; + unHi = gtHi = hi; + + while (True) { + while (True) { + if (unLo > unHi) break; + n = ((Int32)block[ptr[unLo]+d]) - med; + if (n == 0) { + mswap(ptr[unLo], ptr[ltLo]); + ltLo++; unLo++; continue; + }; + if (n > 0) break; + unLo++; + } + while (True) { + if (unLo > unHi) break; + n = ((Int32)block[ptr[unHi]+d]) - med; + if (n == 0) { + mswap(ptr[unHi], ptr[gtHi]); + gtHi--; unHi--; continue; + }; + if (n < 0) break; + unHi--; + } + if (unLo > unHi) break; + mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--; + } + + AssertD ( unHi == unLo-1, "mainQSort3(2)" ); + + if (gtHi < ltLo) { + mpush(lo, hi, d+1 ); + continue; + } + + n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n); + m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m); + + n = lo + unLo - ltLo - 1; + m = hi - (gtHi - unHi) + 1; + + nextLo[0] = lo; nextHi[0] = n; nextD[0] = d; + nextLo[1] = m; nextHi[1] = hi; nextD[1] = d; + nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1; + + if (mnextsize(0) < mnextsize(1)) mnextswap(0,1); + if (mnextsize(1) < mnextsize(2)) mnextswap(1,2); + if (mnextsize(0) < mnextsize(1)) mnextswap(0,1); + + AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" ); + AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" ); + + mpush (nextLo[0], nextHi[0], nextD[0]); + mpush (nextLo[1], nextHi[1], nextD[1]); + mpush (nextLo[2], nextHi[2], nextD[2]); + } +} + +#undef mswap +#undef mvswap +#undef mpush +#undef mpop +#undef mmin +#undef mnextsize +#undef mnextswap +#undef MAIN_QSORT_SMALL_THRESH +#undef MAIN_QSORT_DEPTH_THRESH +#undef MAIN_QSORT_STACK_SIZE + + +/*---------------------------------------------*/ +/* Pre: + nblock > N_OVERSHOOT + block32 exists for [0 .. nblock-1 +N_OVERSHOOT] + ((UChar*)block32) [0 .. nblock-1] holds block + ptr exists for [0 .. nblock-1] + + Post: + ((UChar*)block32) [0 .. nblock-1] holds block + All other areas of block32 destroyed + ftab [0 .. 65536 ] destroyed + ptr [0 .. nblock-1] holds sorted order + if (*budget < 0), sorting was abandoned +*/ + +#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8]) +#define SETMASK (1 << 21) +#define CLEARMASK (~(SETMASK)) + +static +void mainSort ( UInt32* ptr, + UChar* block, + UInt16* quadrant, + UInt32* ftab, + Int32 nblock, + Int32 verb, + Int32* budget ) +{ + Int32 i, j, k, ss, sb; + Int32 runningOrder[256]; + Bool bigDone[256]; + Int32 copyStart[256]; + Int32 copyEnd [256]; + UChar c1; + Int32 numQSorted; + UInt16 s; + if (verb >= 4) VPrintf0 ( " main sort initialise ...\n" ); + + /*-- set up the 2-byte frequency table --*/ + for (i = 65536; i >= 0; i--) ftab[i] = 0; + + j = block[0] << 8; + i = nblock-1; + for (; i >= 3; i -= 4) { + quadrant[i] = 0; + j = (j >> 8) | ( ((UInt16)block[i]) << 8); + ftab[j]++; + quadrant[i-1] = 0; + j = (j >> 8) | ( ((UInt16)block[i-1]) << 8); + ftab[j]++; + quadrant[i-2] = 0; + j = (j >> 8) | ( ((UInt16)block[i-2]) << 8); + ftab[j]++; + quadrant[i-3] = 0; + j = (j >> 8) | ( ((UInt16)block[i-3]) << 8); + ftab[j]++; + } + for (; i >= 0; i--) { + quadrant[i] = 0; + j = (j >> 8) | ( ((UInt16)block[i]) << 8); + ftab[j]++; + } + + /*-- (emphasises close relationship of block & quadrant) --*/ + for (i = 0; i < BZ_N_OVERSHOOT; i++) { + block [nblock+i] = block[i]; + quadrant[nblock+i] = 0; + } + + if (verb >= 4) VPrintf0 ( " bucket sorting ...\n" ); + + /*-- Complete the initial radix sort --*/ + for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1]; + + s = block[0] << 8; + i = nblock-1; + for (; i >= 3; i -= 4) { + s = (s >> 8) | (block[i] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i; + s = (s >> 8) | (block[i-1] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i-1; + s = (s >> 8) | (block[i-2] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i-2; + s = (s >> 8) | (block[i-3] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i-3; + } + for (; i >= 0; i--) { + s = (s >> 8) | (block[i] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i; + } + + /*-- + Now ftab contains the first loc of every small bucket. + Calculate the running order, from smallest to largest + big bucket. + --*/ + for (i = 0; i <= 255; i++) { + bigDone [i] = False; + runningOrder[i] = i; + } + + { + Int32 vv; + Int32 h = 1; + do h = 3 * h + 1; while (h <= 256); + do { + h = h / 3; + for (i = h; i <= 255; i++) { + vv = runningOrder[i]; + j = i; + while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) { + runningOrder[j] = runningOrder[j-h]; + j = j - h; + if (j <= (h - 1)) goto zero; + } + zero: + runningOrder[j] = vv; + } + } while (h != 1); + } + + /*-- + The main sorting loop. + --*/ + + numQSorted = 0; + + for (i = 0; i <= 255; i++) { + + /*-- + Process big buckets, starting with the least full. + Basically this is a 3-step process in which we call + mainQSort3 to sort the small buckets [ss, j], but + also make a big effort to avoid the calls if we can. + --*/ + ss = runningOrder[i]; + + /*-- + Step 1: + Complete the big bucket [ss] by quicksorting + any unsorted small buckets [ss, j], for j != ss. + Hopefully previous pointer-scanning phases have already + completed many of the small buckets [ss, j], so + we don't have to sort them at all. + --*/ + for (j = 0; j <= 255; j++) { + if (j != ss) { + sb = (ss << 8) + j; + if ( ! (ftab[sb] & SETMASK) ) { + Int32 lo = ftab[sb] & CLEARMASK; + Int32 hi = (ftab[sb+1] & CLEARMASK) - 1; + if (hi > lo) { + if (verb >= 4) + VPrintf4 ( " qsort [0x%x, 0x%x] " + "done %d this %d\n", + ss, j, numQSorted, hi - lo + 1 ); + mainQSort3 ( + ptr, block, quadrant, nblock, + lo, hi, BZ_N_RADIX, budget + ); + numQSorted += (hi - lo + 1); + if (*budget < 0) return; + } + } + ftab[sb] |= SETMASK; + } + } + + AssertH ( !bigDone[ss], 1006 ); + + /*-- + Step 2: + Now scan this big bucket [ss] so as to synthesise the + sorted order for small buckets [t, ss] for all t, + including, magically, the bucket [ss,ss] too. + This will avoid doing Real Work in subsequent Step 1's. + --*/ + { + for (j = 0; j <= 255; j++) { + copyStart[j] = ftab[(j << 8) + ss] & CLEARMASK; + copyEnd [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1; + } + for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) { + k = ptr[j]-1; if (k < 0) k += nblock; + c1 = block[k]; + if (!bigDone[c1]) + ptr[ copyStart[c1]++ ] = k; + } + for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) { + k = ptr[j]-1; if (k < 0) k += nblock; + c1 = block[k]; + if (!bigDone[c1]) + ptr[ copyEnd[c1]-- ] = k; + } + } + + AssertH ( (copyStart[ss]-1 == copyEnd[ss]) + || + /* Extremely rare case missing in bzip2-1.0.0 and 1.0.1. + Necessity for this case is demonstrated by compressing + a sequence of approximately 48.5 million of character + 251; 1.0.0/1.0.1 will then die here. */ + (copyStart[ss] == 0 && copyEnd[ss] == nblock-1), + 1007 ) + + for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK; + + /*-- + Step 3: + The [ss] big bucket is now done. Record this fact, + and update the quadrant descriptors. Remember to + update quadrants in the overshoot area too, if + necessary. The "if (i < 255)" test merely skips + this updating for the last bucket processed, since + updating for the last bucket is pointless. + + The quadrant array provides a way to incrementally + cache sort orderings, as they appear, so as to + make subsequent comparisons in fullGtU() complete + faster. For repetitive blocks this makes a big + difference (but not big enough to be able to avoid + the fallback sorting mechanism, exponential radix sort). + + The precise meaning is: at all times: + + for 0 <= i < nblock and 0 <= j <= nblock + + if block[i] != block[j], + + then the relative values of quadrant[i] and + quadrant[j] are meaningless. + + else { + if quadrant[i] < quadrant[j] + then the string starting at i lexicographically + precedes the string starting at j + + else if quadrant[i] > quadrant[j] + then the string starting at j lexicographically + precedes the string starting at i + + else + the relative ordering of the strings starting + at i and j has not yet been determined. + } + --*/ + bigDone[ss] = True; + + if (i < 255) { + Int32 bbStart = ftab[ss << 8] & CLEARMASK; + Int32 bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart; + Int32 shifts = 0; + + while ((bbSize >> shifts) > 65534) shifts++; + + for (j = bbSize-1; j >= 0; j--) { + Int32 a2update = ptr[bbStart + j]; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 10:41:51 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DDD84950 for ; Mon, 17 Jun 2013 10:41:51 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id C08051A81 for ; Mon, 17 Jun 2013 10:41:51 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HAfpgw091322 for ; Mon, 17 Jun 2013 10:41:51 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HAfpFl091318 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 10:41:51 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 10:41:51 GMT Message-Id: <201306171041.r5HAfpFl091318@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253070 - in soc2013/dpl: bzip2 mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 10:41:51 -0000 Author: dpl Date: Mon Jun 17 10:41:51 2013 New Revision: 253070 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253070 Log: Added Makefiles for bzip2 in a different directory. Added cap_enter() to bzip.c Added: soc2013/dpl/mk/ soc2013/dpl/mk/Makefile.bzip2 soc2013/dpl/mk/Makefile.bzip2recover Modified: soc2013/dpl/bzip2/bzip2.c Modified: soc2013/dpl/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/bzip2/bzip2.c Mon Jun 17 09:49:07 2013 (r253069) +++ soc2013/dpl/bzip2/bzip2.c Mon Jun 17 10:41:51 2013 (r253070) @@ -88,6 +88,15 @@ # define SET_BINARY_MODE(fd) /**/ +/* Capsicum Support */ +# ifdef __FreeBSD__ +# include +# if __FreeBSD_version >= 900041 +# define CAPSICUM +# include +# endif +# endif + # ifdef __GNUC__ # define NORETURN __attribute__ ((noreturn)) # else @@ -1812,6 +1821,11 @@ # endif # endif + /* Enter in Capability mode */ +# if CAPSICUM + cap_enter(); +# endif + copyFileName ( inName, (Char*)"(none)" ); copyFileName ( outName, (Char*)"(none)" ); Added: soc2013/dpl/mk/Makefile.bzip2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/mk/Makefile.bzip2 Mon Jun 17 10:41:51 2013 (r253070) @@ -0,0 +1,51 @@ +# $FreeBSD: soc2013/dpl/head/usr.bin/bzip2/Makefile 201429 2010-01-02 10:27:05Z ed $ + +BZ2DIR= ${.CURDIR}/../bzip2 +.PATH: ${BZ2DIR} + +PROG= bzip2 +CFLAGS+= -D_FILE_OFFSET_BITS=64 + +WARNS?= 3 + +DPADD= ${LIBBZ2} +LDADD= -lbz2 + +LINKS= ${BINDIR}/bzip2 ${BINDIR}/bunzip2 +LINKS+= ${BINDIR}/bzip2 ${BINDIR}/bzcat +MLINKS= bzip2.1 bunzip2.1 bzip2.1 bzcat.1 + +REFFILES= sample1.ref sample2.ref sample3.ref +DREFFILES= sample1.bz2 sample2.bz2 sample3.bz2 +TESTFILES= ${REFFILES} ${DREFFILES} + +CLEANFILES+= ${TESTFILES} \ + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst + +.for f in ${REFFILES} +${f}: ${f}.gz.uu + uudecode -p ${BZ2DIR}/${f}.gz.uu | gunzip > ${f} +.endfor +.for f in ${DREFFILES} +${f}: ${f}.uu + uudecode ${BZ2DIR}/${f}.uu +.endfor + +test: bzip2 ${TESTFILES} + @cat ${BZ2DIR}/words1 + ./bzip2 -1 < sample1.ref > sample1.rb2 + ./bzip2 -2 < sample2.ref > sample2.rb2 + ./bzip2 -3 < sample3.ref > sample3.rb2 + ./bzip2 -d < sample1.bz2 > sample1.tst + ./bzip2 -d < sample2.bz2 > sample2.tst + ./bzip2 -ds < sample3.bz2 > sample3.tst + cmp sample1.bz2 sample1.rb2 + cmp sample2.bz2 sample2.rb2 + cmp sample3.bz2 sample3.rb2 + cmp sample1.tst sample1.ref + cmp sample2.tst sample2.ref + cmp sample3.tst sample3.ref + @cat ${BZ2DIR}/words3 + +.include Added: soc2013/dpl/mk/Makefile.bzip2recover ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/mk/Makefile.bzip2recover Mon Jun 17 10:41:51 2013 (r253070) @@ -0,0 +1,11 @@ +# $FreeBSD: soc2013/dpl/head/usr.bin/bzip2recover/Makefile 250858 2013-04-19 19:45:00Z ed $ + +BZ2DIR= ${.CURDIR}/../bzip2 +.PATH: ${BZ2DIR} + +PROG= bzip2recover +NO_MAN= + +NO_WMISSING_VARIABLE_DECLARATIONS= + +.include From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 10:43:57 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 54D20B67 for ; Mon, 17 Jun 2013 10:43:57 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 4735E1AA9 for ; Mon, 17 Jun 2013 10:43:57 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HAhvXO091824 for ; Mon, 17 Jun 2013 10:43:57 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HAhvuv091822 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 10:43:57 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 10:43:57 GMT Message-Id: <201306171043.r5HAhvuv091822@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253071 - soc2013/dpl/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 10:43:57 -0000 Author: dpl Date: Mon Jun 17 10:43:57 2013 New Revision: 253071 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253071 Log: Submitted by:dpl Modified: soc2013/dpl/bzip2/bzip2.c Modified: soc2013/dpl/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/bzip2/bzip2.c Mon Jun 17 10:41:51 2013 (r253070) +++ soc2013/dpl/bzip2/bzip2.c Mon Jun 17 10:43:57 2013 (r253071) @@ -93,7 +93,7 @@ # include # if __FreeBSD_version >= 900041 # define CAPSICUM -# include +# include # endif # endif @@ -1822,7 +1822,7 @@ # endif /* Enter in Capability mode */ -# if CAPSICUM +# ifdef CAPSICUM cap_enter(); # endif From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 11:15:49 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BFC0ADF0 for ; Mon, 17 Jun 2013 11:15:49 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id AE5F71E0D for ; Mon, 17 Jun 2013 11:15:49 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HBFnF1006315 for ; Mon, 17 Jun 2013 11:15:49 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HBFn1r006312 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 11:15:49 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 11:15:49 GMT Message-Id: <201306171115.r5HBFn1r006312@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253077 - in soc2013/dpl: bzip2 mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 11:15:49 -0000 Author: dpl Date: Mon Jun 17 11:15:49 2013 New Revision: 253077 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253077 Log: Submitted by:dpl Added: soc2013/dpl/mk/ktracemaketest Modified: soc2013/dpl/bzip2/bzip2.c Modified: soc2013/dpl/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/bzip2/bzip2.c Mon Jun 17 10:28:55 2013 (r253076) +++ soc2013/dpl/bzip2/bzip2.c Mon Jun 17 11:15:49 2013 (r253077) @@ -1821,9 +1821,12 @@ # endif # endif - /* Enter in Capability mode */ # ifdef CAPSICUM - cap_enter(); + if (cap_enter() < 0) { + fprintf ( stderr, + "%s: Couldn't enter capability mode.\n", progName ); + exit(1); + } # endif copyFileName ( inName, (Char*)"(none)" ); Added: soc2013/dpl/mk/ktracemaketest ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/dpl/mk/ktracemaketest Mon Jun 17 11:15:49 2013 (r253077) @@ -0,0 +1,828 @@ + 9677 ktrace RET ktrace 0 + 9677 ktrace CALL execve(0xbfbfd6a0,0xbfbfdbc0,0xbfbfdbd4) + 9677 ktrace NAMI "/sbin/make" + 9677 ktrace RET execve -1 errno 2 No such file or directory + 9677 ktrace CALL execve(0xbfbfd6a0,0xbfbfdbc0,0xbfbfdbd4) + 9677 ktrace NAMI "/bin/make" + 9677 ktrace RET execve -1 errno 2 No such file or directory + 9677 ktrace CALL execve(0xbfbfd6a0,0xbfbfdbc0,0xbfbfdbd4) + 9677 ktrace NAMI "/usr/sbin/make" + 9677 ktrace RET execve -1 errno 2 No such file or directory + 9677 ktrace CALL execve(0xbfbfd6a0,0xbfbfdbc0,0xbfbfdbd4) + 9677 ktrace NAMI "/usr/bin/make" + 9677 make RET execve 0 + 9677 make CALL readlink(0x80c8936,0xbfbfd737,0x400) + 9677 make NAMI "/etc/malloc.conf" + 9677 make RET readlink -1 errno 2 No such file or directory + 9677 make CALL issetugid + 9677 make RET issetugid 0 + 9677 make CALL mmap(0,0x400000,0x3,0x1002,0xffffffff,0,0) + 9677 make RET mmap 671940608/0x280d0000 + 9677 make CALL munmap(0x280d0000,0x400000) + 9677 make RET munmap 0 + 9677 make CALL mmap(0,0x7ff000,0x3,0x1002,0xffffffff,0,0) + 9677 make RET mmap 671940608/0x280d0000 + 9677 make CALL munmap(0x280d0000,0x330000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x28800000,0xcf000) + 9677 make RET munmap 0 + 9677 make CALL mmap(0,0x400000,0x3,0x1002,0xffffffff,0,0) + 9677 make RET mmap 679477248/0x28800000 + 9677 make CALL sysarch(0xa,0xbfbfdb64) + 9677 make RET sysarch 0 + 9677 make CALL sigaction(SIG29,0xbfbfcc80,0xbfbfcc68) + 9677 make RET sigaction 0 + 9677 make CALL gettimeofday(0xbfbfd1d8,0) + 9677 make RET gettimeofday 0 + 9677 make CALL getrlimit(RLIMIT_NOFILE,0xbfbfccc8) + 9677 make RET getrlimit 0 + 9677 make CALL __sysctl(0xbfbfcc84,0x2,0xbfbfccd8,0xbfbfcc80,0,0) + 9677 make SCTL "kern.ostype" + 9677 make RET __sysctl 0 + 9677 make CALL __sysctl(0xbfbfcc84,0x2,0xbfbfcdd8,0xbfbfcc80,0,0) + 9677 make SCTL "kern.hostname" + 9677 make RET __sysctl 0 + 9677 make CALL __sysctl(0xbfbfcc84,0x2,0xbfbfced8,0xbfbfcc80,0,0) + 9677 make SCTL "kern.osrelease" + 9677 make RET __sysctl 0 + 9677 make CALL __sysctl(0xbfbfcc84,0x2,0xbfbfcfd8,0xbfbfcc80,0,0) + 9677 make SCTL "kern.version" + 9677 make RET __sysctl 0 + 9677 make CALL __sysctl(0xbfbfcc84,0x2,0xbfbfd0d8,0xbfbfcc80,0,0) + 9677 make SCTL "hw.machine" + 9677 make RET __sysctl 0 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL getppid + 9677 make RET getppid 4521/0x11a9 + 9677 make CALL __getcwd(0x80dcdb4,0x400) + 9677 make NAMI "/usr/home/athos/gsoc/mk" + 9677 make RET __getcwd 0 + 9677 make CALL stat(0x80dcdb4,0xbfbfd1e8) + 9677 make NAMI "/usr/home/athos/gsoc/mk" + 9677 make STRU struct stat {dev=100, ino=20064384, mode=drwxr-xr-x , nlink=2, uid=1001, gid=1001, rdev=40151213, atime=1371467042, stime=1371467045, ctime=1371467045, birthtime=1371465442, size=512, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL open(0x80dcdb4,0x120004,0xbfbfd2af) + 9677 make NAMI "/usr/home/athos/gsoc/mk" + 9677 make RET open 3 + 9677 make CALL fstatfs(0x3,0xbfbfca58) + 9677 make RET fstatfs 0 + 9677 make CALL getdirentries(0x3,0x2881f000,0x1000,0x2880a174) + 9677 make RET getdirentries 512/0x200 + 9677 make CALL getdirentries(0x3,0x2881f000,0x1000,0x2880a174) + 9677 make RET getdirentries 0 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL stat(0x80dcdb4,0xbfbfc818) + 9677 make NAMI "/usr/home/athos/gsoc/mk" + 9677 make STRU struct stat {dev=100, ino=20064384, mode=drwxr-xr-x , nlink=2, uid=1001, gid=1001, rdev=40151213, atime=1371467045, stime=1371467045, ctime=1371467045, birthtime=1371465442, size=512, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL chdir(0x80dcdb4) + 9677 make NAMI "/usr/home/athos/gsoc/mk" + 9677 make RET chdir 0 + 9677 make CALL open(0x80c3d6b,0x120004,0) + 9677 make NAMI "." + 9677 make RET open 3 + 9677 make CALL fstatfs(0x3,0xbfbfc5c0) + 9677 make RET fstatfs 0 + 9677 make CALL getdirentries(0x3,0x2881f000,0x1000,0x2880a174) + 9677 make RET getdirentries 512/0x200 + 9677 make CALL getdirentries(0x3,0x2881f000,0x1000,0x2880a174) + 9677 make RET getdirentries 0 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL stat(0xbfbfc87f,0xbfbfc818) + 9677 make NAMI "/usr/home/athos/gsoc/mk/obj.i386" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0xbfbfc87f,0xbfbfc818) + 9677 make NAMI "/usr/home/athos/gsoc/mk/obj" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0xbfbfd730,0xbfbfc818) + 9677 make NAMI "/usr/obj/usr/home/athos/gsoc/mk" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL clock_gettime(0xd,0xbfbfcc90) + 9677 make RET clock_gettime 0 + 9677 make CALL stat(0xbfbfc47e,0xbfbfc418) + 9677 make NAMI "/usr/home/athos/gsoc/mk/share/mk" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0xbfbfc47e,0xbfbfc418) + 9677 make NAMI "/usr/home/athos/gsoc/share/mk" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0xbfbfc47e,0xbfbfc418) + 9677 make NAMI "/usr/home/athos/share/mk" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0xbfbfc47e,0xbfbfc418) + 9677 make NAMI "/usr/home/share/mk" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0xbfbfc47e,0xbfbfc418) + 9677 make NAMI "/usr/share/mk" + 9677 make STRU struct stat {dev=100, ino=13483038, mode=drwxr-xr-x , nlink=2, uid=0, gid=0, rdev=26937502, atime=1371466927, stime=1370735806, ctime=1371045320, birthtime=1370735806, size=1024, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL open(0xbfbfd32f,0x120004,0x80d0150) + 9677 make NAMI "/usr/share/mk" + 9677 make RET open 3 + 9677 make CALL fstatfs(0x3,0xbfbfca70) + 9677 make RET fstatfs 0 + 9677 make CALL getdirentries(0x3,0x28830000,0x1000,0x2880a204) + 9677 make RET getdirentries 1024/0x400 + 9677 make CALL getdirentries(0x3,0x28830000,0x1000,0x2880a204) + 9677 make RET getdirentries 0 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x2881f500,0,0x2881f06c) + 9677 make NAMI "/usr/share/mk/sys.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb50) + 9677 make STRU struct stat {dev=100, ino=13483054, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943904, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=7263, blksize=32768, blocks=16, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaec,0x2,0xbfbfcae8,0xbfbfcaf4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x2000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671940608/0x280d0000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL stat(0x2883c640,0xbfbfca60) + 9677 make NAMI "/etc/make.conf" + 9677 make STRU struct stat {dev=92, ino=66154, mode=-rw-r--r-- , nlink=1, uid=0, gid=0, rdev=140782, atime=1371466927, stime=1371040371, ctime=1371040371, birthtime=1371040371, size=60, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL open(0x2883c650,0,0xe) + 9677 make NAMI "/etc/make.conf" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb20) + 9677 make STRU struct stat {dev=92, ino=66154, mode=-rw-r--r-- , nlink=1, uid=0, gid=0, rdev=140782, atime=1371466927, stime=1371040371, ctime=1371040371, birthtime=1371040371, size=60, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcabc,0x2,0xbfbfcab8,0xbfbfcac4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671948800/0x280d2000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d2000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x28808340,0,0x280d1c49) + 9677 make NAMI "/usr/share/mk/bsd.cpu.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb20) + 9677 make STRU struct stat {dev=100, ino=13483040, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943880, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=8502, blksize=32768, blocks=24, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcabc,0x2,0xbfbfcab8,0xbfbfcac4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x3000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671948800/0x280d2000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d2000,0x3000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d0000,0x2000) + 9677 make RET munmap 0 + 9677 make CALL open(0xbfbfdd20,0,0xbfbfcc5c) + 9677 make NAMI "Makefile.bzip2" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb40) + 9677 make STRU struct stat {dev=100, ino=20064389, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151275, atime=1371466927, stime=1371465557, ctime=1371465557, birthtime=1371465557, size=1270, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcadc,0x2,0xbfbfcad8,0xbfbfcae4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671940608/0x280d0000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x2880a827,0x120004,0x28804380) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2" + 9677 make RET open 3 + 9677 make CALL fstatfs(0x3,0xbfbfc938) + 9677 make RET fstatfs 0 + 9677 make CALL getdirentries(0x3,0x28840000,0x1000,0x2880a894) + 9677 make RET getdirentries 1024/0x400 + 9677 make CALL getdirentries(0x3,0x28840000,0x1000,0x2880a894) + 9677 make RET getdirentries 0 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x28840da0,0,0x280d04df) + 9677 make NAMI "/usr/share/mk/bsd.prog.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483050, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943897, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=6202, blksize=32768, blocks=16, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x2000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671944704/0x280d1000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x28840de0,0,0x280d107c) + 9677 make NAMI "/usr/share/mk/bsd.init.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483048, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943895, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=438, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL stat(0x28841300,0xbfbfca50) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../Makefile.inc" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL open(0x2883fe60,0,0x280d3171) + 9677 make NAMI "/usr/share/mk/bsd.own.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483064, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943920, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=12668, blksize=32768, blocks=32, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x4000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671956992/0x280d4000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL stat(0x2883cb20,0xbfbfca50) + 9677 make NAMI "/etc/src.conf" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL madvise(0x28876000,0x3000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28881000,0x2000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x2888a000,0x1000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28842000,0x3000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28850000,0x5000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28855000,0x2000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28877000,0x8000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28850000,0x1000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28853000,0xb000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL open(0x28844800,0,0x280d6dd5) + 9677 make NAMI "/usr/share/mk/bsd.compiler.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483062, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943916, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=638, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671973376/0x280d8000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL pipe + 9677 make RET pipe 3 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9678/0x25ce + 9677 make CALL close(0x4) + 9677 make RET close 0 + 9677 make CALL read(0x3,0xbfbfc770,0x400) + 9677 make GIO fd 3 read 103 bytes + "FreeBSD clang version 3.3 (trunk 178860) 20130405 + Target: i386-unknown-freebsd10.0 + Thread model: posix + " + 9677 make RET read 103/0x67 + 9677 make CALL read(0x3,0xbfbfc770,0x400) + 9677 make GIO fd 3 read 0 bytes + "" + 9677 make RET read 0 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL wait4(0x25ce,0xbfbfc754,0<>0,0) + 9677 make RET wait4 9678/0x25ce + 9677 make CALL munmap(0x280d8000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d4000,0x4000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d3000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x28844d80,0,0x280d1dfa) + 9677 make NAMI "/usr/share/mk/bsd.libnames.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483063, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943917, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=6708, blksize=32768, blocks=16, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x2000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x2000) + 9677 make RET munmap 0 + 9677 make CALL open(0x2885df60,0,0x280d25ff) + 9677 make NAMI "/usr/share/mk/bsd.nls.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483043, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943885, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=1716, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x2885df80,0,0x280d2616) + 9677 make NAMI "/usr/share/mk/bsd.files.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483056, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943906, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=1842, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x2885e220,0,0x280d262e) + 9677 make NAMI "/usr/share/mk/bsd.incs.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483059, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943911, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=2242, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x2885e280,0,0x280d2645) + 9677 make NAMI "/usr/share/mk/bsd.links.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483046, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943890, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=682, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x2885ebe0,0,0x280d274f) + 9677 make NAMI "/usr/share/mk/bsd.man.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483058, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943912, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=6544, blksize=32768, blocks=16, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x2000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x2000) + 9677 make RET munmap 0 + 9677 make CALL open(0x28849960,0,0x280d276d) + 9677 make NAMI "/usr/share/mk/bsd.dep.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483067, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943925, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=4551, blksize=32768, blocks=16, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x2000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d3000,0x2000) + 9677 make RET munmap 0 + 9677 make CALL open(0x28851200,0,0x280d27d9) + 9677 make NAMI "/usr/share/mk/bsd.obj.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483071, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943931, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=3654, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x28849980,0,0x280d34fd) + 9677 make NAMI "/usr/share/mk/bsd.own.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483064, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943920, atime=1371467045, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=12668, blksize=32768, blocks=32, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x4000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671956992/0x280d4000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d4000,0x4000) + 9677 make RET munmap 0 + 9677 make CALL stat(0x28841d40,0xbfbfca50) + 9677 make NAMI "/usr/obj/usr/home/athos/gsoc/mk/" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL open(0x288514a0,0,0x280d3e09) + 9677 make NAMI "/usr/share/mk/bsd.subdir.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483068, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943927, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=2757, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671956992/0x280d4000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x28855120,0,0x280d4431) + 9677 make NAMI "/usr/share/mk/bsd.init.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483048, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943895, atime=1371467045, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=438, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671961088/0x280d5000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d5000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL madvise(0x28870000,0x2000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x2888b000,0x5000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28852000,0x3000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28862000,0x4000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL madvise(0x28882000,0x2000,MADV_FREE) + 9677 make RET madvise 0 + 9677 make CALL munmap(0x280d4000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d3000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x28851220,0,0x280d27f0) + 9677 make NAMI "/usr/share/mk/bsd.sys.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483045, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943888, atime=1371466927, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=4971, blksize=32768, blocks=16, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x2000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671952896/0x280d3000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL open(0x288553c0,0,0x280d316b) + 9677 make NAMI "/usr/share/mk/bsd.compiler.mk" + 9677 make RET open 3 + 9677 make CALL fstat(0x3,0xbfbfcb10) + 9677 make STRU struct stat {dev=100, ino=13483062, mode=-r--r--r-- , nlink=1, uid=0, gid=0, rdev=26943916, atime=1371467045, stime=1370735806, ctime=1371045302, birthtime=1370735806, size=638, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL __sysctl(0xbfbfcaac,0x2,0xbfbfcaa8,0xbfbfcab4,0,0) + 9677 make SCTL "p1003_1b.pagesize" + 9677 make RET __sysctl 0 + 9677 make CALL mmap(0,0x1000,0x3,0x2,0x3,0,0) + 9677 make RET mmap 671961088/0x280d5000 + 9677 make CALL close(0x3) + 9677 make RET close 0 + 9677 make CALL munmap(0x280d5000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d3000,0x2000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d1000,0x2000) + 9677 make RET munmap 0 + 9677 make CALL munmap(0x280d0000,0x1000) + 9677 make RET munmap 0 + 9677 make CALL open(0x288076a8,0,0) + 9677 make NAMI ".depend" + 9677 make RET open -1 errno 2 No such file or directory + 9677 make CALL sigaction(SIGINT,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGINT,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGTERM,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGTERM,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGHUP,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGHUP,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGQUIT,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL sigaction(SIGQUIT,0xbfbfcc60,0xbfbfcc48) + 9677 make RET sigaction 0 + 9677 make CALL stat(0x288076c8,0xbfbfcbe0) + 9677 make NAMI "test" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0x288076c8,0xbfbfcbe0) + 9677 make NAMI "bzip2" + 9677 make STRU struct stat {dev=100, ino=20064413, mode=-rwxr-xr-x , nlink=1, uid=1001, gid=1001, rdev=40151456, atime=1371466928, stime=1371466927, ctime=1371466927, birthtime=1371466927, size=35782, blksize=32768, blocks=72, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660b0,0xbfbfcbe0) + 9677 make NAMI "sample1.ref" + 9677 make STRU struct stat {dev=100, ino=20064394, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151320, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=98696, blksize=32768, blocks=200, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660c0,0xbfbfcbe0) + 9677 make NAMI "sample2.ref" + 9677 make STRU struct stat {dev=100, ino=20064395, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151344, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=212340, blksize=32768, blocks=416, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660d0,0xbfbfcbe0) + 9677 make NAMI "sample3.ref" + 9677 make STRU struct stat {dev=100, ino=20064396, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151392, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=120244, blksize=32768, blocks=240, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660e0,0xbfbfcbe0) + 9677 make NAMI "sample1.bz2" + 9677 make STRU struct stat {dev=100, ino=20064397, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151416, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=32348, blksize=32768, blocks=64, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660f0,0xbfbfcbe0) + 9677 make NAMI "sample2.bz2" + 9677 make STRU struct stat {dev=100, ino=20064398, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151424, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=73732, blksize=32768, blocks=152, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28866100,0xbfbfcbe0) + 9677 make NAMI "sample3.bz2" + 9677 make STRU struct stat {dev=100, ino=20064399, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151274, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=235, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288076f0,0xbfbfcbe0) + 9677 make NAMI "bzip2.o" + 9677 make STRU struct stat {dev=100, ino=20064388, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151448, atime=1371466927, stime=1371466927, ctime=1371466929, birthtime=1371466927, size=35840, blksize=32768, blocks=72, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28856680,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample1.ref.gz.uu" + 9677 make STRU struct stat {dev=100, ino=23597216, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203640, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=52505, blksize=32768, blocks=104, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28856680,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample2.ref.gz.uu" + 9677 make STRU struct stat {dev=100, ino=23597217, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203656, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=119729, blksize=32768, blocks=240, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28856680,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample3.ref.gz.uu" + 9677 make STRU struct stat {dev=100, ino=23597220, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203598, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=515, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x2880a1f0,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample1.bz2.uu" + 9677 make STRU struct stat {dev=100, ino=23597201, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203584, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=44598, blksize=32768, blocks=88, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x2880a1f0,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample2.bz2.uu" + 9677 make STRU struct stat {dev=100, ino=23597221, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203704, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=101618, blksize=32768, blocks=200, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x2880a1f0,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample3.bz2.uu" + 9677 make STRU struct stat {dev=100, ino=23597202, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203574, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=356, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x2880a1f0,0xbfbfcbe0) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/bzip2.c" + 9677 make STRU struct stat {dev=100, ino=23597079, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203360, atime=1371466927, stime=1371466830, ctime=1371466830, birthtime=1371466830, size=58870, blksize=32768, blocks=120, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x2880a1f0,0xbfbfca80) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/bzip2.c" + 9677 make STRU struct stat {dev=100, ino=23597079, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203360, atime=1371466927, stime=1371466830, ctime=1371466830, birthtime=1371466830, size=58870, blksize=32768, blocks=120, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288076f0,0xbfbfcae8) + 9677 make NAMI "bzip2.o" + 9677 make STRU struct stat {dev=100, ino=20064388, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151448, atime=1371466927, stime=1371466927, ctime=1371466929, birthtime=1371466927, size=35840, blksize=32768, blocks=72, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288076c8,0xbfbfcb50) + 9677 make NAMI "bzip2" + 9677 make STRU struct stat {dev=100, ino=20064413, mode=-rwxr-xr-x , nlink=1, uid=1001, gid=1001, rdev=40151456, atime=1371466928, stime=1371466927, ctime=1371466927, birthtime=1371466927, size=35782, blksize=32768, blocks=72, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28856840,0xbfbfcae8) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample1.ref.gz.uu" + 9677 make STRU struct stat {dev=100, ino=23597216, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203640, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=52505, blksize=32768, blocks=104, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660b0,0xbfbfcb50) + 9677 make NAMI "sample1.ref" + 9677 make STRU struct stat {dev=100, ino=20064394, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151320, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=98696, blksize=32768, blocks=200, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28856880,0xbfbfcae8) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample2.ref.gz.uu" + 9677 make STRU struct stat {dev=100, ino=23597217, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203656, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=119729, blksize=32768, blocks=240, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660c0,0xbfbfcb50) + 9677 make NAMI "sample2.ref" + 9677 make STRU struct stat {dev=100, ino=20064395, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151344, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=212340, blksize=32768, blocks=416, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288568c0,0xbfbfcae8) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample3.ref.gz.uu" + 9677 make STRU struct stat {dev=100, ino=23597220, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203598, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=515, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660d0,0xbfbfcb50) + 9677 make NAMI "sample3.ref" + 9677 make STRU struct stat {dev=100, ino=20064396, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151392, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=120244, blksize=32768, blocks=240, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28850a00,0xbfbfcae8) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample1.bz2.uu" + 9677 make STRU struct stat {dev=100, ino=23597201, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203584, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=44598, blksize=32768, blocks=88, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660e0,0xbfbfcb50) + 9677 make NAMI "sample1.bz2" + 9677 make STRU struct stat {dev=100, ino=20064397, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151416, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=32348, blksize=32768, blocks=64, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28850a30,0xbfbfcae8) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample2.bz2.uu" + 9677 make STRU struct stat {dev=100, ino=23597221, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203704, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=101618, blksize=32768, blocks=200, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x288660f0,0xbfbfcb50) + 9677 make NAMI "sample2.bz2" + 9677 make STRU struct stat {dev=100, ino=20064398, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151424, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=73732, blksize=32768, blocks=152, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28850a60,0xbfbfcae8) + 9677 make NAMI "/usr/home/athos/gsoc/mk/../bzip2/sample3.bz2.uu" + 9677 make STRU struct stat {dev=100, ino=23597202, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=47203574, atime=1371466319, stime=1371454718, ctime=1371454718, birthtime=1371454718, size=356, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28866100,0xbfbfcb50) + 9677 make NAMI "sample3.bz2" + 9677 make STRU struct stat {dev=100, ino=20064399, mode=-rw-r--r-- , nlink=1, uid=1001, gid=1001, rdev=40151274, atime=1371466928, stime=1371466319, ctime=1371466319, birthtime=1371466319, size=235, blksize=32768, blocks=8, flags=0x0 } + 9677 make RET stat 0 + 9677 make CALL stat(0x28807710,0xbfbfcbb8) + 9677 make NAMI "test" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9679/0x25cf + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9679/0x25cf + 9677 make CALL fstat(0x1,0xbfbfcad0) + 9677 make STRU struct stat {dev=1895890688, ino=120, mode=crw--w---- , nlink=1, uid=1001, gid=4, rdev=120, atime=1371467045, stime=1371467045, ctime=1371467045, birthtime=-1, size=0, blksize=4096, blocks=0, flags=0x0 } + 9677 make RET fstat 0 + 9677 make CALL ioctl(0x1,TIOCGETA,0xbfbfca88) + 9677 make RET ioctl 0 + 9677 make CALL write(0x1,0x28854000,0x28) + 9677 make GIO fd 1 wrote 40 bytes + "./bzip2 -1 < sample1.ref > sample1.rb2 + " + 9677 make RET write 40/0x28 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9680/0x25d0 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9680/0x25d0 + 9677 make CALL write(0x1,0x28854000,0x28) + 9677 make GIO fd 1 wrote 40 bytes + "./bzip2 -2 < sample2.ref > sample2.rb2 + " + 9677 make RET write 40/0x28 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9681/0x25d1 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9681/0x25d1 + 9677 make CALL write(0x1,0x28854000,0x28) + 9677 make GIO fd 1 wrote 40 bytes + "./bzip2 -3 < sample3.ref > sample3.rb2 + " + 9677 make RET write 40/0x28 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9682/0x25d2 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9682/0x25d2 + 9677 make CALL write(0x1,0x28854000,0x28) + 9677 make GIO fd 1 wrote 40 bytes + "./bzip2 -d < sample1.bz2 > sample1.tst + " + 9677 make RET write 40/0x28 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9683/0x25d3 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9683/0x25d3 + 9677 make CALL write(0x1,0x28854000,0x28) + 9677 make GIO fd 1 wrote 40 bytes + "./bzip2 -d < sample2.bz2 > sample2.tst + " + 9677 make RET write 40/0x28 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9684/0x25d4 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9684/0x25d4 + 9677 make CALL write(0x1,0x28854000,0x28) + 9677 make GIO fd 1 wrote 40 bytes + "./bzip2 -ds < sample3.bz2 > sample3.tst + " + 9677 make RET write 40/0x28 + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9685/0x25d5 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9685/0x25d5 + 9677 make CALL write(0x1,0x28854000,0x1c) + 9677 make GIO fd 1 wrote 28 bytes + "cmp sample1.bz2 sample1.rb2 + " + 9677 make RET write 28/0x1c + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9686/0x25d6 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9686/0x25d6 + 9677 make CALL write(0x1,0x28854000,0x1c) + 9677 make GIO fd 1 wrote 28 bytes + "cmp sample2.bz2 sample2.rb2 + " + 9677 make RET write 28/0x1c + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9687/0x25d7 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9687/0x25d7 + 9677 make CALL write(0x1,0x28854000,0x1c) + 9677 make GIO fd 1 wrote 28 bytes + "cmp sample3.bz2 sample3.rb2 + " + 9677 make RET write 28/0x1c + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9688/0x25d8 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9688/0x25d8 + 9677 make CALL write(0x1,0x28854000,0x1c) + 9677 make GIO fd 1 wrote 28 bytes + "cmp sample1.tst sample1.ref + " + 9677 make RET write 28/0x1c + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9689/0x25d9 + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9689/0x25d9 + 9677 make CALL write(0x1,0x28854000,0x1c) + 9677 make GIO fd 1 wrote 28 bytes + "cmp sample2.tst sample2.ref + " + 9677 make RET write 28/0x1c + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9690/0x25da + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9690/0x25da + 9677 make CALL write(0x1,0x28854000,0x1c) + 9677 make GIO fd 1 wrote 28 bytes + "cmp sample3.tst sample3.ref + " + 9677 make RET write 28/0x1c + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9691/0x25db + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9691/0x25db + 9677 make CALL getpid + 9677 make RET getpid 9677/0x25cd + 9677 make CALL vfork + 9677 make RET vfork 9692/0x25dc + 9677 make CALL wait4(0xffffffff,0xbfbfcbfc,0<>0,0) + 9677 make RET wait4 9692/0x25dc + 9677 make CALL stat(0x28807710,0xbfbfcbb8) + 9677 make NAMI "test" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0x28807728,0xbfbfcbb8) + 9677 make NAMI ".END" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0x28807728,0xbfbfcba8) + 9677 make NAMI ".END" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL stat(0x28807728,0xbfbfcbb8) + 9677 make NAMI ".END" + 9677 make RET stat -1 errno 2 No such file or directory + 9677 make CALL exit(0) From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 12:52:15 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CFA56473 for ; Mon, 17 Jun 2013 12:52:15 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id C06EC1375 for ; Mon, 17 Jun 2013 12:52:15 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HCqF3A008590 for ; Mon, 17 Jun 2013 12:52:15 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HCqFGm008579 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 12:52:15 GMT (envelope-from mattbw@FreeBSD.org) Date: Mon, 17 Jun 2013 12:52:15 GMT Message-Id: <201306171252.r5HCqFGm008579@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253078 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 12:52:15 -0000 Author: mattbw Date: Mon Jun 17 12:52:15 2013 New Revision: 253078 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253078 Log: Adds dummy from packagekit, this will probably become the base for the pkg backend. Added: soc2013/mattbw/dummy/ soc2013/mattbw/dummy/Makefile.am soc2013/mattbw/dummy/pk-backend-dummy.c Added: soc2013/mattbw/dummy/Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/Makefile.am Mon Jun 17 12:52:15 2013 (r253078) @@ -0,0 +1,12 @@ +AM_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"PackageKit-Dummy\" + +plugindir = $(PK_PLUGIN_DIR) +plugin_LTLIBRARIES = libpk_backend_dummy.la +libpk_backend_dummy_la_SOURCES = pk-backend-dummy.c +libpk_backend_dummy_la_LIBADD = $(PK_PLUGIN_LIBS) +libpk_backend_dummy_la_LDFLAGS = -module -avoid-version +libpk_backend_dummy_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C) + + +-include $(top_srcdir)/git.mk Added: soc2013/mattbw/dummy/pk-backend-dummy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/pk-backend-dummy.c Mon Jun 17 12:52:15 2013 (r253078) @@ -0,0 +1,1742 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2007-2010 Richard Hughes + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +typedef struct { + gboolean has_signature; + gboolean repo_enabled_devel; + gboolean repo_enabled_fedora; + gboolean repo_enabled_livna; + gboolean repo_enabled_local; + gboolean updated_gtkhtml; + gboolean updated_kernel; + gboolean updated_powertop; + gboolean use_blocked; + gboolean use_distro_upgrade; + gboolean use_eula; + gboolean use_gpg; + gboolean use_media; + gboolean use_trusted; + gchar **package_ids; + gchar **values; + PkBitfield filters; + gboolean fake_db_locked; +} PkBackendDummyPrivate; + +typedef struct { + guint progress_percentage; + GSocket *socket; + guint socket_listen_id; + GCancellable *cancellable; + gulong signal_timeout; +} PkBackendDummyJobData; + +static PkBackendDummyPrivate *priv; + +/** + * pk_backend_initialize: + */ +void +pk_backend_initialize (PkBackend *backend) +{ + /* create private area */ + priv = g_new0 (PkBackendDummyPrivate, 1); + priv->repo_enabled_fedora = TRUE; + priv->repo_enabled_devel = TRUE; + priv->repo_enabled_livna = TRUE; + priv->use_trusted = TRUE; +} + +/** + * pk_backend_destroy: + */ +void +pk_backend_destroy (PkBackend *backend) +{ + g_free (priv); +} + +/** + * pk_backend_get_groups: + */ +PkBitfield +pk_backend_get_groups (PkBackend *backend) +{ + return pk_bitfield_from_enums (PK_GROUP_ENUM_ACCESSIBILITY, + PK_GROUP_ENUM_GAMES, + PK_GROUP_ENUM_SYSTEM, + -1); +} + +/** + * pk_backend_get_filters: + */ +PkBitfield +pk_backend_get_filters (PkBackend *backend) +{ + return pk_bitfield_from_enums (PK_FILTER_ENUM_GUI, + PK_FILTER_ENUM_INSTALLED, + PK_FILTER_ENUM_DEVELOPMENT, + -1); +} + +/** + * pk_backend_get_mime_types: + */ +gchar ** +pk_backend_get_mime_types (PkBackend *backend) +{ + const gchar *mime_types[] = { + "application/x-rpm", + "application/x-deb", + NULL }; + return g_strdupv ((gchar **) mime_types); +} + +/** + * pk_backend_cancel_timeout: + */ +static gboolean +pk_backend_cancel_timeout (gpointer data) +{ + PkBackendJob *job = (PkBackendJob *) data; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + /* we can now cancel again */ + job_data->signal_timeout = 0; + + /* now mark as finished */ + pk_backend_job_error_code (job, PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished (job); + return FALSE; +} + +/** + * pk_backend_cancel: + */ +void +pk_backend_cancel (PkBackend *backend, PkBackendJob *job) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + /* try to cancel the transaction */ + g_debug ("cancelling transaction"); + g_cancellable_cancel (job_data->cancellable); + if (job_data->signal_timeout != 0) { + g_source_remove (job_data->signal_timeout); + + /* emulate that it takes us a few ms to cancel */ + g_timeout_add (1500, pk_backend_cancel_timeout, job); + } +} + +/** + * pk_backend_get_depends: + */ +void +pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +{ + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + + if (g_strcmp0 (package_ids[0], "scribus;1.3.4-1.fc8;i386;fedora") == 0) { + pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, + "scribus-clipart;1.3.4-1.fc8;i386;fedora", "Clipart for scribus"); + } else { + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLED, + "glib2;2.14.0;i386;fedora", "The GLib library"); + pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, + "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + } + pk_backend_job_finished (job); +} + +/** + * pk_backend_get_details: + */ +void +pk_backend_get_details (PkBackend *backend, PkBackendJob *job, gchar **package_ids) +{ + guint i; + guint len; + const gchar *package_id; + + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage (job, 0); + + /* each one has a different detail for testing */ + len = g_strv_length (package_ids); + for (i=0; iuse_distro_upgrade) + goto out; + pk_backend_job_distro_upgrade (job, PK_DISTRO_UPGRADE_ENUM_STABLE, + "fedora-9", "Fedora 9"); + pk_backend_job_distro_upgrade (job, PK_DISTRO_UPGRADE_ENUM_UNSTABLE, + "fedora-10-rc1", "Fedora 10 RC1"); +out: + pk_backend_job_finished (job); +} + +/** + * pk_backend_get_files: + */ +void +pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids) +{ + guint i; + guint len; + const gchar *package_id; + + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + + len = g_strv_length (package_ids); + for (i=0; i 1.6.0-10\n" + "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n" + " says to be an object manager.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-11\n" + "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n" + " ACPI code.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-12\n" + "- Requires: pixman >= 0.14.0\n" + "\n" + "**Fri Mar 6 2009** Adam Jackson 1.6.0-8\n" + "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n"; + + /* each one has a different detail for testing */ + pk_backend_job_set_percentage (job, 0); + len = g_strv_length (priv->package_ids); + for (i=0; ipackage_ids[i]; + if (g_strcmp0 (package_id, "powertop;1.8-1.fc8;i386;fedora") == 0) { + to_array1[0] = "powertop;1.7-1.fc8;i386;installed"; + to_array2[0] = "http://www.distro-update.org/page?moo"; + to_array3[0] = "http://bgzilla.fd.org/result.php?#12344"; + pk_backend_job_update_detail (job, package_id, + (gchar**) to_array1, + NULL, + (gchar**) to_array2, + (gchar**) to_array3, + NULL, + PK_RESTART_ENUM_NONE, + "Update to newest upstream source", + changelog, PK_UPDATE_STATE_ENUM_STABLE, + "2009-11-17T09:19:00", "2009-11-19T09:19:00"); + } else if (g_strcmp0 (package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) { + to_array1[0] = "kernel;2.6.22-0.104.rc3.git6.fc8;i386;installed"; + to_array1[1] = "kernel;2.6.22-0.105.rc3.git7.fc8;i386;installed"; + to_array2[0] = "http://www.distro-update.org/page?moo"; + to_array3[0] = "http://bgzilla.fd.org/result.php?#12344"; + to_array3[1] = "http://bgzilla.gnome.org/result.php?#9876"; + to_array4[0] = "http://nvd.nist.gov/nvd.cfm?cvename=CVE-2007-3381;CVE-2007-3381"; + pk_backend_job_update_detail (job, package_id, + (gchar**) to_array1, + NULL, + (gchar**) to_array2, + (gchar**) to_array3, + (gchar**) to_array4, + PK_RESTART_ENUM_SYSTEM, + "Update to newest upstream version.\n" + "* This should fix many driver bugs when using nouveau\n" + " * This also introduces the new `frobnicator` driver for *vibrating* rabbit hardware.", + changelog, + PK_UPDATE_STATE_ENUM_UNSTABLE, + "2008-06-28T09:19:00", + NULL); + } else if (g_strcmp0 (package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) { + to_array1[0] = "gtkhtml2;2.18.1-22.fc8;i386;installed"; + to_array2[0] = "http://www.distro-update.org/page?moo"; + to_array3[0] = "http://bgzilla.gnome.org/result.php?#9876"; + pk_backend_job_update_detail (job, package_id, + (gchar**) to_array1, + NULL, + (gchar**) to_array2, + (gchar**) to_array3, + NULL, + PK_RESTART_ENUM_SESSION, + "Update to latest *whizz* **bang** version\n" + "* support this new thing\n" + "* something else\n" + "- and that new thing", + changelog, + PK_UPDATE_STATE_ENUM_UNKNOWN, + "2008-07-25T09:19:00", + NULL); + + } else if (g_strcmp0 (package_id, "vino;2.24.2.fc9;i386;fedora") == 0) { + to_array1[0] = "vino;2.24.1.fc9;i386;fedora"; + pk_backend_job_update_detail (job, package_id, + (gchar**) to_array1, + NULL, + NULL, + NULL, + NULL, + PK_RESTART_ENUM_NONE, + "Cannot get update as update conflics with vncviewer", + changelog, + PK_UPDATE_STATE_ENUM_UNKNOWN, + "2008-07-25", + NULL); + } else { + /* signal to UI */ + pk_backend_job_error_code (job, + PK_ERROR_ENUM_INTERNAL_ERROR, + "the package update detail was not found for %s", + package_id); + } + } + pk_backend_job_set_percentage (job, 100); + pk_backend_job_finished (job); + job_data->signal_timeout = 0; + return FALSE; +} + +/** + * pk_backend_get_update_detail: + */ +void +pk_backend_get_update_detail (PkBackend *backend, PkBackendJob *job, gchar **package_ids) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + priv->package_ids = package_ids; + job_data->signal_timeout = g_timeout_add (500, pk_backend_get_update_detail_timeout, job); +} + +/** + * pk_backend_get_updates_timeout: + **/ +static gboolean +pk_backend_get_updates_timeout (gpointer data) +{ + PkBackendJob *job = (PkBackendJob *) data; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + if (priv->use_blocked) { + if (!priv->updated_powertop && !priv->updated_kernel && !priv->updated_gtkhtml) { + pk_backend_job_package (job, PK_INFO_ENUM_BLOCKED, + "vino;2.24.2.fc9;i386;fedora", + "Remote desktop server for the desktop"); + } + } + if (!priv->updated_powertop) { + pk_backend_job_package (job, PK_INFO_ENUM_NORMAL, + "powertop;1.8-1.fc8;i386;fedora", + "Power consumption monitor"); + } + if (!priv->updated_kernel) { + pk_backend_job_package (job, PK_INFO_ENUM_BUGFIX, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", + "The Linux kernel (the core of the Linux operating system)"); + } + if (!priv->updated_gtkhtml) { + pk_backend_job_package (job, PK_INFO_ENUM_SECURITY, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + } + pk_backend_job_finished (job); + job_data->signal_timeout = 0; + return FALSE; +} + +/** + * pk_backend_get_updates: + */ +void +pk_backend_get_updates (PkBackend *backend, PkBackendJob *job, PkBitfield filters) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage (job, PK_BACKEND_PERCENTAGE_INVALID); + /* check network state */ + if (!pk_backend_is_online (backend)) { + pk_backend_job_error_code (job, PK_ERROR_ENUM_NO_NETWORK, "Cannot check when offline"); + pk_backend_job_finished (job); + return; + } + job_data->signal_timeout = g_timeout_add (1000, pk_backend_get_updates_timeout, job); +} + +/** + * pk_backend_install_thread: + */ +static void +pk_backend_install_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +{ + gchar **package_ids; + PkBitfield transaction_flags; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + g_variant_get (params, "(t^a&s)", + &transaction_flags, + &package_ids); + + while (TRUE) { + + /* check cancelled */ + if (g_cancellable_is_cancelled (job_data->cancellable)) { + pk_backend_job_error_code (job, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished (job); + break; + } + + if (job_data->progress_percentage == 100) { + pk_backend_job_finished (job); + break; + } + + if (job_data->progress_percentage == 30) { + pk_backend_job_set_allow_cancel (job, FALSE); + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + } + + if (job_data->progress_percentage == 50) { + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", + "Devel files for gtkhtml"); + /* this duplicate package should be ignored */ + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", NULL); + pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + } + + job_data->progress_percentage += 1; + pk_backend_job_set_percentage (job, job_data->progress_percentage); + + /* sleep 100 milliseconds */ + g_usleep (100000); + } + + /* unlock backend again */ + priv->fake_db_locked = FALSE; + pk_backend_job_set_locked (job, FALSE); +} + +/** + * pk_backend_install_packages: + */ +void +pk_backend_install_packages (PkBackend *backend, PkBackendJob *job, PkBitfield transaction_flags, gchar **package_ids) +{ + const gchar *license_agreement; + const gchar *eula_id; + gboolean has_eula; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + /* simulate */ + if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) { + pk_backend_job_set_status (job, PK_STATUS_ENUM_DEP_RESOLVE); + + pk_backend_job_package (job, PK_INFO_ENUM_REMOVING, + "powertop;1.8-1.fc8;i386;fedora", "Power consumption monitor"); + + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, + "gtk2;2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + + pk_backend_job_package (job, PK_INFO_ENUM_UPDATING, + "lib7;7.0.1-6.fc13;i386;fedora", "C Libraries"); + + pk_backend_job_package (job, PK_INFO_ENUM_REINSTALLING, + "libssl;3.5.7-2.fc13;i386;fedora", "SSL Libraries"); + + pk_backend_job_package (job, PK_INFO_ENUM_DOWNGRADING, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", "The Linux kernel (the core of the Linux operating system)"); + + pk_backend_job_package (job, PK_INFO_ENUM_UPDATING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", "An HTML widget for GTK+ 2.0"); + + pk_backend_job_finished (job); + return; + } + + if (g_strcmp0 (package_ids[0], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { + if (priv->use_gpg && !priv->has_signature) { + pk_backend_job_repo_signature_required (job, package_ids[0], "updates", + "http://example.com/gpgkey", + "Test Key (Fedora) fedora@example.com", + "BB7576AC", + "D8CC 06C2 77EC 9C53 372F C199 B1EE 1799 F24F 1B08", + "2007-10-04", PK_SIGTYPE_ENUM_GPG); + pk_backend_job_error_code (job, PK_ERROR_ENUM_GPG_FAILURE, + "GPG signed package could not be verified"); + pk_backend_job_finished (job); + return; + } + eula_id = "eula_hughsie_dot_com"; + has_eula = pk_backend_is_eula_valid (backend, eula_id); + if (priv->use_eula && !has_eula) { + license_agreement = "Narrator: In A.D. 2101, war was beginning.\n" + "Captain: What happen ?\n" + "Mechanic: Somebody set up us the bomb.\n\n" + "Operator: We get signal.\n" + "Captain: What !\n" + "Operator: Main screen turn on.\n" + "Captain: It's you !!\n" + "CATS: How are you gentlemen !!\n" + "CATS: All your base are belong to us.\n" + "CATS: You are on the way to destruction.\n\n" + "Captain: What you say !!\n" + "CATS: You have no chance to survive make your time.\n" + "CATS: Ha Ha Ha Ha ....\n\n" + "Operator: Captain!! *\n" + "Captain: Take off every 'ZIG' !!\n" + "Captain: You know what you doing.\n" + "Captain: Move 'ZIG'.\n" + "Captain: For great justice.\n"; + pk_backend_job_eula_required (job, eula_id, package_ids[0], + "CATS Inc.", license_agreement); + pk_backend_job_error_code (job, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, + "licence not installed so cannot install"); + pk_backend_job_finished (job); + return; + } + if (priv->use_media) { + priv->use_media = FALSE; + pk_backend_job_media_change_required (job, PK_MEDIA_TYPE_ENUM_DVD, "linux-disk-1of7", "Linux Disc 1 of 7"); + pk_backend_job_error_code (job, PK_ERROR_ENUM_MEDIA_CHANGE_REQUIRED, + "additional media linux-disk-1of7 required"); + pk_backend_job_finished (job); + return; + } + } + + if ((g_strcmp0 (package_ids[0], "foobar;1.1.0;i386;debian") != 0) && (g_strcmp0 (package_ids[0], "libawesome;42;i386;debian") != 0)) { + if (priv->use_trusted && pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED)) { + pk_backend_job_error_code (job, PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED, + "Can't install as untrusted"); + pk_backend_job_finished (job); + return; + } + } + + /* check if something else locked the "fake-db" */ + if (priv->fake_db_locked) { + pk_backend_job_error_code (job, PK_ERROR_ENUM_LOCK_REQUIRED, + "we require lock"); + pk_backend_job_finished (job); + return; + } + + /* we're now locked */ + priv->fake_db_locked = TRUE; + pk_backend_job_set_locked (job, TRUE); + + pk_backend_job_set_allow_cancel (job, TRUE); + job_data->progress_percentage = 0; + pk_backend_job_package (job, PK_INFO_ENUM_DOWNLOADING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + + pk_backend_job_thread_create (job, pk_backend_install_thread, NULL, NULL); +} + +/** + * pk_backend_install_signature: + */ +void +pk_backend_install_signature (PkBackend *backend, PkBackendJob *job, PkSigTypeEnum type, + const gchar *key_id, const gchar *package_id) +{ + pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + if (type == PK_SIGTYPE_ENUM_GPG && + /* egg_strequal (package_id, "vips-doc;7.12.4-2.fc8;noarch;linva") && */ + g_strcmp0 (key_id, "BB7576AC") == 0) { + g_debug ("installed signature %s for %s", key_id, package_id); + priv->has_signature = TRUE; + } else { + pk_backend_job_error_code (job, PK_ERROR_ENUM_GPG_FAILURE, + "GPG key %s not recognised for package_id %s", + key_id, package_id); + } + pk_backend_job_finished (job); +} + +/** + * pk_backend_refresh_cache_timeout: + */ +static gboolean +pk_backend_install_files_timeout (gpointer data) +{ + PkBackendJob *job = (PkBackendJob *) data; + pk_backend_job_finished (job); + return FALSE; +} + +/** + * pk_backend_install_files: + */ +void +pk_backend_install_files (PkBackend *backend, PkBackendJob *job, PkBitfield transaction_flags, gchar **full_paths) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + pk_backend_job_set_percentage (job, 101); + job_data->signal_timeout = g_timeout_add (2000, pk_backend_install_files_timeout, job); +} + +/** + * pk_backend_refresh_cache_thread: + */ +static void +pk_backend_refresh_cache_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +{ + gboolean force; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + g_variant_get (params, "(b)", + &force); + + while (TRUE) { + + /* check cancelled */ + if (g_cancellable_is_cancelled (job_data->cancellable)) { + pk_backend_job_error_code (job, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished (job); + break; + } + + if (job_data->progress_percentage == 100) { + pk_backend_job_finished (job); + break; + } + + if (job_data->progress_percentage == 80) + pk_backend_job_set_allow_cancel (job, FALSE); + job_data->progress_percentage += 10; + pk_backend_job_set_percentage (job, job_data->progress_percentage); + + /* sleep 500 milliseconds */ + g_usleep (500000); + } + + /* unlock backend again */ + priv->fake_db_locked = FALSE; + pk_backend_job_set_locked (job, FALSE); +} + +/** + * pk_backend_refresh_cache: + */ +void +pk_backend_refresh_cache (PkBackend *backend, PkBackendJob *job, gboolean force) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + job_data->progress_percentage = 0; + + /* reset */ + priv->updated_gtkhtml = FALSE; + priv->updated_kernel = FALSE; + priv->updated_powertop = FALSE; + + pk_backend_job_set_allow_cancel (job, TRUE); + pk_backend_job_set_status (job, PK_STATUS_ENUM_REFRESH_CACHE); + + /* check if some other action has lock */ + if (priv->fake_db_locked) { + pk_backend_job_error_code (job, PK_ERROR_ENUM_LOCK_REQUIRED, + "we require lock"); + pk_backend_job_finished (job); + return; + } + + /* we're now locked */ + priv->fake_db_locked = TRUE; + pk_backend_job_set_locked (job, TRUE); + + pk_backend_job_thread_create (job, pk_backend_refresh_cache_thread, NULL, NULL); +} + +/** + * pk_backend_resolve_thread: + */ +static void +pk_backend_resolve_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +{ + gchar **search; + guint i; + guint len; + PkBitfield filters; + + g_variant_get (params, "(t^a&s)", + &filters, + &search); + + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage (job, 0); + + /* each one has a different detail for testing */ + len = g_strv_length (search); + for (i=0; ifake_db_locked) { + pk_backend_job_error_code (job, PK_ERROR_ENUM_LOCK_REQUIRED, + "we require lock"); + pk_backend_job_finished (job); + return; + } + + /* we're now locked */ + priv->fake_db_locked = TRUE; + pk_backend_job_set_locked (job, TRUE); + + pk_backend_job_set_status (job, PK_STATUS_ENUM_REMOVE); + pk_backend_job_error_code (job, PK_ERROR_ENUM_NO_NETWORK, "No network connection available"); + pk_backend_job_finished (job); + + /* unlock backend again */ + priv->fake_db_locked = FALSE; + pk_backend_job_set_locked (job, FALSE); +} + +/** + * pk_backend_search_details_thread: + **/ +static void +pk_backend_search_details_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +{ + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_allow_cancel (job, TRUE); + pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips \"documentation\" package."); + pk_backend_job_finished (job); +} + +/** + * pk_backend_search_details: + */ +void +pk_backend_search_details (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **values) +{ + pk_backend_job_thread_create (job, pk_backend_search_details_thread, NULL, NULL); +} + +/** + * pk_backend_search_files: + */ +void +pk_backend_search_files (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **values) +{ + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_allow_cancel (job, TRUE); + if (!pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED)) + pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips documentation package"); + else + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLED, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips documentation package"); + pk_backend_job_finished (job); +} + +/** + * pk_backend_search_groups: + */ +void +pk_backend_search_groups (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **values) +{ + pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_allow_cancel (job, TRUE); + pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips documentation package."); + pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, + "bǣwulf-utf8;0.1;noarch;hughsie", + "The bǣwulf server test name."); + pk_backend_job_finished (job); +} + +/** + * pk_backend_search_names_thread: + **/ +static void +pk_backend_search_names_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +{ + guint i; + gchar *locale; + PkRoleEnum role; + gchar **search; + PkBitfield filters; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + + role = pk_backend_job_get_role (job); + if (role == PK_ROLE_ENUM_GET_PACKAGES) { + g_variant_get (params, "(t)", + &filters); + } else { + g_variant_get (params, "(t^a&s)", + &filters, + &search); + } + + /* delay, checking cancelled */ + for (i = 0; i < 1000; i++) { + if (g_cancellable_is_cancelled (job_data->cancellable)) { + pk_backend_job_error_code (job, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + goto out; + } + g_usleep (2000); + } + + locale = pk_backend_job_get_locale (job); + if (g_strcmp0 (locale, "en_GB.utf8") != 0) { + pk_backend_job_package (job, PK_INFO_ENUM_INSTALLED, + "evince;0.9.3-5.fc8;i386;installed", *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 13:51:02 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 157CFF25 for ; Mon, 17 Jun 2013 13:51:02 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 0608717CD for ; Mon, 17 Jun 2013 13:51:02 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HDp1EH032695 for ; Mon, 17 Jun 2013 13:51:01 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HDp1LS032690 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 13:51:01 GMT (envelope-from mattbw@FreeBSD.org) Date: Mon, 17 Jun 2013 13:51:01 GMT Message-Id: <201306171351.r5HDp1LS032690@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253080 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 13:51:02 -0000 Author: mattbw Date: Mon Jun 17 13:51:01 2013 New Revision: 253080 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253080 Log: make dummy backend build using FreeBSD style makefile. Needs testing to make sure packagekit accepts this. Deleted: soc2013/mattbw/dummy/Makefile.am Modified: soc2013/mattbw/dummy/pk-backend-dummy.c Modified: soc2013/mattbw/dummy/pk-backend-dummy.c ============================================================================== --- soc2013/mattbw/dummy/pk-backend-dummy.c Mon Jun 17 12:49:26 2013 (r253079) +++ soc2013/mattbw/dummy/pk-backend-dummy.c Mon Jun 17 13:51:01 2013 (r253080) @@ -26,8 +26,8 @@ #include #include -#include -#include +#include "plugin/pk-backend.h" +#include "plugin/pk-backend-job.h" typedef struct { gboolean has_signature; From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 15:18:34 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7A73DA9C for ; Mon, 17 Jun 2013 15:18:34 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 6C94A1D5D for ; Mon, 17 Jun 2013 15:18:34 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HFIYw8071595 for ; Mon, 17 Jun 2013 15:18:34 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HFIYGL071589 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 15:18:34 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 15:18:34 GMT Message-Id: <201306171518.r5HFIYGL071589@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253089 - soc2013/dpl/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 15:18:34 -0000 Author: dpl Date: Mon Jun 17 15:18:34 2013 New Revision: 253089 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253089 Log: I have a working copy of bzip2 in capability mode. I also have a kdump of $(ktrace make -f Makefile.bzip2 test). Modified: soc2013/dpl/bzip2/bzip2.c Modified: soc2013/dpl/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/bzip2/bzip2.c Mon Jun 17 14:59:23 2013 (r253088) +++ soc2013/dpl/bzip2/bzip2.c Mon Jun 17 15:18:34 2013 (r253089) @@ -1823,8 +1823,7 @@ # ifdef CAPSICUM if (cap_enter() < 0) { - fprintf ( stderr, - "%s: Couldn't enter capability mode.\n", progName ); + fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); exit(1); } # endif From owner-svn-soc-all@FreeBSD.ORG Mon Jun 17 17:18:32 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5CB5021A for ; Mon, 17 Jun 2013 17:18:32 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 4E32312A1 for ; Mon, 17 Jun 2013 17:18:32 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HHIWCl027255 for ; Mon, 17 Jun 2013 17:18:32 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HHIW43027248 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 17:18:32 GMT (envelope-from dpl@FreeBSD.org) Date: Mon, 17 Jun 2013 17:18:32 GMT Message-Id: <201306171718.r5HHIW43027248@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253095 - in soc2013/dpl: bzip2 head/contrib/bzip2 mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 17:18:32 -0000 Author: dpl Date: Mon Jun 17 17:18:32 2013 New Revision: 253095 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253095 Log: Work in contrib now. Deleted: soc2013/dpl/bzip2/ soc2013/dpl/mk/ Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Mon Jun 17 15:42:21 2013 (r253094) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Mon Jun 17 17:18:32 2013 (r253095) @@ -88,6 +88,15 @@ # define SET_BINARY_MODE(fd) /**/ +/* Capsicum Support */ +# ifdef __FreeBSD__ +# include +# if __FreeBSD_version >= 900041 +# define CAPSICUM +# include +# endif +# endif + # ifdef __GNUC__ # define NORETURN __attribute__ ((noreturn)) # else @@ -1812,6 +1821,13 @@ # endif # endif +# ifdef CAPSICUM + if (cap_enter() < 0) { + fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); + exit(1); + } +# endif + copyFileName ( inName, (Char*)"(none)" ); copyFileName ( outName, (Char*)"(none)" ); From owner-svn-soc-all@FreeBSD.ORG Tue Jun 18 10:22:44 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 56AC49CC for ; Tue, 18 Jun 2013 10:22:44 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 484291DE7 for ; Tue, 18 Jun 2013 10:22:44 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IAMiof091858 for ; Tue, 18 Jun 2013 10:22:44 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5IAMihi091856 for svn-soc-all@FreeBSD.org; Tue, 18 Jun 2013 10:22:44 GMT (envelope-from dpl@FreeBSD.org) Date: Tue, 18 Jun 2013 10:22:44 GMT Message-Id: <201306181022.r5IAMihi091856@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253172 - soc2013/dpl/head/usr.bin/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 10:22:44 -0000 Author: dpl Date: Tue Jun 18 10:22:44 2013 New Revision: 253172 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253172 Log: Check working with multiple files. Modified: soc2013/dpl/head/usr.bin/bzip2/Makefile Modified: soc2013/dpl/head/usr.bin/bzip2/Makefile ============================================================================== --- soc2013/dpl/head/usr.bin/bzip2/Makefile Tue Jun 18 09:54:09 2013 (r253171) +++ soc2013/dpl/head/usr.bin/bzip2/Makefile Tue Jun 18 10:22:44 2013 (r253172) @@ -21,7 +21,8 @@ CLEANFILES+= ${TESTFILES} \ sample1.rb2 sample2.rb2 sample3.rb2 \ - sample1.tst sample2.tst sample3.tst + sample1.tst sample2.tst sample3.tst \ + total total.tst samples.rb2 .for f in ${REFFILES} ${f}: ${f}.gz.uu @@ -40,6 +41,12 @@ ./bzip2 -d < sample1.bz2 > sample1.tst ./bzip2 -d < sample2.bz2 > sample2.tst ./bzip2 -ds < sample3.bz2 > sample3.tst + ./bzip2 -c sample1.ref sample2.ref sample3.ref > samples.rb2 + ./bzip2 -ds < samples.rb2 > total.tst + cat sample1.ref >> total + cat sample2.ref >> total + cat sample3.ref >> total + cmp total total.tst cmp sample1.bz2 sample1.rb2 cmp sample2.bz2 sample2.rb2 cmp sample3.bz2 sample3.rb2 From owner-svn-soc-all@FreeBSD.ORG Tue Jun 18 17:08:09 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2B90152E for ; Tue, 18 Jun 2013 17:08:09 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 0DE481863 for ; Tue, 18 Jun 2013 17:08:09 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IH88Ix031954 for ; Tue, 18 Jun 2013 17:08:08 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5IH88F3031951 for svn-soc-all@FreeBSD.org; Tue, 18 Jun 2013 17:08:08 GMT (envelope-from dpl@FreeBSD.org) Date: Tue, 18 Jun 2013 17:08:08 GMT Message-Id: <201306181708.r5IH88F3031951@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253197 - in soc2013/dpl/head: contrib/bzip2 usr.bin/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 17:08:09 -0000 Author: dpl Date: Tue Jun 18 17:08:08 2013 New Revision: 253197 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253197 Log: Now we work in capability mode, with the theoretical minimum rights. Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c soc2013/dpl/head/usr.bin/bzip2/Makefile Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Tue Jun 18 16:36:21 2013 (r253196) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Tue Jun 18 17:08:08 2013 (r253197) @@ -88,7 +88,6 @@ # define SET_BINARY_MODE(fd) /**/ -/* Capsicum Support */ # ifdef __FreeBSD__ # include # if __FreeBSD_version >= 900041 @@ -972,6 +971,9 @@ FILE* fp; IntNative fh; fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR); +# ifdef CAPSICUM + cap_rights_limit(fh, CAP_WRITE); +# endif if (fh == -1) return NULL; fp = fdopen(fh, mode); if (fp == NULL) close(fh); @@ -1143,7 +1145,7 @@ { FILE *inStr; FILE *outStr; - Int32 n, i; + Int32 n, i, infd; struct MY_STAT statBuf; deleteOutputOnInterrupt = False; @@ -1248,7 +1250,14 @@ break; case SM_F2O: +# ifdef CAPSICUM + infd = open( inName, O_RDONLY ); + cap_rights_limit(infd, CAP_READ); + inStr = fdopen ( infd, "rb" ); +# else + infd = NULL; inStr = fopen ( inName, "rb" ); +# endif outStr = stdout; if ( isatty ( fileno ( stdout ) ) ) { fprintf ( stderr, @@ -1269,7 +1278,14 @@ break; case SM_F2F: +# ifdef CAPSICUM + infd = open( inName, O_RDONLY ); + cap_rights_limit(infd, CAP_READ); + inStr = fdopen ( infd, "rb" ); +# else + infd = NULL; inStr = fopen ( inName, "rb" ); +# endif outStr = fopen_output_safely ( outName, "wb" ); if ( outStr == NULL) { fprintf ( stderr, "%s: Can't create output file %s: %s.\n", @@ -1298,6 +1314,13 @@ fflush ( stderr ); } +# ifdef CAPSICUM + if (cap_enter() < 0) { + fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); + exit(1); + } +# endif + /*--- Now the input and output handles are sane. Do the Biz. ---*/ outputHandleJustInCase = outStr; deleteOutputOnInterrupt = True; @@ -1324,7 +1347,7 @@ { FILE *inStr; FILE *outStr; - Int32 n, i; + Int32 n, i, infd; Bool magicNumberOK; Bool cantGuess; struct MY_STAT statBuf; @@ -1434,7 +1457,14 @@ break; case SM_F2O: +# ifdef CAPSICUM + infd = open( inName, O_RDONLY ); + cap_rights_limit(infd, CAP_READ); + inStr = fdopen ( infd, "rb" ); +# else + infd = NULL; inStr = fopen ( inName, "rb" ); +# endif outStr = stdout; if ( inStr == NULL ) { fprintf ( stderr, "%s: Can't open input file %s:%s.\n", @@ -1446,7 +1476,14 @@ break; case SM_F2F: +# ifdef CAPSICUM + infd = open( inName, O_RDONLY ); + cap_rights_limit(infd, CAP_READ); + inStr = fdopen ( infd, "rb" ); +# else + infd = NULL; inStr = fopen ( inName, "rb" ); +# endif outStr = fopen_output_safely ( outName, "wb" ); if ( outStr == NULL) { fprintf ( stderr, "%s: Can't create output file %s: %s.\n", @@ -1475,6 +1512,13 @@ fflush ( stderr ); } +# ifdef CAPSICUM + if (cap_enter() < 0) { + fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); + exit(1); + } +# endif + /*--- Now the input and output handles are sane. Do the Biz. ---*/ outputHandleJustInCase = outStr; deleteOutputOnInterrupt = True; @@ -1821,13 +1865,6 @@ # endif # endif -# ifdef CAPSICUM - if (cap_enter() < 0) { - fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); - exit(1); - } -# endif - copyFileName ( inName, (Char*)"(none)" ); copyFileName ( outName, (Char*)"(none)" ); Modified: soc2013/dpl/head/usr.bin/bzip2/Makefile ============================================================================== --- soc2013/dpl/head/usr.bin/bzip2/Makefile Tue Jun 18 16:36:21 2013 (r253196) +++ soc2013/dpl/head/usr.bin/bzip2/Makefile Tue Jun 18 17:08:08 2013 (r253197) @@ -22,7 +22,8 @@ CLEANFILES+= ${TESTFILES} \ sample1.rb2 sample2.rb2 sample3.rb2 \ sample1.tst sample2.tst sample3.tst \ - total total.tst samples.rb2 + total total.tst samples.rb2 \ + total.bz2 total.tst.bz2 .for f in ${REFFILES} ${f}: ${f}.gz.uu From owner-svn-soc-all@FreeBSD.ORG Tue Jun 18 21:00:18 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C6FACA5 for ; Tue, 18 Jun 2013 21:00:18 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id B54A212D3 for ; Tue, 18 Jun 2013 21:00:18 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IL0Igu052071 for ; Tue, 18 Jun 2013 21:00:18 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5IL0Ij3052043 for svn-soc-all@FreeBSD.org; Tue, 18 Jun 2013 21:00:18 GMT (envelope-from mattbw@FreeBSD.org) Date: Tue, 18 Jun 2013 21:00:18 GMT Message-Id: <201306182100.r5IL0Ij3052043@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253203 - in soc2013/mattbw: . dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 21:00:18 -0000 Author: mattbw Date: Tue Jun 18 21:00:18 2013 New Revision: 253203 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253203 Log: slight cosmetic/building tweaks on dummy, failed attempt to use GNetworkManager in prep for fixing packagekit proc issues Added: soc2013/mattbw/dummy/Makefile Modified: soc2013/mattbw/dummy/pk-backend-dummy.c soc2013/mattbw/test.c Added: soc2013/mattbw/dummy/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/Makefile Tue Jun 18 21:00:18 2013 (r253203) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +LIB= pk_backend_dummy +SHLIB_MAJOR= 1 +SRCS= pk-backend-dummy.c + +PKGS= pkg packagekit-plugin gio-2.0 gio-unix-2.0 +CFLAGS+= `pkg-config --cflags ${PKGS}` +CFLAGS+= -DPK_COMPILATION +LDFLAGS+= `pkg-config --libs ${PKGS}` + +.include Modified: soc2013/mattbw/dummy/pk-backend-dummy.c ============================================================================== --- soc2013/mattbw/dummy/pk-backend-dummy.c Tue Jun 18 20:19:09 2013 (r253202) +++ soc2013/mattbw/dummy/pk-backend-dummy.c Tue Jun 18 21:00:18 2013 (r253203) @@ -1,22 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * +/*- * Copyright (C) 2007-2010 Richard Hughes + * 2013 Matt Windsor * * Licensed under the GNU General Public License Version 2 * - * 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 2 of the License, or - * (at your option) any later version. + * 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 2 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. + * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* NB: This is under heavy construction. Currently, it's just the dummy backend + * from PackageKit with a few modifications to build using BSD makefiles. + * Eventually it will actually support pkgng! */ #include @@ -29,34 +34,37 @@ #include "plugin/pk-backend.h" #include "plugin/pk-backend-job.h" +#include "pkg.h" + + typedef struct { - gboolean has_signature; - gboolean repo_enabled_devel; - gboolean repo_enabled_fedora; - gboolean repo_enabled_livna; - gboolean repo_enabled_local; - gboolean updated_gtkhtml; - gboolean updated_kernel; - gboolean updated_powertop; - gboolean use_blocked; - gboolean use_distro_upgrade; - gboolean use_eula; - gboolean use_gpg; - gboolean use_media; - gboolean use_trusted; - gchar **package_ids; - gchar **values; - PkBitfield filters; - gboolean fake_db_locked; -} PkBackendDummyPrivate; + gboolean has_signature; + gboolean repo_enabled_devel; + gboolean repo_enabled_fedora; + gboolean repo_enabled_livna; + gboolean repo_enabled_local; + gboolean updated_gtkhtml; + gboolean updated_kernel; + gboolean updated_powertop; + gboolean use_blocked; + gboolean use_distro_upgrade; + gboolean use_eula; + gboolean use_gpg; + gboolean use_media; + gboolean use_trusted; + gchar **package_ids; + gchar **values; + PkBitfield filters; + gboolean fake_db_locked; +} PkBackendDummyPrivate; typedef struct { - guint progress_percentage; - GSocket *socket; - guint socket_listen_id; - GCancellable *cancellable; - gulong signal_timeout; -} PkBackendDummyJobData; + guint progress_percentage; + GSocket *socket; + guint socket_listen_id; + GCancellable *cancellable; + gulong signal_timeout; +} PkBackendDummyJobData; static PkBackendDummyPrivate *priv; @@ -64,10 +72,10 @@ * pk_backend_initialize: */ void -pk_backend_initialize (PkBackend *backend) +pk_backend_initialize(PkBackend * backend) { /* create private area */ - priv = g_new0 (PkBackendDummyPrivate, 1); + priv = g_new0(PkBackendDummyPrivate, 1); priv->repo_enabled_fedora = TRUE; priv->repo_enabled_devel = TRUE; priv->repo_enabled_livna = TRUE; @@ -78,64 +86,64 @@ * pk_backend_destroy: */ void -pk_backend_destroy (PkBackend *backend) +pk_backend_destroy(PkBackend * backend) { - g_free (priv); + g_free(priv); } /** * pk_backend_get_groups: */ PkBitfield -pk_backend_get_groups (PkBackend *backend) +pk_backend_get_groups(PkBackend * backend) { - return pk_bitfield_from_enums (PK_GROUP_ENUM_ACCESSIBILITY, - PK_GROUP_ENUM_GAMES, - PK_GROUP_ENUM_SYSTEM, - -1); + return pk_bitfield_from_enums(PK_GROUP_ENUM_ACCESSIBILITY, + PK_GROUP_ENUM_GAMES, + PK_GROUP_ENUM_SYSTEM, + -1); } /** * pk_backend_get_filters: */ PkBitfield -pk_backend_get_filters (PkBackend *backend) +pk_backend_get_filters(PkBackend * backend) { - return pk_bitfield_from_enums (PK_FILTER_ENUM_GUI, - PK_FILTER_ENUM_INSTALLED, - PK_FILTER_ENUM_DEVELOPMENT, - -1); + return pk_bitfield_from_enums(PK_FILTER_ENUM_GUI, + PK_FILTER_ENUM_INSTALLED, + PK_FILTER_ENUM_DEVELOPMENT, + -1); } /** * pk_backend_get_mime_types: */ -gchar ** -pk_backend_get_mime_types (PkBackend *backend) +gchar ** +pk_backend_get_mime_types(PkBackend * backend) { - const gchar *mime_types[] = { - "application/x-rpm", - "application/x-deb", - NULL }; - return g_strdupv ((gchar **) mime_types); + const gchar *mime_types[] = { + "application/x-rpm", + "application/x-deb", + NULL}; + return g_strdupv((gchar **) mime_types); } /** * pk_backend_cancel_timeout: */ -static gboolean -pk_backend_cancel_timeout (gpointer data) +static gboolean +pk_backend_cancel_timeout(gpointer data) { - PkBackendJob *job = (PkBackendJob *) data; - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + PkBackendJob *job = (PkBackendJob *) data; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); /* we can now cancel again */ job_data->signal_timeout = 0; /* now mark as finished */ - pk_backend_job_error_code (job, PK_ERROR_ENUM_TRANSACTION_CANCELLED, - "The task was stopped successfully"); - pk_backend_job_finished (job); + pk_backend_job_error_code(job, PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished(job); return FALSE; } @@ -143,18 +151,18 @@ * pk_backend_cancel: */ void -pk_backend_cancel (PkBackend *backend, PkBackendJob *job) +pk_backend_cancel(PkBackend * backend, PkBackendJob * job) { - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); /* try to cancel the transaction */ - g_debug ("cancelling transaction"); - g_cancellable_cancel (job_data->cancellable); + g_debug("cancelling transaction"); + g_cancellable_cancel(job_data->cancellable); if (job_data->signal_timeout != 0) { - g_source_remove (job_data->signal_timeout); + g_source_remove(job_data->signal_timeout); /* emulate that it takes us a few ms to cancel */ - g_timeout_add (1500, pk_backend_cancel_timeout, job); + g_timeout_add(1500, pk_backend_cancel_timeout, job); } } @@ -162,258 +170,258 @@ * pk_backend_get_depends: */ void -pk_backend_get_depends (PkBackend *backend, PkBackendJob *job, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_get_depends(PkBackend * backend, PkBackendJob * job, PkBitfield filters, gchar ** package_ids, gboolean recursive) { - pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); - if (g_strcmp0 (package_ids[0], "scribus;1.3.4-1.fc8;i386;fedora") == 0) { - pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, - "scribus-clipart;1.3.4-1.fc8;i386;fedora", "Clipart for scribus"); + if (g_strcmp0(package_ids[0], "scribus;1.3.4-1.fc8;i386;fedora") == 0) { + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "scribus-clipart;1.3.4-1.fc8;i386;fedora", "Clipart for scribus"); } else { - pk_backend_job_package (job, PK_INFO_ENUM_INSTALLED, - "glib2;2.14.0;i386;fedora", "The GLib library"); - pk_backend_job_package (job, PK_INFO_ENUM_AVAILABLE, - "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "glib2;2.14.0;i386;fedora", "The GLib library"); + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); } - pk_backend_job_finished (job); + pk_backend_job_finished(job); } /** * pk_backend_get_details: */ void -pk_backend_get_details (PkBackend *backend, PkBackendJob *job, gchar **package_ids) +pk_backend_get_details(PkBackend * backend, PkBackendJob * job, gchar ** package_ids) { - guint i; - guint len; - const gchar *package_id; + guint i; + guint len; + const gchar *package_id; - pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); - pk_backend_job_set_percentage (job, 0); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage(job, 0); /* each one has a different detail for testing */ - len = g_strv_length (package_ids); - for (i=0; iuse_distro_upgrade) goto out; - pk_backend_job_distro_upgrade (job, PK_DISTRO_UPGRADE_ENUM_STABLE, - "fedora-9", "Fedora 9"); - pk_backend_job_distro_upgrade (job, PK_DISTRO_UPGRADE_ENUM_UNSTABLE, - "fedora-10-rc1", "Fedora 10 RC1"); + pk_backend_job_distro_upgrade(job, PK_DISTRO_UPGRADE_ENUM_STABLE, + "fedora-9", "Fedora 9"); + pk_backend_job_distro_upgrade(job, PK_DISTRO_UPGRADE_ENUM_UNSTABLE, + "fedora-10-rc1", "Fedora 10 RC1"); out: - pk_backend_job_finished (job); + pk_backend_job_finished(job); } /** * pk_backend_get_files: */ void -pk_backend_get_files (PkBackend *backend, PkBackendJob *job, gchar **package_ids) +pk_backend_get_files(PkBackend * backend, PkBackendJob * job, gchar ** package_ids) { - guint i; - guint len; - const gchar *package_id; + guint i; + guint len; + const gchar *package_id; - pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); - len = g_strv_length (package_ids); - for (i=0; i 1.6.0-10\n" - "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n" - " says to be an object manager.\n" - "\n" - "**Wed Mar 11 2009** Adam Jackson 1.6.0-11\n" - "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n" - " ACPI code.\n" - "\n" - "**Wed Mar 11 2009** Adam Jackson 1.6.0-12\n" - "- Requires: pixman >= 0.14.0\n" - "\n" - "**Fri Mar 6 2009** Adam Jackson 1.6.0-8\n" - "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n"; + "- xselinux-1.6.0-selinux-nlfd.patch: Acquire the netlink socket from selinux,\n" + " check it ourselves rather than having libselinux bang on it all the time.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-10\n" + "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n" + " says to be an object manager.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-11\n" + "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n" + " ACPI code.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-12\n" + "- Requires: pixman >= 0.14.0\n" + "\n" + "**Fri Mar 6 2009** Adam Jackson 1.6.0-8\n" + "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n"; /* each one has a different detail for testing */ - pk_backend_job_set_percentage (job, 0); - len = g_strv_length (priv->package_ids); - for (i=0; ipackage_ids); + for (i = 0; i < len; i++) { + const gchar *to_array1[] = {NULL, NULL, NULL}; + const gchar *to_array2[] = {NULL, NULL, NULL}; + const gchar *to_array3[] = {NULL, NULL, NULL}; + const gchar *to_array4[] = {NULL, NULL, NULL}; package_id = priv->package_ids[i]; - if (g_strcmp0 (package_id, "powertop;1.8-1.fc8;i386;fedora") == 0) { + if (g_strcmp0(package_id, "powertop;1.8-1.fc8;i386;fedora") == 0) { to_array1[0] = "powertop;1.7-1.fc8;i386;installed"; to_array2[0] = "http://www.distro-update.org/page?moo"; to_array3[0] = "http://bgzilla.fd.org/result.php?#12344"; - pk_backend_job_update_detail (job, package_id, - (gchar**) to_array1, - NULL, - (gchar**) to_array2, - (gchar**) to_array3, - NULL, - PK_RESTART_ENUM_NONE, - "Update to newest upstream source", - changelog, PK_UPDATE_STATE_ENUM_STABLE, - "2009-11-17T09:19:00", "2009-11-19T09:19:00"); - } else if (g_strcmp0 (package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) { + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + (gchar **) to_array2, + (gchar **) to_array3, + NULL, + PK_RESTART_ENUM_NONE, + "Update to newest upstream source", + changelog, PK_UPDATE_STATE_ENUM_STABLE, + "2009-11-17T09:19:00", "2009-11-19T09:19:00"); + } else if (g_strcmp0(package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) { to_array1[0] = "kernel;2.6.22-0.104.rc3.git6.fc8;i386;installed"; to_array1[1] = "kernel;2.6.22-0.105.rc3.git7.fc8;i386;installed"; to_array2[0] = "http://www.distro-update.org/page?moo"; to_array3[0] = "http://bgzilla.fd.org/result.php?#12344"; to_array3[1] = "http://bgzilla.gnome.org/result.php?#9876"; to_array4[0] = "http://nvd.nist.gov/nvd.cfm?cvename=CVE-2007-3381;CVE-2007-3381"; - pk_backend_job_update_detail (job, package_id, - (gchar**) to_array1, - NULL, - (gchar**) to_array2, - (gchar**) to_array3, - (gchar**) to_array4, - PK_RESTART_ENUM_SYSTEM, - "Update to newest upstream version.\n" - "* This should fix many driver bugs when using nouveau\n" - " * This also introduces the new `frobnicator` driver for *vibrating* rabbit hardware.", - changelog, - PK_UPDATE_STATE_ENUM_UNSTABLE, - "2008-06-28T09:19:00", - NULL); - } else if (g_strcmp0 (package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) { + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + (gchar **) to_array2, + (gchar **) to_array3, + (gchar **) to_array4, + PK_RESTART_ENUM_SYSTEM, + "Update to newest upstream version.\n" + "* This should fix many driver bugs when using nouveau\n" + " * This also introduces the new `frobnicator` driver for *vibrating* rabbit hardware.", + changelog, + PK_UPDATE_STATE_ENUM_UNSTABLE, + "2008-06-28T09:19:00", + NULL); + } else if (g_strcmp0(package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) { to_array1[0] = "gtkhtml2;2.18.1-22.fc8;i386;installed"; to_array2[0] = "http://www.distro-update.org/page?moo"; to_array3[0] = "http://bgzilla.gnome.org/result.php?#9876"; - pk_backend_job_update_detail (job, package_id, - (gchar**) to_array1, - NULL, - (gchar**) to_array2, - (gchar**) to_array3, - NULL, - PK_RESTART_ENUM_SESSION, - "Update to latest *whizz* **bang** version\n" - "* support this new thing\n" - "* something else\n" - "- and that new thing", - changelog, - PK_UPDATE_STATE_ENUM_UNKNOWN, - "2008-07-25T09:19:00", - NULL); + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + (gchar **) to_array2, + (gchar **) to_array3, + NULL, + PK_RESTART_ENUM_SESSION, + "Update to latest *whizz* **bang** version\n" + "* support this new thing\n" + "* something else\n" + "- and that new thing", + changelog, + PK_UPDATE_STATE_ENUM_UNKNOWN, + "2008-07-25T09:19:00", + NULL); - } else if (g_strcmp0 (package_id, "vino;2.24.2.fc9;i386;fedora") == 0) { + } else if (g_strcmp0(package_id, "vino;2.24.2.fc9;i386;fedora") == 0) { to_array1[0] = "vino;2.24.1.fc9;i386;fedora"; - pk_backend_job_update_detail (job, package_id, - (gchar**) to_array1, - NULL, - NULL, - NULL, - NULL, - PK_RESTART_ENUM_NONE, - "Cannot get update as update conflics with vncviewer", - changelog, - PK_UPDATE_STATE_ENUM_UNKNOWN, - "2008-07-25", - NULL); + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + NULL, + NULL, + NULL, + PK_RESTART_ENUM_NONE, + "Cannot get update as update conflics with vncviewer", + changelog, + PK_UPDATE_STATE_ENUM_UNKNOWN, + "2008-07-25", + NULL); } else { /* signal to UI */ - pk_backend_job_error_code (job, - PK_ERROR_ENUM_INTERNAL_ERROR, - "the package update detail was not found for %s", - package_id); + pk_backend_job_error_code(job, + PK_ERROR_ENUM_INTERNAL_ERROR, + "the package update detail was not found for %s", + package_id); } } - pk_backend_job_set_percentage (job, 100); - pk_backend_job_finished (job); + pk_backend_job_set_percentage(job, 100); + pk_backend_job_finished(job); job_data->signal_timeout = 0; return FALSE; } @@ -422,46 +430,46 @@ * pk_backend_get_update_detail: */ void -pk_backend_get_update_detail (PkBackend *backend, PkBackendJob *job, gchar **package_ids) +pk_backend_get_update_detail(PkBackend * backend, PkBackendJob * job, gchar ** package_ids) { - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); - pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); priv->package_ids = package_ids; - job_data->signal_timeout = g_timeout_add (500, pk_backend_get_update_detail_timeout, job); + job_data->signal_timeout = g_timeout_add(500, pk_backend_get_update_detail_timeout, job); } /** * pk_backend_get_updates_timeout: **/ -static gboolean -pk_backend_get_updates_timeout (gpointer data) +static gboolean +pk_backend_get_updates_timeout(gpointer data) { - PkBackendJob *job = (PkBackendJob *) data; - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + PkBackendJob *job = (PkBackendJob *) data; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); if (priv->use_blocked) { if (!priv->updated_powertop && !priv->updated_kernel && !priv->updated_gtkhtml) { - pk_backend_job_package (job, PK_INFO_ENUM_BLOCKED, - "vino;2.24.2.fc9;i386;fedora", - "Remote desktop server for the desktop"); + pk_backend_job_package(job, PK_INFO_ENUM_BLOCKED, + "vino;2.24.2.fc9;i386;fedora", + "Remote desktop server for the desktop"); } } if (!priv->updated_powertop) { - pk_backend_job_package (job, PK_INFO_ENUM_NORMAL, - "powertop;1.8-1.fc8;i386;fedora", - "Power consumption monitor"); + pk_backend_job_package(job, PK_INFO_ENUM_NORMAL, + "powertop;1.8-1.fc8;i386;fedora", + "Power consumption monitor"); } if (!priv->updated_kernel) { - pk_backend_job_package (job, PK_INFO_ENUM_BUGFIX, - "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", - "The Linux kernel (the core of the Linux operating system)"); + pk_backend_job_package(job, PK_INFO_ENUM_BUGFIX, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", + "The Linux kernel (the core of the Linux operating system)"); } if (!priv->updated_gtkhtml) { - pk_backend_job_package (job, PK_INFO_ENUM_SECURITY, - "gtkhtml2;2.19.1-4.fc8;i386;fedora", - "An HTML widget for GTK+ 2.0"); + pk_backend_job_package(job, PK_INFO_ENUM_SECURITY, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); } - pk_backend_job_finished (job); + pk_backend_job_finished(job); job_data->signal_timeout = 0; return FALSE; } @@ -470,227 +478,219 @@ * pk_backend_get_updates: */ void -pk_backend_get_updates (PkBackend *backend, PkBackendJob *job, PkBitfield filters) +pk_backend_get_updates(PkBackend * backend, PkBackendJob * job, PkBitfield filters) { - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); - pk_backend_job_set_status (job, PK_STATUS_ENUM_QUERY); - pk_backend_job_set_percentage (job, PK_BACKEND_PERCENTAGE_INVALID); + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage(job, PK_BACKEND_PERCENTAGE_INVALID); /* check network state */ - if (!pk_backend_is_online (backend)) { - pk_backend_job_error_code (job, PK_ERROR_ENUM_NO_NETWORK, "Cannot check when offline"); - pk_backend_job_finished (job); + if (!pk_backend_is_online(backend)) { + pk_backend_job_error_code(job, PK_ERROR_ENUM_NO_NETWORK, "Cannot check when offline"); + pk_backend_job_finished(job); return; } - job_data->signal_timeout = g_timeout_add (1000, pk_backend_get_updates_timeout, job); + job_data->signal_timeout = g_timeout_add(1000, pk_backend_get_updates_timeout, job); } /** * pk_backend_install_thread: */ static void -pk_backend_install_thread (PkBackendJob *job, GVariant *params, gpointer user_data) +pk_backend_install_thread(PkBackendJob * job, GVariant * params, gpointer user_data) { - gchar **package_ids; - PkBitfield transaction_flags; - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); - - g_variant_get (params, "(t^a&s)", - &transaction_flags, - &package_ids); + gchar **package_ids; + PkBitfield transaction_flags; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + g_variant_get(params, "(t^a&s)", + &transaction_flags, + &package_ids); while (TRUE) { /* check cancelled */ - if (g_cancellable_is_cancelled (job_data->cancellable)) { - pk_backend_job_error_code (job, - PK_ERROR_ENUM_TRANSACTION_CANCELLED, - "The task was stopped successfully"); - pk_backend_job_finished (job); + if (g_cancellable_is_cancelled(job_data->cancellable)) { + pk_backend_job_error_code(job, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished(job); break; } - if (job_data->progress_percentage == 100) { - pk_backend_job_finished (job); + pk_backend_job_finished(job); break; } - if (job_data->progress_percentage == 30) { - pk_backend_job_set_allow_cancel (job, FALSE); - pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, - "gtkhtml2;2.19.1-4.fc8;i386;fedora", - "An HTML widget for GTK+ 2.0"); - pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + pk_backend_job_set_allow_cancel(job, FALSE); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + pk_backend_job_set_status(job, PK_STATUS_ENUM_INSTALL); } - if (job_data->progress_percentage == 50) { - pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, - "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", - "Devel files for gtkhtml"); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", + "Devel files for gtkhtml"); /* this duplicate package should be ignored */ - pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, - "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", NULL); - pk_backend_job_set_status (job, PK_STATUS_ENUM_INSTALL); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", NULL); + pk_backend_job_set_status(job, PK_STATUS_ENUM_INSTALL); } - job_data->progress_percentage += 1; - pk_backend_job_set_percentage (job, job_data->progress_percentage); + pk_backend_job_set_percentage(job, job_data->progress_percentage); /* sleep 100 milliseconds */ - g_usleep (100000); + g_usleep(100000); } /* unlock backend again */ priv->fake_db_locked = FALSE; - pk_backend_job_set_locked (job, FALSE); + pk_backend_job_set_locked(job, FALSE); } /** * pk_backend_install_packages: */ void -pk_backend_install_packages (PkBackend *backend, PkBackendJob *job, PkBitfield transaction_flags, gchar **package_ids) +pk_backend_install_packages(PkBackend * backend, PkBackendJob * job, PkBitfield transaction_flags, gchar ** package_ids) { - const gchar *license_agreement; - const gchar *eula_id; - gboolean has_eula; - PkBackendDummyJobData *job_data = pk_backend_job_get_user_data (job); + const gchar *license_agreement; + const gchar *eula_id; + gboolean has_eula; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); /* simulate */ - if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) { - pk_backend_job_set_status (job, PK_STATUS_ENUM_DEP_RESOLVE); + if (pk_bitfield_contain(transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) { + pk_backend_job_set_status(job, PK_STATUS_ENUM_DEP_RESOLVE); - pk_backend_job_package (job, PK_INFO_ENUM_REMOVING, - "powertop;1.8-1.fc8;i386;fedora", "Power consumption monitor"); + pk_backend_job_package(job, PK_INFO_ENUM_REMOVING, + "powertop;1.8-1.fc8;i386;fedora", "Power consumption monitor"); - pk_backend_job_package (job, PK_INFO_ENUM_INSTALLING, - "gtk2;2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtk2;2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); - pk_backend_job_package (job, PK_INFO_ENUM_UPDATING, - "lib7;7.0.1-6.fc13;i386;fedora", "C Libraries"); + pk_backend_job_package(job, PK_INFO_ENUM_UPDATING, + "lib7;7.0.1-6.fc13;i386;fedora", "C Libraries"); - pk_backend_job_package (job, PK_INFO_ENUM_REINSTALLING, - "libssl;3.5.7-2.fc13;i386;fedora", "SSL Libraries"); + pk_backend_job_package(job, PK_INFO_ENUM_REINSTALLING, + "libssl;3.5.7-2.fc13;i386;fedora", "SSL Libraries"); - pk_backend_job_package (job, PK_INFO_ENUM_DOWNGRADING, - "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", "The Linux kernel (the core of the Linux operating system)"); + pk_backend_job_package(job, PK_INFO_ENUM_DOWNGRADING, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", "The Linux kernel (the core of the Linux operating system)"); - pk_backend_job_package (job, PK_INFO_ENUM_UPDATING, - "gtkhtml2;2.19.1-4.fc8;i386;fedora", "An HTML widget for GTK+ 2.0"); + pk_backend_job_package(job, PK_INFO_ENUM_UPDATING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", "An HTML widget for GTK+ 2.0"); - pk_backend_job_finished (job); + pk_backend_job_finished(job); return; } - - if (g_strcmp0 (package_ids[0], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { + if (g_strcmp0(package_ids[0], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { if (priv->use_gpg && !priv->has_signature) { - pk_backend_job_repo_signature_required (job, package_ids[0], "updates", - "http://example.com/gpgkey", - "Test Key (Fedora) fedora@example.com", - "BB7576AC", - "D8CC 06C2 77EC 9C53 372F C199 B1EE 1799 F24F 1B08", - "2007-10-04", PK_SIGTYPE_ENUM_GPG); - pk_backend_job_error_code (job, PK_ERROR_ENUM_GPG_FAILURE, - "GPG signed package could not be verified"); - pk_backend_job_finished (job); + pk_backend_job_repo_signature_required(job, package_ids[0], "updates", + "http://example.com/gpgkey", + "Test Key (Fedora) fedora@example.com", + "BB7576AC", + "D8CC 06C2 77EC 9C53 372F C199 B1EE 1799 F24F 1B08", + "2007-10-04", PK_SIGTYPE_ENUM_GPG); + pk_backend_job_error_code(job, PK_ERROR_ENUM_GPG_FAILURE, + "GPG signed package could not be verified"); + pk_backend_job_finished(job); return; } eula_id = "eula_hughsie_dot_com"; - has_eula = pk_backend_is_eula_valid (backend, eula_id); + has_eula = pk_backend_is_eula_valid(backend, eula_id); if (priv->use_eula && !has_eula) { license_agreement = "Narrator: In A.D. 2101, war was beginning.\n" - "Captain: What happen ?\n" - "Mechanic: Somebody set up us the bomb.\n\n" - "Operator: We get signal.\n" - "Captain: What !\n" - "Operator: Main screen turn on.\n" - "Captain: It's you !!\n" - "CATS: How are you gentlemen !!\n" - "CATS: All your base are belong to us.\n" - "CATS: You are on the way to destruction.\n\n" - "Captain: What you say !!\n" - "CATS: You have no chance to survive make your time.\n" - "CATS: Ha Ha Ha Ha ....\n\n" - "Operator: Captain!! *\n" - "Captain: Take off every 'ZIG' !!\n" - "Captain: You know what you doing.\n" - "Captain: Move 'ZIG'.\n" - "Captain: For great justice.\n"; - pk_backend_job_eula_required (job, eula_id, package_ids[0], - "CATS Inc.", license_agreement); - pk_backend_job_error_code (job, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, - "licence not installed so cannot install"); - pk_backend_job_finished (job); + "Captain: What happen ?\n" + "Mechanic: Somebody set up us the bomb.\n\n" + "Operator: We get signal.\n" + "Captain: What !\n" + "Operator: Main screen turn on.\n" + "Captain: It's you !!\n" + "CATS: How are you gentlemen !!\n" + "CATS: All your base are belong to us.\n" + "CATS: You are on the way to destruction.\n\n" + "Captain: What you say !!\n" + "CATS: You have no chance to survive make your time.\n" + "CATS: Ha Ha Ha Ha ....\n\n" + "Operator: Captain!! *\n" + "Captain: Take off every 'ZIG' !!\n" + "Captain: You know what you doing.\n" + "Captain: Move 'ZIG'.\n" + "Captain: For great justice.\n"; + pk_backend_job_eula_required(job, eula_id, package_ids[0], + "CATS Inc.", license_agreement); + pk_backend_job_error_code(job, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, + "licence not installed so cannot install"); + pk_backend_job_finished(job); return; } if (priv->use_media) { priv->use_media = FALSE; - pk_backend_job_media_change_required (job, PK_MEDIA_TYPE_ENUM_DVD, "linux-disk-1of7", "Linux Disc 1 of 7"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 11:08:40 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1A5053ED for ; Wed, 19 Jun 2013 11:08:40 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id E6EC1196C for ; Wed, 19 Jun 2013 11:08:39 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JB8dAd016097 for ; Wed, 19 Jun 2013 11:08:39 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JB8dvX016096 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 11:08:39 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 11:08:39 GMT Message-Id: <201306191108.r5JB8dvX016096@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253233 - soc2013/jmuniz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 11:08:40 -0000 Author: jmuniz Date: Wed Jun 19 11:08:39 2013 New Revision: 253233 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253233 Log: Added: soc2013/jmuniz/ From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 11:25:42 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E0D7A910 for ; Wed, 19 Jun 2013 11:25:42 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id D21FD1A0A for ; Wed, 19 Jun 2013 11:25:42 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JBPgTx040760 for ; Wed, 19 Jun 2013 11:25:42 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JBPgmT040757 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 11:25:42 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 11:25:42 GMT Message-Id: <201306191125.r5JBPgmT040757@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253234 - in soc2013/jmuniz: . PackageKit PackageKit/PackageKit-0.6.11 PackageKit/PackageKit-0.8.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 11:25:42 -0000 Author: jmuniz Date: Wed Jun 19 11:25:42 2013 New Revision: 253234 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253234 Log: Creating beginnings of the directory structure and important resource documents Added: soc2013/jmuniz/COPYING soc2013/jmuniz/PackageKit/ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/ soc2013/jmuniz/README Added: soc2013/jmuniz/COPYING ============================================================================== Added: soc2013/jmuniz/README ============================================================================== From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 12:09:02 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A6F0A8F3 for ; Wed, 19 Jun 2013 12:09:02 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 8846A1C63 for ; Wed, 19 Jun 2013 12:09:02 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JC92oN088322 for ; Wed, 19 Jun 2013 12:09:02 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JC92ap088305 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 12:09:02 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 12:09:02 GMT Message-Id: <201306191209.r5JC92ap088305@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253237 - soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 12:09:02 -0000 Author: jmuniz Date: Wed Jun 19 12:09:02 2013 New Revision: 253237 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253237 Log: Some initial progress towards porting the latest version Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/distinfo soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile Wed Jun 19 12:09:02 2013 (r253237) @@ -0,0 +1,69 @@ +# Created by: Anders F Bjorklund + +# $FreeBSD$ + +PORTNAME= PackageKit +PORTVERSION= 0.8.9 +#PORTREVISION= 0 +CATEGORIES= ports-mgmt sysutils +MASTER_SITES= http://www.packagekit.org/releases/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER= jmuniz@FreeBSD.org +COMMENT= DBUS packaging abstraction layer + +BUILD_DEPENDS= intltool>=0.35.0:{PORTSDIR}/textproc/intltool \ + glib>=2.14.0:{PORTSDIR}/devel/glib \ + dbus>=1.1.3:{PORTSDIR}/devel/dbus \ + dbus-glib>=0.74.0:{PORTSDIR}/devel/dbus-glib \ + polkit>=0.9:{PORTSDIR}/sysutils/polkit +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + ck-connector:${PORTSDIR}/sysutils/consolekit +RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ + ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + +USE_GMAKE= yes +USES= gettext +USE_PYTHON_BUILD= 2.5+ +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS+= --with-security-framework=polkit \ + --localstatedir=/var \ + --disable-maintainer-mode \ + --disable-gtk-doc \ + --disable-systemd \ + --disable-bash-completion \ + --enable-dummy \ + --with-default-backend=ports \ + --disable-networkmanager \ + --disable-connman \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-man-pages \ + --disable-nls + +MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" + +post-install: +.if !defined(${SLAVEPORT}) + @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ + ${PREFIX}/share/PackageKit/transactions.db + @-update-mime-database ${PREFIX}/share/mime > /dev/null +.endif + +.include + +#change default backend +#provide option to select a single or multiple backends +#add pk_backend_select script which takes one argument, the name of the backend, and help; responds to bad names or syntax +#patch in pk_backend_select and make sure it is in pkg-plist +#add man page support and option +#preserve modified configuration files + +# --enable-ports \ +# --with-default-backend=ports \ +# --localstatedir=/var + Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/distinfo Wed Jun 19 12:09:02 2013 (r253237) @@ -0,0 +1,2 @@ +SHA256 (PackageKit-0.8.9.tar.xz) = b103ca03c91526ef9077049367c2b100e7d04f0af942193a43275c2c8a2f1559 +SIZE (PackageKit-0.8.9.tar.xz) = 1524568 Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr Wed Jun 19 12:09:02 2013 (r253237) @@ -0,0 +1,4 @@ +PackageKit is a DBUS abstraction layer that allows the session user to manage +packages in a secure way using a cross-distro, cross-architecture API. + +WWW: http://www.packagekit.org/ \ No newline at end of file Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist Wed Jun 19 12:09:02 2013 (r253237) @@ -0,0 +1,468 @@ +bin/packagekit-bugreport.sh +bin/pk-debuginfo-install +bin/pkcon +bin/pkgenpack +bin/pkmon + +%%ETCDIR%%/CommandNotFound.conf + + +%%ETCDIR%%/PackageKit.conf + +%%ETCDIR%%/Vendor.conf +%%ETCDIR%%/events/post-transaction.d/README +%%ETCDIR%%/events/pre-transaction.d/README +etc/cron.daily/packagekit-background.cron +etc/dbus-1/system.d/org.freedesktop.PackageKit.conf +etc/profile.d/PackageKit.sh +etc/sysconfig/packagekit-background +include/PackageKit/packagekit-glib2/packagekit.h +include/PackageKit/packagekit-glib2/pk-bitfield.h +include/PackageKit/packagekit-glib2/pk-catalog.h +include/PackageKit/packagekit-glib2/pk-category.h +include/PackageKit/packagekit-glib2/pk-client-helper.h +include/PackageKit/packagekit-glib2/pk-client-sync.h +include/PackageKit/packagekit-glib2/pk-client.h +include/PackageKit/packagekit-glib2/pk-common.h +include/PackageKit/packagekit-glib2/pk-control-sync.h +include/PackageKit/packagekit-glib2/pk-control.h +include/PackageKit/packagekit-glib2/pk-desktop.h +include/PackageKit/packagekit-glib2/pk-details.h +include/PackageKit/packagekit-glib2/pk-distro-upgrade.h +include/PackageKit/packagekit-glib2/pk-enum-types.h +include/PackageKit/packagekit-glib2/pk-enum.h +include/PackageKit/packagekit-glib2/pk-error.h +include/PackageKit/packagekit-glib2/pk-eula-required.h +include/PackageKit/packagekit-glib2/pk-files.h +include/PackageKit/packagekit-glib2/pk-item-progress.h +include/PackageKit/packagekit-glib2/pk-media-change-required.h +include/PackageKit/packagekit-glib2/pk-message.h +include/PackageKit/packagekit-glib2/pk-package-id.h +include/PackageKit/packagekit-glib2/pk-package-ids.h +include/PackageKit/packagekit-glib2/pk-package-sack-sync.h +include/PackageKit/packagekit-glib2/pk-package-sack.h +include/PackageKit/packagekit-glib2/pk-package.h +include/PackageKit/packagekit-glib2/pk-progress.h +include/PackageKit/packagekit-glib2/pk-repo-detail.h +include/PackageKit/packagekit-glib2/pk-repo-signature-required.h +include/PackageKit/packagekit-glib2/pk-require-restart.h +include/PackageKit/packagekit-glib2/pk-results.h +include/PackageKit/packagekit-glib2/pk-service-pack.h +include/PackageKit/packagekit-glib2/pk-source.h +include/PackageKit/packagekit-glib2/pk-task-sync.h +include/PackageKit/packagekit-glib2/pk-task.h +include/PackageKit/packagekit-glib2/pk-transaction-list.h +include/PackageKit/packagekit-glib2/pk-transaction-past.h +include/PackageKit/packagekit-glib2/pk-update-detail.h +include/PackageKit/packagekit-glib2/pk-version.h +include/PackageKit/plugin/packagekit-plugin.h +include/PackageKit/plugin/pk-backend-job.h +include/PackageKit/plugin/pk-backend-spawn.h +include/PackageKit/plugin/pk-backend.h +include/PackageKit/plugin/pk-conf.h +include/PackageKit/plugin/pk-plugin.h +include/PackageKit/plugin/pk-shared.h +include/PackageKit/plugin/pk-transaction.h +lib/girepository-1.0/PackageKitGlib-1.0.typelib +lib/girepository-1.0/PackageKitPlugin-1.0.typelib +lib/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop +lib/gtk-2.0/modules/libpk-gtk-module.a +lib/gtk-2.0/modules/libpk-gtk-module.la +lib/gtk-2.0/modules/libpk-gtk-module.so +lib/gtk-3.0/modules/libpk-gtk-module.a +lib/gtk-3.0/modules/libpk-gtk-module.la +lib/gtk-3.0/modules/libpk-gtk-module.so +lib/libpackagekit-glib2.a +lib/libpackagekit-glib2.la +lib/libpackagekit-glib2.so +lib/libpackagekit-glib2.so.16 +lib/locale/ar/LC_MESSAGES/PackageKit.mo +lib/locale/as/LC_MESSAGES/PackageKit.mo +lib/locale/bg/LC_MESSAGES/PackageKit.mo +lib/locale/bg_BG/LC_MESSAGES/PackageKit.mo +lib/locale/bn_IN/LC_MESSAGES/PackageKit.mo +lib/locale/ca/LC_MESSAGES/PackageKit.mo +lib/locale/ca@valencia/LC_MESSAGES/PackageKit.mo +lib/locale/cs/LC_MESSAGES/PackageKit.mo +lib/locale/da/LC_MESSAGES/PackageKit.mo +lib/locale/de/LC_MESSAGES/PackageKit.mo +lib/locale/el/LC_MESSAGES/PackageKit.mo +lib/locale/en_GB/LC_MESSAGES/PackageKit.mo +lib/locale/eo/LC_MESSAGES/PackageKit.mo +lib/locale/es/LC_MESSAGES/PackageKit.mo +lib/locale/eu/LC_MESSAGES/PackageKit.mo +lib/locale/fa_IR/LC_MESSAGES/PackageKit.mo +lib/locale/fi/LC_MESSAGES/PackageKit.mo +lib/locale/fr/LC_MESSAGES/PackageKit.mo +lib/locale/ga/LC_MESSAGES/PackageKit.mo +lib/locale/gl/LC_MESSAGES/PackageKit.mo +lib/locale/gu/LC_MESSAGES/PackageKit.mo +lib/locale/he/LC_MESSAGES/PackageKit.mo +lib/locale/hi/LC_MESSAGES/PackageKit.mo +lib/locale/hu/LC_MESSAGES/PackageKit.mo +lib/locale/id/LC_MESSAGES/PackageKit.mo +lib/locale/it/LC_MESSAGES/PackageKit.mo +lib/locale/it_IT/LC_MESSAGES/PackageKit.mo +lib/locale/ja/LC_MESSAGES/PackageKit.mo +lib/locale/kk/LC_MESSAGES/PackageKit.mo +lib/locale/kn/LC_MESSAGES/PackageKit.mo +lib/locale/ko/LC_MESSAGES/PackageKit.mo +lib/locale/lt/LC_MESSAGES/PackageKit.mo +lib/locale/lv/LC_MESSAGES/PackageKit.mo +lib/locale/ml/LC_MESSAGES/PackageKit.mo +lib/locale/mr/LC_MESSAGES/PackageKit.mo +lib/locale/ms/LC_MESSAGES/PackageKit.mo +lib/locale/nb/LC_MESSAGES/PackageKit.mo +lib/locale/nl/LC_MESSAGES/PackageKit.mo +lib/locale/or/LC_MESSAGES/PackageKit.mo +lib/locale/pa/LC_MESSAGES/PackageKit.mo +lib/locale/pl/LC_MESSAGES/PackageKit.mo +lib/locale/pt/LC_MESSAGES/PackageKit.mo +lib/locale/pt_BR/LC_MESSAGES/PackageKit.mo +lib/locale/ro/LC_MESSAGES/PackageKit.mo +lib/locale/ru/LC_MESSAGES/PackageKit.mo +lib/locale/sk/LC_MESSAGES/PackageKit.mo +lib/locale/sl/LC_MESSAGES/PackageKit.mo +lib/locale/sr/LC_MESSAGES/PackageKit.mo +lib/locale/sr@latin/LC_MESSAGES/PackageKit.mo +lib/locale/sv/LC_MESSAGES/PackageKit.mo +lib/locale/ta/LC_MESSAGES/PackageKit.mo +lib/locale/te/LC_MESSAGES/PackageKit.mo +lib/locale/th/LC_MESSAGES/PackageKit.mo +lib/locale/tr/LC_MESSAGES/PackageKit.mo +lib/locale/uk/LC_MESSAGES/PackageKit.mo +lib/locale/wa/LC_MESSAGES/PackageKit.mo +lib/locale/zh_CN/LC_MESSAGES/PackageKit.mo +lib/locale/zh_TW/LC_MESSAGES/PackageKit.mo +lib/packagekit-backend/libpk_backend_dummy.a +lib/packagekit-backend/libpk_backend_dummy.la +lib/packagekit-backend/libpk_backend_dummy.so +lib/packagekit-backend/libpk_backend_test_fail.a +lib/packagekit-backend/libpk_backend_test_fail.la +lib/packagekit-backend/libpk_backend_test_fail.so +lib/packagekit-backend/libpk_backend_test_nop.a +lib/packagekit-backend/libpk_backend_test_nop.la +lib/packagekit-backend/libpk_backend_test_nop.so +lib/packagekit-backend/libpk_backend_test_spawn.a +lib/packagekit-backend/libpk_backend_test_spawn.la +lib/packagekit-backend/libpk_backend_test_spawn.so +lib/packagekit-backend/libpk_backend_test_succeed.a +lib/packagekit-backend/libpk_backend_test_succeed.la +lib/packagekit-backend/libpk_backend_test_succeed.so +lib/packagekit-backend/libpk_backend_test_thread.a +lib/packagekit-backend/libpk_backend_test_thread.la +lib/packagekit-backend/libpk_backend_test_thread.so +lib/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.a +lib/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.la +lib/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.so +lib/packagekit-plugins/libpk_plugin-clear-firmware-requests.a +lib/packagekit-plugins/libpk_plugin-clear-firmware-requests.la +lib/packagekit-plugins/libpk_plugin-clear-firmware-requests.so +lib/packagekit-plugins/libpk_plugin-no-update-process.a +lib/packagekit-plugins/libpk_plugin-no-update-process.la +lib/packagekit-plugins/libpk_plugin-no-update-process.so +lib/packagekit-plugins/libpk_plugin-require-restart.a +lib/packagekit-plugins/libpk_plugin-require-restart.la +lib/packagekit-plugins/libpk_plugin-require-restart.so +lib/packagekit-plugins/libpk_plugin-scan-desktop-files.a +lib/packagekit-plugins/libpk_plugin-scan-desktop-files.la +lib/packagekit-plugins/libpk_plugin-scan-desktop-files.so +lib/packagekit-plugins/libpk_plugin-systemd-updates.a +lib/packagekit-plugins/libpk_plugin-systemd-updates.la +lib/packagekit-plugins/libpk_plugin-systemd-updates.so +lib/packagekit-plugins/libpk_plugin-update-check-processes.a +lib/packagekit-plugins/libpk_plugin-update-check-processes.la +lib/packagekit-plugins/libpk_plugin-update-check-processes.so +lib/packagekit-plugins/libpk_plugin-update-package-cache.a +lib/packagekit-plugins/libpk_plugin-update-package-cache.la +lib/packagekit-plugins/libpk_plugin-update-package-cache.so +lib/packagekit-plugins/libpk_plugin_scripts.a +lib/packagekit-plugins/libpk_plugin_scripts.la +lib/packagekit-plugins/libpk_plugin_scripts.so +%%PYTHON_SITELIBDIR%%/packagekit/__init__.py +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyc +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyo +%%PYTHON_SITELIBDIR%%/packagekit/backend.py +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyc +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyo +%%PYTHON_SITELIBDIR%%/packagekit/enums.py +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyc +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyo +%%PYTHON_SITELIBDIR%%/packagekit/filter.py +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyc +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyo +%%PYTHON_SITELIBDIR%%/packagekit/misc.py +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyc +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyo +%%PYTHON_SITELIBDIR%%/packagekit/package.py +%%PYTHON_SITELIBDIR%%/packagekit/package.pyc +%%PYTHON_SITELIBDIR%%/packagekit/package.pyo +%%PYTHON_SITELIBDIR%%/packagekit/progress.py +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyc +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyo +libdata/pkgconfig/packagekit-glib2.pc +libdata/pkgconfig/packagekit-plugin.pc +libexec/packagekitd +libexec/pk-clear-offline-update +libexec/pk-command-not-found +libexec/pk-offline-update +libexec/pk-trigger-offline-update +%%DATADIR%%/helpers/test_spawn/search-name.sh +%%DATADIR%%/pk-upgrade-distro.sh +%%DATADIR%%/transactions.db +share/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml +share/dbus-1/interfaces/org.freedesktop.PackageKit.xml +share/dbus-1/system-services/org.freedesktop.PackageKit.service +share/gir-1.0/PackageKitGlib-1.0.gir +share/gir-1.0/PackageKitPlugin-1.0.gir +share/gtk-doc/html/PackageKit/PackageKit-pk-bitfield.html +share/gtk-doc/html/PackageKit/PackageKit-pk-client-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-common.html +share/gtk-doc/html/PackageKit/PackageKit-pk-control-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-enum.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-id.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-ids.html +share/gtk-doc/html/PackageKit/PackageKit-pk-task-sync.html +share/gtk-doc/html/PackageKit/PackageKit.devhelp2 +share/gtk-doc/html/PackageKit/PackageKit.html +share/gtk-doc/html/PackageKit/PkCatalog.html +share/gtk-doc/html/PackageKit/PkCategory.html +share/gtk-doc/html/PackageKit/PkClient.html +share/gtk-doc/html/PackageKit/PkControl.html +share/gtk-doc/html/PackageKit/PkDesktop.html +share/gtk-doc/html/PackageKit/PkDetails.html +share/gtk-doc/html/PackageKit/PkDistroUpgrade.html +share/gtk-doc/html/PackageKit/PkError.html +share/gtk-doc/html/PackageKit/PkEulaRequired.html +share/gtk-doc/html/PackageKit/PkFiles.html +share/gtk-doc/html/PackageKit/PkMediaChangeRequired.html +share/gtk-doc/html/PackageKit/PkMessage.html +share/gtk-doc/html/PackageKit/PkPackage.html +share/gtk-doc/html/PackageKit/PkPackageSack.html +share/gtk-doc/html/PackageKit/PkProgress.html +share/gtk-doc/html/PackageKit/PkRepoDetail.html +share/gtk-doc/html/PackageKit/PkRepoSignatureRequired.html +share/gtk-doc/html/PackageKit/PkRequireRestart.html +share/gtk-doc/html/PackageKit/PkResults.html +share/gtk-doc/html/PackageKit/PkServicePack.html +share/gtk-doc/html/PackageKit/PkTask.html +share/gtk-doc/html/PackageKit/PkTransactionPast.html +share/gtk-doc/html/PackageKit/PkUpdateDetail.html +share/gtk-doc/html/PackageKit/Transaction.html +share/gtk-doc/html/PackageKit/api-reference.html +share/gtk-doc/html/PackageKit/backend-compiled.html +share/gtk-doc/html/PackageKit/backend-spawn.html +share/gtk-doc/html/PackageKit/backends-spawn-common.html +share/gtk-doc/html/PackageKit/backends-spawn-methods.html +share/gtk-doc/html/PackageKit/concepts.html +share/gtk-doc/html/PackageKit/config-main.html +share/gtk-doc/html/PackageKit/developer-faq.html +share/gtk-doc/html/PackageKit/faq.html +share/gtk-doc/html/PackageKit/home.png +share/gtk-doc/html/PackageKit/index.html +share/gtk-doc/html/PackageKit/index.sgml +share/gtk-doc/html/PackageKit/introduction-backends.html +share/gtk-doc/html/PackageKit/introduction-cancellation.html +share/gtk-doc/html/PackageKit/introduction-errors.html +share/gtk-doc/html/PackageKit/introduction-group-type.html +share/gtk-doc/html/PackageKit/introduction-ideas-filters.html +share/gtk-doc/html/PackageKit/introduction-ideas-status.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactionid.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactions.html +share/gtk-doc/html/PackageKit/introduction.html +share/gtk-doc/html/PackageKit/left.png +share/gtk-doc/html/PackageKit/libpackagekit-gobject.html +share/gtk-doc/html/PackageKit/libpackagekit-helpers.html +share/gtk-doc/html/PackageKit/pk-faq-error-code.png +share/gtk-doc/html/PackageKit/pk-faq-filter.png +share/gtk-doc/html/PackageKit/pk-faq-status.png +share/gtk-doc/html/PackageKit/pk-structure.png +share/gtk-doc/html/PackageKit/pk-structure.svg +share/gtk-doc/html/PackageKit/pk-transactions-auto-untrusted.png +share/gtk-doc/html/PackageKit/pk-transactions-download.png +share/gtk-doc/html/PackageKit/pk-transactions-failure.png +share/gtk-doc/html/PackageKit/pk-transactions-repair-required.png +share/gtk-doc/html/PackageKit/pk-transactions-set-locale.png +share/gtk-doc/html/PackageKit/pk-transactions-sig-install.png +share/gtk-doc/html/PackageKit/pk-transactions-success.png +share/gtk-doc/html/PackageKit/pk-transactions-trusted.png +share/gtk-doc/html/PackageKit/pk-transactions.svg +share/gtk-doc/html/PackageKit/right.png +share/gtk-doc/html/PackageKit/specification.html +share/gtk-doc/html/PackageKit/style.css +share/gtk-doc/html/PackageKit/up.png +share/mime/XMLnamespaces +share/mime/aliases +share/mime/application/x-catalog.xml +share/mime/application/x-package-list.xml +share/mime/application/x-servicepack.xml +share/mime/generic-icons +share/mime/globs +share/mime/globs2 +share/mime/icons +share/mime/magic +share/mime/mime.cache +share/mime/packages/packagekit-catalog.xml +share/mime/packages/packagekit-package-list.xml +share/mime/packages/packagekit-servicepack.xml +share/mime/subclasses +share/mime/treemagic +share/mime/types +share/mime/version +share/polkit-1/actions/org.freedesktop.packagekit.policy +@dirrm share/polkit-1/actions +@dirrm share/polkit-1 +@dirrm share/mime/packages +@dirrm share/mime/application +@dirrm share/mime +@dirrm share/gtk-doc/html/PackageKit +@dirrm share/gtk-doc/html +@dirrm share/gtk-doc +@dirrm share/gir-1.0 +@dirrm share/dbus-1/system-services +@dirrm share/dbus-1/interfaces +@dirrm share/dbus-1 +@dirrm %%DATADIR%%/helpers/test_spawn +@dirrm %%DATADIR%%/helpers +@dirrm %%DATADIR%% +@dirrm %%PYTHON_SITELIBDIR%%/packagekit +@dirrm %%PYTHON_SITELIBDIR%% +@dirrm lib/python2.7 +@dirrm lib/packagekit-plugins +@dirrm lib/packagekit-backend +@dirrm lib/locale/zh_TW/LC_MESSAGES +@dirrm lib/locale/zh_TW +@dirrm lib/locale/zh_CN/LC_MESSAGES +@dirrm lib/locale/zh_CN +@dirrm lib/locale/wa/LC_MESSAGES +@dirrm lib/locale/wa +@dirrm lib/locale/uk/LC_MESSAGES +@dirrm lib/locale/uk +@dirrm lib/locale/tr/LC_MESSAGES +@dirrm lib/locale/tr +@dirrm lib/locale/th/LC_MESSAGES +@dirrm lib/locale/th +@dirrm lib/locale/te/LC_MESSAGES +@dirrm lib/locale/te +@dirrm lib/locale/ta/LC_MESSAGES +@dirrm lib/locale/ta +@dirrm lib/locale/sv/LC_MESSAGES +@dirrm lib/locale/sv +@dirrm lib/locale/sr@latin/LC_MESSAGES +@dirrm lib/locale/sr@latin +@dirrm lib/locale/sr/LC_MESSAGES +@dirrm lib/locale/sr +@dirrm lib/locale/sl/LC_MESSAGES +@dirrm lib/locale/sl +@dirrm lib/locale/sk/LC_MESSAGES +@dirrm lib/locale/sk +@dirrm lib/locale/ru/LC_MESSAGES +@dirrm lib/locale/ru +@dirrm lib/locale/ro/LC_MESSAGES +@dirrm lib/locale/ro +@dirrm lib/locale/pt_BR/LC_MESSAGES +@dirrm lib/locale/pt_BR +@dirrm lib/locale/pt/LC_MESSAGES +@dirrm lib/locale/pt +@dirrm lib/locale/pl/LC_MESSAGES +@dirrm lib/locale/pl +@dirrm lib/locale/pa/LC_MESSAGES +@dirrm lib/locale/pa +@dirrm lib/locale/or/LC_MESSAGES +@dirrm lib/locale/or +@dirrm lib/locale/nl/LC_MESSAGES +@dirrm lib/locale/nl +@dirrm lib/locale/nb/LC_MESSAGES +@dirrm lib/locale/nb +@dirrm lib/locale/ms/LC_MESSAGES +@dirrm lib/locale/ms +@dirrm lib/locale/mr/LC_MESSAGES +@dirrm lib/locale/mr +@dirrm lib/locale/ml/LC_MESSAGES +@dirrm lib/locale/ml +@dirrm lib/locale/lv/LC_MESSAGES +@dirrm lib/locale/lv +@dirrm lib/locale/lt/LC_MESSAGES +@dirrm lib/locale/lt +@dirrm lib/locale/ko/LC_MESSAGES +@dirrm lib/locale/ko +@dirrm lib/locale/kn/LC_MESSAGES +@dirrm lib/locale/kn +@dirrm lib/locale/kk/LC_MESSAGES +@dirrm lib/locale/kk +@dirrm lib/locale/ja/LC_MESSAGES +@dirrm lib/locale/ja +@dirrm lib/locale/it_IT/LC_MESSAGES +@dirrm lib/locale/it_IT +@dirrm lib/locale/it/LC_MESSAGES +@dirrm lib/locale/it +@dirrm lib/locale/id/LC_MESSAGES +@dirrm lib/locale/id +@dirrm lib/locale/hu/LC_MESSAGES +@dirrm lib/locale/hu +@dirrm lib/locale/hi/LC_MESSAGES +@dirrm lib/locale/hi +@dirrm lib/locale/he/LC_MESSAGES +@dirrm lib/locale/he +@dirrm lib/locale/gu/LC_MESSAGES +@dirrm lib/locale/gu +@dirrm lib/locale/gl/LC_MESSAGES +@dirrm lib/locale/gl +@dirrm lib/locale/ga/LC_MESSAGES +@dirrm lib/locale/ga +@dirrm lib/locale/fr/LC_MESSAGES +@dirrm lib/locale/fr +@dirrm lib/locale/fi/LC_MESSAGES +@dirrm lib/locale/fi +@dirrm lib/locale/fa_IR/LC_MESSAGES +@dirrm lib/locale/fa_IR +@dirrm lib/locale/eu/LC_MESSAGES +@dirrm lib/locale/eu +@dirrm lib/locale/es/LC_MESSAGES +@dirrm lib/locale/es +@dirrm lib/locale/eo/LC_MESSAGES +@dirrm lib/locale/eo +@dirrm lib/locale/en_GB/LC_MESSAGES +@dirrm lib/locale/en_GB +@dirrm lib/locale/el/LC_MESSAGES +@dirrm lib/locale/el +@dirrm lib/locale/de/LC_MESSAGES +@dirrm lib/locale/de +@dirrm lib/locale/da/LC_MESSAGES +@dirrm lib/locale/da +@dirrm lib/locale/cs/LC_MESSAGES +@dirrm lib/locale/cs +@dirrm lib/locale/ca@valencia/LC_MESSAGES +@dirrm lib/locale/ca@valencia +@dirrm lib/locale/ca/LC_MESSAGES +@dirrm lib/locale/ca +@dirrm lib/locale/bn_IN/LC_MESSAGES +@dirrm lib/locale/bn_IN +@dirrm lib/locale/bg_BG/LC_MESSAGES +@dirrm lib/locale/bg_BG +@dirrm lib/locale/bg/LC_MESSAGES +@dirrm lib/locale/bg +@dirrm lib/locale/as/LC_MESSAGES +@dirrm lib/locale/as +@dirrm lib/locale/ar/LC_MESSAGES +@dirrm lib/locale/ar +@dirrm lib/locale +@dirrm lib/gtk-3.0/modules +@dirrm lib/gtk-3.0 +@dirrm lib/gtk-2.0/modules +@dirrm lib/gtk-2.0 +@dirrm lib/gnome-settings-daemon-3.0/gtk-modules +@dirrm lib/gnome-settings-daemon-3.0 +@dirrm lib/girepository-1.0 +@dirrm include/PackageKit/plugin +@dirrm include/PackageKit/packagekit-glib2 +@dirrm include/PackageKit +@dirrm etc/sysconfig +@dirrm etc/profile.d +@dirrm etc/dbus-1/system.d +@dirrm etc/dbus-1 +@dirrm etc/cron.daily +@dirrm %%ETCDIR%%/events/pre-transaction.d +@dirrm %%ETCDIR%%/events/post-transaction.d +@dirrm %%ETCDIR%%/events +@dirrm %%ETCDIR%% From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 12:33:20 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9654A34F for ; Wed, 19 Jun 2013 12:33:20 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 846861DF3 for ; Wed, 19 Jun 2013 12:33:20 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JCXKZw060052 for ; Wed, 19 Jun 2013 12:33:20 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JCXKx8059895 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 12:33:20 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 12:33:20 GMT Message-Id: <201306191233.r5JCXKx8059895@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253238 - in soc2013/jmuniz: . KPackageKit KPackageKit/Apper-0.7.2 KPackageKit/Apper-0.7.2/apper KPackageKit/KPackageKit-0.6.3.3 KPackageKit/KPackageKit-0.6.3.3/kpackagekit PackageKi... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 12:33:20 -0000 Author: jmuniz Date: Wed Jun 19 12:33:20 2013 New Revision: 253238 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253238 Log: Finished creating initial directory structure, added base files for all related ports Added: soc2013/jmuniz/KPackageKit/ soc2013/jmuniz/KPackageKit/Apper-0.7.2/ soc2013/jmuniz/KPackageKit/Apper-0.7.2/apper/ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/distinfo soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/pkg-descr soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/pkg-plist soc2013/jmuniz/PackageKit-Setter/ soc2013/jmuniz/PackageKit-qt4/ soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/ soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/ soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/pkg-plist soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.8.9/ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/distinfo soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist soc2013/jmuniz/gnome-packagekit/ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/Makefile soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/distinfo soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-check-update.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-dbus-task.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-dbus.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-firmware.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-hardware.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-watch.c soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/pkg-descr soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/pkg-plist soc2013/jmuniz/gnome-packagekit/gnome-packagekit-3.8.2/ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-3.8.2/gnome-packagekit/ Replaced: soc2013/jmuniz/COPYING soc2013/jmuniz/PackageKit/ soc2013/jmuniz/README Added: soc2013/jmuniz/COPYING ============================================================================== Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/Makefile Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,33 @@ +# New ports collection makefile for: kpackagekit +# Date created: 11 May 2010 +# Whom: Alberto Villa +# +# $FreeBSD: ports-mgmt/kpackagekit/Makefile 316407 2013-04-24 07:35:40Z ak $ + +PORTNAME= KPackageKit +PORTVERSION= 0.6.3.3 +PORTREVISION= 2 +CATEGORIES= ports-mgmt sysutils kde +MASTER_SITES= http://opendesktop.org/CONTENT/content-files/ +DISTNAME= 84745-${PORTNAME:L}-${PORTVERSION} + +MAINTAINER= kde@FreeBSD.org +COMMENT= KDE interface for PackageKit + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= packagekit-qt.14:${PORTSDIR}/ports-mgmt/packagekit-qt4 + +USE_BZIP2= yes +USE_GNOME= pkgconfig +USE_KDE4= automoc4 kdehier kdelibs kdeprefix +USE_QT4= moc_build qmake_build rcc_build uic_build +MAKE_JOBS_SAFE= yes +USES= cmake gettext +LDFLAGS+= -L${LOCALBASE}/lib +USE_LDCONFIG= yes + +WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION} + +.include Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/distinfo Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,2 @@ +SHA256 (84745-kpackagekit-0.6.3.3.tar.bz2) = d1f969062f2dbbdcef2ea4f80a95c4072136b46c1e2e094d2500752b6857c300 +SIZE (84745-kpackagekit-0.6.3.3.tar.bz2) = 690938 Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/pkg-descr Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,9 @@ +KPackageKit is the KDE interface for PackageKit. It features +everything Gnome PackageKit does except: +- install catalog; +- service pack; +- a D-Bus session interface. +These items are not mandatory since they are more features of the GUI +itself than a feature in PackageKit. + +WWW: http://opendesktop.org/content/show.php/KPackageKit?content=84745 Added: soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/KPackageKit/KPackageKit-0.6.3.3/kpackagekit/pkg-plist Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,89 @@ +bin/kpackagekit +lib/kde4/kcm_kpk_addrm.so +lib/kde4/kcm_kpk_settings.so +lib/kde4/kcm_kpk_update.so +lib/kde4/kded_kpackagekitd.so +lib/kde4/libexec/kpackagekitsmarticon +lib/libkpackagekitlib.so +share/applications/kde4/kpackagekit.desktop +share/apps/KPackageKitSmartIcon/KPackageKitSmartIcon.notifyrc +share/apps/kpackagekit/icons/hicolor/22x22/actions/package-wait.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/distro-upgrade.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/kpk-important.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/kpk-package-add.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-clean-up.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-download.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-info.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-installed.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-orign.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-removed.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-rollback.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-update.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-wait.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package-working.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/package.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/refresh-cache.png +share/apps/kpackagekit/icons/hicolor/48x48/actions/search-package.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-cleaning-up.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-downloading.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-installing.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-refresh-cache.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-searching.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-testing.png +share/apps/kpackagekit/icons/hicolor/48x48/animations/pk-waiting.png +share/apps/kpackagekit/icons/hicolor/48x48/categories/kpk-desktop-gnome.png +share/apps/kpackagekit/icons/hicolor/48x48/categories/kpk-desktop-xfce.png +share/dbus-1/services/org.freedesktop.PackageKit.service +share/dbus-1/services/org.kde.KPackageKitSmartIcon.service +share/kde4/services/kded/kpackagekitd.desktop +share/kde4/services/kpk_addrm.desktop +share/kde4/services/kpk_settings.desktop +share/kde4/services/kpk_update.desktop +share/kde4/services/settings-manage-software.desktop +share/locale/ast/LC_MESSAGES/kpackagekit.mo +share/locale/bg/LC_MESSAGES/kpackagekit.mo +share/locale/ca/LC_MESSAGES/kpackagekit.mo +share/locale/ca@valencia/LC_MESSAGES/kpackagekit.mo +share/locale/cs/LC_MESSAGES/kpackagekit.mo +share/locale/da/LC_MESSAGES/kpackagekit.mo +share/locale/de/LC_MESSAGES/kpackagekit.mo +share/locale/el/LC_MESSAGES/kpackagekit.mo +share/locale/en_GB/LC_MESSAGES/kpackagekit.mo +share/locale/eo/LC_MESSAGES/kpackagekit.mo +share/locale/es/LC_MESSAGES/kpackagekit.mo +share/locale/et/LC_MESSAGES/kpackagekit.mo +share/locale/fi/LC_MESSAGES/kpackagekit.mo +share/locale/fr/LC_MESSAGES/kpackagekit.mo +share/locale/ga/LC_MESSAGES/kpackagekit.mo +share/locale/gl/LC_MESSAGES/kpackagekit.mo +share/locale/hu/LC_MESSAGES/kpackagekit.mo +share/locale/it/LC_MESSAGES/kpackagekit.mo +share/locale/ja/LC_MESSAGES/kpackagekit.mo +share/locale/lt/LC_MESSAGES/kpackagekit.mo +share/locale/nb/LC_MESSAGES/kpackagekit.mo +share/locale/nds/LC_MESSAGES/kpackagekit.mo +share/locale/nl/LC_MESSAGES/kpackagekit.mo +share/locale/nn/LC_MESSAGES/kpackagekit.mo +share/locale/pa/LC_MESSAGES/kpackagekit.mo +share/locale/pl/LC_MESSAGES/kpackagekit.mo +share/locale/pt/LC_MESSAGES/kpackagekit.mo +share/locale/pt_BR/LC_MESSAGES/kpackagekit.mo +share/locale/ro/LC_MESSAGES/kpackagekit.mo +share/locale/ru/LC_MESSAGES/kpackagekit.mo +share/locale/sk/LC_MESSAGES/kpackagekit.mo +share/locale/sl/LC_MESSAGES/kpackagekit.mo +share/locale/sv/LC_MESSAGES/kpackagekit.mo +share/locale/tr/LC_MESSAGES/kpackagekit.mo +share/locale/uk/LC_MESSAGES/kpackagekit.mo +share/locale/zh_CN/LC_MESSAGES/kpackagekit.mo +share/locale/zh_TW/LC_MESSAGES/kpackagekit.mo +@dirrm share/apps/kpackagekit/icons/hicolor/48x48/categories +@dirrm share/apps/kpackagekit/icons/hicolor/48x48/animations +@dirrm share/apps/kpackagekit/icons/hicolor/48x48/actions +@dirrm share/apps/kpackagekit/icons/hicolor/48x48 +@dirrm share/apps/kpackagekit/icons/hicolor/22x22/actions +@dirrm share/apps/kpackagekit/icons/hicolor/22x22 +@dirrm share/apps/kpackagekit/icons/hicolor +@dirrm share/apps/kpackagekit/icons +@dirrm share/apps/kpackagekit +@dirrm share/apps/KPackageKitSmartIcon Added: soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/Makefile Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,22 @@ +# New ports collection makefile for: PackageKit-qt +# Date created: 5 jan 2009 +# Whom: Koop Mast +# +# $FreeBSD: ports/ports-mgmt/packagekit-qt4/Makefile,v 1.4 2012/11/17 06:00:45 svnexp Exp $ +# $MCom: ports/ports-mgmt/packagekit-qt4/Makefile,v 1.1 2010/01/08 02:16:38 kwm Exp $ +# + +PORTREVISION= 1 +PKGNAMESUFFIX= -qt4 + +COMMENT= Qt4 bindings to packagekit + +IGNORE= does not build with Qt 4.8 + +MASTERDIR= ${.CURDIR}/../../ports-mgmt/packagekit +BUILD_WRKSRC= ${WRKSRC}/lib/packagekit-qt +INSTALL_WRKSRC= ${WRKSRC}/lib/packagekit-qt +SLAVEPORT= qt4 +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" Added: soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit-qt4/PackageKit-qt4-0.6.11/packagekit-qt4/pkg-plist Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,15 @@ +include/PackageKit/packagekit-qt/QPackageKit +include/PackageKit/packagekit-qt/bitfield.h +include/PackageKit/packagekit-qt/client.h +include/PackageKit/packagekit-qt/enum.h +include/PackageKit/packagekit-qt/package.h +include/PackageKit/packagekit-qt/transaction.h +lib/libpackagekit-qt.a +lib/libpackagekit-qt.la +lib/libpackagekit-qt.so +lib/libpackagekit-qt.so.14 +libdata/pkgconfig/packagekit-qt.pc +share/cmake/Modules/FindQPackageKit.cmake +@dirrmtry share/cmake/Modules +@dirrmtry share/cmake +@dirrm include/PackageKit/packagekit-qt Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/Makefile Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,69 @@ +# Created by: Anders F Bjorklund + +# $FreeBSD$ + +PORTNAME= PackageKit +PORTVERSION= 0.8.9 +#PORTREVISION= 0 +CATEGORIES= ports-mgmt sysutils +MASTER_SITES= http://www.packagekit.org/releases/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER= jmuniz@FreeBSD.org +COMMENT= DBUS packaging abstraction layer + +BUILD_DEPENDS= intltool>=0.35.0:{PORTSDIR}/textproc/intltool \ + glib>=2.14.0:{PORTSDIR}/devel/glib \ + dbus>=1.1.3:{PORTSDIR}/devel/dbus \ + dbus-glib>=0.74.0:{PORTSDIR}/devel/dbus-glib \ + polkit>=0.9:{PORTSDIR}/sysutils/polkit +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + ck-connector:${PORTSDIR}/sysutils/consolekit +RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ + ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + +USE_GMAKE= yes +USES= gettext +USE_PYTHON_BUILD= 2.5+ +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS+= --with-security-framework=polkit \ + --localstatedir=/var \ + --disable-maintainer-mode \ + --disable-gtk-doc \ + --disable-systemd \ + --disable-bash-completion \ + --enable-dummy \ + --with-default-backend=ports \ + --disable-networkmanager \ + --disable-connman \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-man-pages \ + --disable-nls + +MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" + +post-install: +.if !defined(${SLAVEPORT}) + @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ + ${PREFIX}/share/PackageKit/transactions.db + @-update-mime-database ${PREFIX}/share/mime > /dev/null +.endif + +.include + +#change default backend +#provide option to select a single or multiple backends +#add pk_backend_select script which takes one argument, the name of the backend, and help; responds to bad names or syntax +#patch in pk_backend_select and make sure it is in pkg-plist +#add man page support and option +#preserve modified configuration files + +# --enable-ports \ +# --with-default-backend=ports \ +# --localstatedir=/var + Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/distinfo Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,2 @@ +SHA256 (PackageKit-0.8.9.tar.xz) = b103ca03c91526ef9077049367c2b100e7d04f0af942193a43275c2c8a2f1559 +SIZE (PackageKit-0.8.9.tar.xz) = 1524568 Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-descr Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,4 @@ +PackageKit is a DBUS abstraction layer that allows the session user to manage +packages in a secure way using a cross-distro, cross-architecture API. + +WWW: http://www.packagekit.org/ \ No newline at end of file Added: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,468 @@ +bin/packagekit-bugreport.sh +bin/pk-debuginfo-install +bin/pkcon +bin/pkgenpack +bin/pkmon + +%%ETCDIR%%/CommandNotFound.conf + + +%%ETCDIR%%/PackageKit.conf + +%%ETCDIR%%/Vendor.conf +%%ETCDIR%%/events/post-transaction.d/README +%%ETCDIR%%/events/pre-transaction.d/README +etc/cron.daily/packagekit-background.cron +etc/dbus-1/system.d/org.freedesktop.PackageKit.conf +etc/profile.d/PackageKit.sh +etc/sysconfig/packagekit-background +include/PackageKit/packagekit-glib2/packagekit.h +include/PackageKit/packagekit-glib2/pk-bitfield.h +include/PackageKit/packagekit-glib2/pk-catalog.h +include/PackageKit/packagekit-glib2/pk-category.h +include/PackageKit/packagekit-glib2/pk-client-helper.h +include/PackageKit/packagekit-glib2/pk-client-sync.h +include/PackageKit/packagekit-glib2/pk-client.h +include/PackageKit/packagekit-glib2/pk-common.h +include/PackageKit/packagekit-glib2/pk-control-sync.h +include/PackageKit/packagekit-glib2/pk-control.h +include/PackageKit/packagekit-glib2/pk-desktop.h +include/PackageKit/packagekit-glib2/pk-details.h +include/PackageKit/packagekit-glib2/pk-distro-upgrade.h +include/PackageKit/packagekit-glib2/pk-enum-types.h +include/PackageKit/packagekit-glib2/pk-enum.h +include/PackageKit/packagekit-glib2/pk-error.h +include/PackageKit/packagekit-glib2/pk-eula-required.h +include/PackageKit/packagekit-glib2/pk-files.h +include/PackageKit/packagekit-glib2/pk-item-progress.h +include/PackageKit/packagekit-glib2/pk-media-change-required.h +include/PackageKit/packagekit-glib2/pk-message.h +include/PackageKit/packagekit-glib2/pk-package-id.h +include/PackageKit/packagekit-glib2/pk-package-ids.h +include/PackageKit/packagekit-glib2/pk-package-sack-sync.h +include/PackageKit/packagekit-glib2/pk-package-sack.h +include/PackageKit/packagekit-glib2/pk-package.h +include/PackageKit/packagekit-glib2/pk-progress.h +include/PackageKit/packagekit-glib2/pk-repo-detail.h +include/PackageKit/packagekit-glib2/pk-repo-signature-required.h +include/PackageKit/packagekit-glib2/pk-require-restart.h +include/PackageKit/packagekit-glib2/pk-results.h +include/PackageKit/packagekit-glib2/pk-service-pack.h +include/PackageKit/packagekit-glib2/pk-source.h +include/PackageKit/packagekit-glib2/pk-task-sync.h +include/PackageKit/packagekit-glib2/pk-task.h +include/PackageKit/packagekit-glib2/pk-transaction-list.h +include/PackageKit/packagekit-glib2/pk-transaction-past.h +include/PackageKit/packagekit-glib2/pk-update-detail.h +include/PackageKit/packagekit-glib2/pk-version.h +include/PackageKit/plugin/packagekit-plugin.h +include/PackageKit/plugin/pk-backend-job.h +include/PackageKit/plugin/pk-backend-spawn.h +include/PackageKit/plugin/pk-backend.h +include/PackageKit/plugin/pk-conf.h +include/PackageKit/plugin/pk-plugin.h +include/PackageKit/plugin/pk-shared.h +include/PackageKit/plugin/pk-transaction.h +lib/girepository-1.0/PackageKitGlib-1.0.typelib +lib/girepository-1.0/PackageKitPlugin-1.0.typelib +lib/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop +lib/gtk-2.0/modules/libpk-gtk-module.a +lib/gtk-2.0/modules/libpk-gtk-module.la +lib/gtk-2.0/modules/libpk-gtk-module.so +lib/gtk-3.0/modules/libpk-gtk-module.a +lib/gtk-3.0/modules/libpk-gtk-module.la +lib/gtk-3.0/modules/libpk-gtk-module.so +lib/libpackagekit-glib2.a +lib/libpackagekit-glib2.la +lib/libpackagekit-glib2.so +lib/libpackagekit-glib2.so.16 +lib/locale/ar/LC_MESSAGES/PackageKit.mo +lib/locale/as/LC_MESSAGES/PackageKit.mo +lib/locale/bg/LC_MESSAGES/PackageKit.mo +lib/locale/bg_BG/LC_MESSAGES/PackageKit.mo +lib/locale/bn_IN/LC_MESSAGES/PackageKit.mo +lib/locale/ca/LC_MESSAGES/PackageKit.mo +lib/locale/ca@valencia/LC_MESSAGES/PackageKit.mo +lib/locale/cs/LC_MESSAGES/PackageKit.mo +lib/locale/da/LC_MESSAGES/PackageKit.mo +lib/locale/de/LC_MESSAGES/PackageKit.mo +lib/locale/el/LC_MESSAGES/PackageKit.mo +lib/locale/en_GB/LC_MESSAGES/PackageKit.mo +lib/locale/eo/LC_MESSAGES/PackageKit.mo +lib/locale/es/LC_MESSAGES/PackageKit.mo +lib/locale/eu/LC_MESSAGES/PackageKit.mo +lib/locale/fa_IR/LC_MESSAGES/PackageKit.mo +lib/locale/fi/LC_MESSAGES/PackageKit.mo +lib/locale/fr/LC_MESSAGES/PackageKit.mo +lib/locale/ga/LC_MESSAGES/PackageKit.mo +lib/locale/gl/LC_MESSAGES/PackageKit.mo +lib/locale/gu/LC_MESSAGES/PackageKit.mo +lib/locale/he/LC_MESSAGES/PackageKit.mo +lib/locale/hi/LC_MESSAGES/PackageKit.mo +lib/locale/hu/LC_MESSAGES/PackageKit.mo +lib/locale/id/LC_MESSAGES/PackageKit.mo +lib/locale/it/LC_MESSAGES/PackageKit.mo +lib/locale/it_IT/LC_MESSAGES/PackageKit.mo +lib/locale/ja/LC_MESSAGES/PackageKit.mo +lib/locale/kk/LC_MESSAGES/PackageKit.mo +lib/locale/kn/LC_MESSAGES/PackageKit.mo +lib/locale/ko/LC_MESSAGES/PackageKit.mo +lib/locale/lt/LC_MESSAGES/PackageKit.mo +lib/locale/lv/LC_MESSAGES/PackageKit.mo +lib/locale/ml/LC_MESSAGES/PackageKit.mo +lib/locale/mr/LC_MESSAGES/PackageKit.mo +lib/locale/ms/LC_MESSAGES/PackageKit.mo +lib/locale/nb/LC_MESSAGES/PackageKit.mo +lib/locale/nl/LC_MESSAGES/PackageKit.mo +lib/locale/or/LC_MESSAGES/PackageKit.mo +lib/locale/pa/LC_MESSAGES/PackageKit.mo +lib/locale/pl/LC_MESSAGES/PackageKit.mo +lib/locale/pt/LC_MESSAGES/PackageKit.mo +lib/locale/pt_BR/LC_MESSAGES/PackageKit.mo +lib/locale/ro/LC_MESSAGES/PackageKit.mo +lib/locale/ru/LC_MESSAGES/PackageKit.mo +lib/locale/sk/LC_MESSAGES/PackageKit.mo +lib/locale/sl/LC_MESSAGES/PackageKit.mo +lib/locale/sr/LC_MESSAGES/PackageKit.mo +lib/locale/sr@latin/LC_MESSAGES/PackageKit.mo +lib/locale/sv/LC_MESSAGES/PackageKit.mo +lib/locale/ta/LC_MESSAGES/PackageKit.mo +lib/locale/te/LC_MESSAGES/PackageKit.mo +lib/locale/th/LC_MESSAGES/PackageKit.mo +lib/locale/tr/LC_MESSAGES/PackageKit.mo +lib/locale/uk/LC_MESSAGES/PackageKit.mo +lib/locale/wa/LC_MESSAGES/PackageKit.mo +lib/locale/zh_CN/LC_MESSAGES/PackageKit.mo +lib/locale/zh_TW/LC_MESSAGES/PackageKit.mo +lib/packagekit-backend/libpk_backend_dummy.a +lib/packagekit-backend/libpk_backend_dummy.la +lib/packagekit-backend/libpk_backend_dummy.so +lib/packagekit-backend/libpk_backend_test_fail.a +lib/packagekit-backend/libpk_backend_test_fail.la +lib/packagekit-backend/libpk_backend_test_fail.so +lib/packagekit-backend/libpk_backend_test_nop.a +lib/packagekit-backend/libpk_backend_test_nop.la +lib/packagekit-backend/libpk_backend_test_nop.so +lib/packagekit-backend/libpk_backend_test_spawn.a +lib/packagekit-backend/libpk_backend_test_spawn.la +lib/packagekit-backend/libpk_backend_test_spawn.so +lib/packagekit-backend/libpk_backend_test_succeed.a +lib/packagekit-backend/libpk_backend_test_succeed.la +lib/packagekit-backend/libpk_backend_test_succeed.so +lib/packagekit-backend/libpk_backend_test_thread.a +lib/packagekit-backend/libpk_backend_test_thread.la +lib/packagekit-backend/libpk_backend_test_thread.so +lib/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.a +lib/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.la +lib/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.so +lib/packagekit-plugins/libpk_plugin-clear-firmware-requests.a +lib/packagekit-plugins/libpk_plugin-clear-firmware-requests.la +lib/packagekit-plugins/libpk_plugin-clear-firmware-requests.so +lib/packagekit-plugins/libpk_plugin-no-update-process.a +lib/packagekit-plugins/libpk_plugin-no-update-process.la +lib/packagekit-plugins/libpk_plugin-no-update-process.so +lib/packagekit-plugins/libpk_plugin-require-restart.a +lib/packagekit-plugins/libpk_plugin-require-restart.la +lib/packagekit-plugins/libpk_plugin-require-restart.so +lib/packagekit-plugins/libpk_plugin-scan-desktop-files.a +lib/packagekit-plugins/libpk_plugin-scan-desktop-files.la +lib/packagekit-plugins/libpk_plugin-scan-desktop-files.so +lib/packagekit-plugins/libpk_plugin-systemd-updates.a +lib/packagekit-plugins/libpk_plugin-systemd-updates.la +lib/packagekit-plugins/libpk_plugin-systemd-updates.so +lib/packagekit-plugins/libpk_plugin-update-check-processes.a +lib/packagekit-plugins/libpk_plugin-update-check-processes.la +lib/packagekit-plugins/libpk_plugin-update-check-processes.so +lib/packagekit-plugins/libpk_plugin-update-package-cache.a +lib/packagekit-plugins/libpk_plugin-update-package-cache.la +lib/packagekit-plugins/libpk_plugin-update-package-cache.so +lib/packagekit-plugins/libpk_plugin_scripts.a +lib/packagekit-plugins/libpk_plugin_scripts.la +lib/packagekit-plugins/libpk_plugin_scripts.so +%%PYTHON_SITELIBDIR%%/packagekit/__init__.py +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyc +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyo +%%PYTHON_SITELIBDIR%%/packagekit/backend.py +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyc +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyo +%%PYTHON_SITELIBDIR%%/packagekit/enums.py +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyc +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyo +%%PYTHON_SITELIBDIR%%/packagekit/filter.py +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyc +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyo +%%PYTHON_SITELIBDIR%%/packagekit/misc.py +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyc +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyo +%%PYTHON_SITELIBDIR%%/packagekit/package.py +%%PYTHON_SITELIBDIR%%/packagekit/package.pyc +%%PYTHON_SITELIBDIR%%/packagekit/package.pyo +%%PYTHON_SITELIBDIR%%/packagekit/progress.py +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyc +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyo +libdata/pkgconfig/packagekit-glib2.pc +libdata/pkgconfig/packagekit-plugin.pc +libexec/packagekitd +libexec/pk-clear-offline-update +libexec/pk-command-not-found +libexec/pk-offline-update +libexec/pk-trigger-offline-update +%%DATADIR%%/helpers/test_spawn/search-name.sh +%%DATADIR%%/pk-upgrade-distro.sh +%%DATADIR%%/transactions.db +share/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml +share/dbus-1/interfaces/org.freedesktop.PackageKit.xml +share/dbus-1/system-services/org.freedesktop.PackageKit.service +share/gir-1.0/PackageKitGlib-1.0.gir +share/gir-1.0/PackageKitPlugin-1.0.gir +share/gtk-doc/html/PackageKit/PackageKit-pk-bitfield.html +share/gtk-doc/html/PackageKit/PackageKit-pk-client-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-common.html +share/gtk-doc/html/PackageKit/PackageKit-pk-control-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-enum.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-id.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-ids.html +share/gtk-doc/html/PackageKit/PackageKit-pk-task-sync.html +share/gtk-doc/html/PackageKit/PackageKit.devhelp2 +share/gtk-doc/html/PackageKit/PackageKit.html +share/gtk-doc/html/PackageKit/PkCatalog.html +share/gtk-doc/html/PackageKit/PkCategory.html +share/gtk-doc/html/PackageKit/PkClient.html +share/gtk-doc/html/PackageKit/PkControl.html +share/gtk-doc/html/PackageKit/PkDesktop.html +share/gtk-doc/html/PackageKit/PkDetails.html +share/gtk-doc/html/PackageKit/PkDistroUpgrade.html +share/gtk-doc/html/PackageKit/PkError.html +share/gtk-doc/html/PackageKit/PkEulaRequired.html +share/gtk-doc/html/PackageKit/PkFiles.html +share/gtk-doc/html/PackageKit/PkMediaChangeRequired.html +share/gtk-doc/html/PackageKit/PkMessage.html +share/gtk-doc/html/PackageKit/PkPackage.html +share/gtk-doc/html/PackageKit/PkPackageSack.html +share/gtk-doc/html/PackageKit/PkProgress.html +share/gtk-doc/html/PackageKit/PkRepoDetail.html +share/gtk-doc/html/PackageKit/PkRepoSignatureRequired.html +share/gtk-doc/html/PackageKit/PkRequireRestart.html +share/gtk-doc/html/PackageKit/PkResults.html +share/gtk-doc/html/PackageKit/PkServicePack.html +share/gtk-doc/html/PackageKit/PkTask.html +share/gtk-doc/html/PackageKit/PkTransactionPast.html +share/gtk-doc/html/PackageKit/PkUpdateDetail.html +share/gtk-doc/html/PackageKit/Transaction.html +share/gtk-doc/html/PackageKit/api-reference.html +share/gtk-doc/html/PackageKit/backend-compiled.html +share/gtk-doc/html/PackageKit/backend-spawn.html +share/gtk-doc/html/PackageKit/backends-spawn-common.html +share/gtk-doc/html/PackageKit/backends-spawn-methods.html +share/gtk-doc/html/PackageKit/concepts.html +share/gtk-doc/html/PackageKit/config-main.html +share/gtk-doc/html/PackageKit/developer-faq.html +share/gtk-doc/html/PackageKit/faq.html +share/gtk-doc/html/PackageKit/home.png +share/gtk-doc/html/PackageKit/index.html +share/gtk-doc/html/PackageKit/index.sgml +share/gtk-doc/html/PackageKit/introduction-backends.html +share/gtk-doc/html/PackageKit/introduction-cancellation.html +share/gtk-doc/html/PackageKit/introduction-errors.html +share/gtk-doc/html/PackageKit/introduction-group-type.html +share/gtk-doc/html/PackageKit/introduction-ideas-filters.html +share/gtk-doc/html/PackageKit/introduction-ideas-status.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactionid.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactions.html +share/gtk-doc/html/PackageKit/introduction.html +share/gtk-doc/html/PackageKit/left.png +share/gtk-doc/html/PackageKit/libpackagekit-gobject.html +share/gtk-doc/html/PackageKit/libpackagekit-helpers.html +share/gtk-doc/html/PackageKit/pk-faq-error-code.png +share/gtk-doc/html/PackageKit/pk-faq-filter.png +share/gtk-doc/html/PackageKit/pk-faq-status.png +share/gtk-doc/html/PackageKit/pk-structure.png +share/gtk-doc/html/PackageKit/pk-structure.svg +share/gtk-doc/html/PackageKit/pk-transactions-auto-untrusted.png +share/gtk-doc/html/PackageKit/pk-transactions-download.png +share/gtk-doc/html/PackageKit/pk-transactions-failure.png +share/gtk-doc/html/PackageKit/pk-transactions-repair-required.png +share/gtk-doc/html/PackageKit/pk-transactions-set-locale.png +share/gtk-doc/html/PackageKit/pk-transactions-sig-install.png +share/gtk-doc/html/PackageKit/pk-transactions-success.png +share/gtk-doc/html/PackageKit/pk-transactions-trusted.png +share/gtk-doc/html/PackageKit/pk-transactions.svg +share/gtk-doc/html/PackageKit/right.png +share/gtk-doc/html/PackageKit/specification.html +share/gtk-doc/html/PackageKit/style.css +share/gtk-doc/html/PackageKit/up.png +share/mime/XMLnamespaces +share/mime/aliases +share/mime/application/x-catalog.xml +share/mime/application/x-package-list.xml +share/mime/application/x-servicepack.xml +share/mime/generic-icons +share/mime/globs +share/mime/globs2 +share/mime/icons +share/mime/magic +share/mime/mime.cache +share/mime/packages/packagekit-catalog.xml +share/mime/packages/packagekit-package-list.xml +share/mime/packages/packagekit-servicepack.xml +share/mime/subclasses +share/mime/treemagic +share/mime/types +share/mime/version +share/polkit-1/actions/org.freedesktop.packagekit.policy +@dirrm share/polkit-1/actions +@dirrm share/polkit-1 +@dirrm share/mime/packages +@dirrm share/mime/application +@dirrm share/mime +@dirrm share/gtk-doc/html/PackageKit +@dirrm share/gtk-doc/html +@dirrm share/gtk-doc +@dirrm share/gir-1.0 +@dirrm share/dbus-1/system-services +@dirrm share/dbus-1/interfaces +@dirrm share/dbus-1 +@dirrm %%DATADIR%%/helpers/test_spawn +@dirrm %%DATADIR%%/helpers +@dirrm %%DATADIR%% +@dirrm %%PYTHON_SITELIBDIR%%/packagekit +@dirrm %%PYTHON_SITELIBDIR%% +@dirrm lib/python2.7 +@dirrm lib/packagekit-plugins +@dirrm lib/packagekit-backend +@dirrm lib/locale/zh_TW/LC_MESSAGES +@dirrm lib/locale/zh_TW +@dirrm lib/locale/zh_CN/LC_MESSAGES +@dirrm lib/locale/zh_CN +@dirrm lib/locale/wa/LC_MESSAGES +@dirrm lib/locale/wa +@dirrm lib/locale/uk/LC_MESSAGES +@dirrm lib/locale/uk +@dirrm lib/locale/tr/LC_MESSAGES +@dirrm lib/locale/tr +@dirrm lib/locale/th/LC_MESSAGES +@dirrm lib/locale/th +@dirrm lib/locale/te/LC_MESSAGES +@dirrm lib/locale/te +@dirrm lib/locale/ta/LC_MESSAGES +@dirrm lib/locale/ta +@dirrm lib/locale/sv/LC_MESSAGES +@dirrm lib/locale/sv +@dirrm lib/locale/sr@latin/LC_MESSAGES +@dirrm lib/locale/sr@latin +@dirrm lib/locale/sr/LC_MESSAGES +@dirrm lib/locale/sr +@dirrm lib/locale/sl/LC_MESSAGES +@dirrm lib/locale/sl +@dirrm lib/locale/sk/LC_MESSAGES +@dirrm lib/locale/sk +@dirrm lib/locale/ru/LC_MESSAGES +@dirrm lib/locale/ru +@dirrm lib/locale/ro/LC_MESSAGES +@dirrm lib/locale/ro +@dirrm lib/locale/pt_BR/LC_MESSAGES +@dirrm lib/locale/pt_BR +@dirrm lib/locale/pt/LC_MESSAGES +@dirrm lib/locale/pt +@dirrm lib/locale/pl/LC_MESSAGES +@dirrm lib/locale/pl +@dirrm lib/locale/pa/LC_MESSAGES +@dirrm lib/locale/pa +@dirrm lib/locale/or/LC_MESSAGES +@dirrm lib/locale/or +@dirrm lib/locale/nl/LC_MESSAGES +@dirrm lib/locale/nl +@dirrm lib/locale/nb/LC_MESSAGES +@dirrm lib/locale/nb +@dirrm lib/locale/ms/LC_MESSAGES +@dirrm lib/locale/ms +@dirrm lib/locale/mr/LC_MESSAGES +@dirrm lib/locale/mr +@dirrm lib/locale/ml/LC_MESSAGES +@dirrm lib/locale/ml +@dirrm lib/locale/lv/LC_MESSAGES +@dirrm lib/locale/lv +@dirrm lib/locale/lt/LC_MESSAGES +@dirrm lib/locale/lt +@dirrm lib/locale/ko/LC_MESSAGES +@dirrm lib/locale/ko +@dirrm lib/locale/kn/LC_MESSAGES +@dirrm lib/locale/kn +@dirrm lib/locale/kk/LC_MESSAGES +@dirrm lib/locale/kk +@dirrm lib/locale/ja/LC_MESSAGES +@dirrm lib/locale/ja +@dirrm lib/locale/it_IT/LC_MESSAGES +@dirrm lib/locale/it_IT +@dirrm lib/locale/it/LC_MESSAGES +@dirrm lib/locale/it +@dirrm lib/locale/id/LC_MESSAGES +@dirrm lib/locale/id +@dirrm lib/locale/hu/LC_MESSAGES +@dirrm lib/locale/hu +@dirrm lib/locale/hi/LC_MESSAGES +@dirrm lib/locale/hi +@dirrm lib/locale/he/LC_MESSAGES +@dirrm lib/locale/he +@dirrm lib/locale/gu/LC_MESSAGES +@dirrm lib/locale/gu +@dirrm lib/locale/gl/LC_MESSAGES +@dirrm lib/locale/gl +@dirrm lib/locale/ga/LC_MESSAGES +@dirrm lib/locale/ga +@dirrm lib/locale/fr/LC_MESSAGES +@dirrm lib/locale/fr +@dirrm lib/locale/fi/LC_MESSAGES +@dirrm lib/locale/fi +@dirrm lib/locale/fa_IR/LC_MESSAGES +@dirrm lib/locale/fa_IR +@dirrm lib/locale/eu/LC_MESSAGES +@dirrm lib/locale/eu +@dirrm lib/locale/es/LC_MESSAGES +@dirrm lib/locale/es +@dirrm lib/locale/eo/LC_MESSAGES +@dirrm lib/locale/eo +@dirrm lib/locale/en_GB/LC_MESSAGES +@dirrm lib/locale/en_GB +@dirrm lib/locale/el/LC_MESSAGES +@dirrm lib/locale/el +@dirrm lib/locale/de/LC_MESSAGES +@dirrm lib/locale/de +@dirrm lib/locale/da/LC_MESSAGES +@dirrm lib/locale/da +@dirrm lib/locale/cs/LC_MESSAGES +@dirrm lib/locale/cs +@dirrm lib/locale/ca@valencia/LC_MESSAGES +@dirrm lib/locale/ca@valencia +@dirrm lib/locale/ca/LC_MESSAGES +@dirrm lib/locale/ca +@dirrm lib/locale/bn_IN/LC_MESSAGES +@dirrm lib/locale/bn_IN +@dirrm lib/locale/bg_BG/LC_MESSAGES +@dirrm lib/locale/bg_BG +@dirrm lib/locale/bg/LC_MESSAGES +@dirrm lib/locale/bg +@dirrm lib/locale/as/LC_MESSAGES +@dirrm lib/locale/as +@dirrm lib/locale/ar/LC_MESSAGES +@dirrm lib/locale/ar +@dirrm lib/locale +@dirrm lib/gtk-3.0/modules +@dirrm lib/gtk-3.0 +@dirrm lib/gtk-2.0/modules +@dirrm lib/gtk-2.0 +@dirrm lib/gnome-settings-daemon-3.0/gtk-modules +@dirrm lib/gnome-settings-daemon-3.0 +@dirrm lib/girepository-1.0 +@dirrm include/PackageKit/plugin +@dirrm include/PackageKit/packagekit-glib2 +@dirrm include/PackageKit +@dirrm etc/sysconfig +@dirrm etc/profile.d +@dirrm etc/dbus-1/system.d +@dirrm etc/dbus-1 +@dirrm etc/cron.daily +@dirrm %%ETCDIR%%/events/pre-transaction.d +@dirrm %%ETCDIR%%/events/post-transaction.d +@dirrm %%ETCDIR%%/events +@dirrm %%ETCDIR%% Added: soc2013/jmuniz/README ============================================================================== Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/Makefile Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,50 @@ +# New ports collection makefile for: gnome-packagekit +# Date created: 15 Aug 2009 +# Whom: Anders F Bjorklund +# +# $FreeBSD: ports-mgmt/gnome-packagekit/Makefile 316683 2013-04-27 18:25:24Z mva $ +# $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.25 2011/06/14 20:18:46 mezz Exp $ + +PORTNAME= gnome-packagekit +PORTVERSION= 2.32.0 +PORTREVISION= 3 +CATEGORIES= ports-mgmt sysutils gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= PackageKit client programs for the GNOME desktop + +BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit \ + notify.4:${PORTSDIR}/devel/libnotify \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + upower-glib.1:${PORTSDIR}/sysutils/upower \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra + +USE_GMAKE= yes +USE_BZIP2= yes +USE_GNOME= gnomeprefix intlhack gconf2 gnomemenus gnomedocutils \ + desktopfileutils +USES= gettext pathfix iconv +USE_PYTHON_BUILD=2.5+ +GCONF_SCHEMAS= gnome-packagekit.schemas +INSTALLS_ICONS= yes +INSTALLS_OMF= yes +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +MAN1= gpk-application.1 gpk-backend-status.1 gpk-install-local-file.1 \ + gpk-install-mime-type.1 gpk-install-package-name.1 \ + gpk-install-provide-file.1 gpk-prefs.1 gpk-repo.1 gpk-update-icon.1 \ + gpk-update-viewer.1 + +pre-configure: + @${REINPLACE_CMD} -E -e 's/.*CPPFLAGS.*-Werror/#$$&/' \ + -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure + +post-install: + @-update-desktop-database + +.include Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/distinfo Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,2 @@ +SHA256 (gnome-packagekit-2.32.0.tar.bz2) = bc68dad11e5c9db89dcd2548a29736456063b38aa99633f9cfc4427a77a4525e +SIZE (gnome-packagekit-2.32.0.tar.bz2) = 3638533 Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,11 @@ +--- data/gnome-packagekit.schemas.in.orig 2010-02-27 14:22:29.000000000 +0800 ++++ data/gnome-packagekit.schemas.in 2010-02-27 14:22:45.000000000 +0800 +@@ -540,7 +540,7 @@ + /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module + gnome-packagekit + bool +- true ++ false + + GTK+ module for font installation + This key determines if applications should be able to prompt for fonts Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-check-update.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-check-update.c Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,66 @@ +--- src/gpk-check-update.c.orig 2010-09-22 17:20:47.000000000 +0200 ++++ src/gpk-check-update.c 2011-03-07 18:27:18.000000000 +0100 +@@ -388,9 +388,8 @@ gpk_check_update_finished_notify (GpkChe + } + + /* TRANSLATORS: title: system update completed all okay */ +- notification = notify_notification_new_with_status_icon (_("The system update has completed"), +- message_text->str, "help-browser", +- cupdate->priv->status_icon); ++ notification = notify_notification_new (_("The system update has completed"), ++ message_text->str, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + if (restart == PK_RESTART_ENUM_SYSTEM) { +@@ -456,7 +455,7 @@ gpk_check_update_show_error (GpkCheckUpd + + /* do the bubble */ + egg_debug ("title=%s, message=%s", title, message); +- notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon); ++ notification = notify_notification_new (title, message, "help-browser"); + if (notification == NULL) { + egg_warning ("failed to get bubble"); + goto out; +@@ -656,7 +655,7 @@ gpk_check_update_critical_updates_warnin + + /* do the bubble */ + egg_debug ("title=%s, message=%s", title, message); +- notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon); ++ notification = notify_notification_new (title, message, "help-browser"); + if (notification == NULL) { + egg_warning ("failed to get bubble"); + return; +@@ -782,9 +781,8 @@ gpk_check_update_check_on_battery (GpkCh + /* TRANSLATORS: policy says update, but we are on battery and so prompt */ + message = _("Automatic updates are not being installed as the computer is running on battery power"); + /* TRANSLATORS: informs user will not install by default */ +- notification = notify_notification_new_with_status_icon (_("Updates not installed"), +- message, "help-browser", +- cupdate->priv->status_icon); ++ notification = notify_notification_new (_("Updates not installed"), ++ message, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + // notify_notification_add_action (notification, "do-not-show-update-not-battery", +@@ -839,10 +837,10 @@ gpk_check_update_notify_doing_updates (G + goto out; + + /* TRANSLATORS: title: notification when we scheduled an automatic update */ +- notification = notify_notification_new_with_status_icon (_("Updates are being installed"), ++ notification = notify_notification_new (_("Updates are being installed"), + /* TRANSLATORS: tell the user why the hard disk is grinding... */ + _("Updates are being automatically installed on your computer"), +- "software-update-urgent", cupdate->priv->status_icon); ++ "software-update-urgent"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + /* TRANSLATORS: button: cancel the update system */ +@@ -1328,7 +1326,7 @@ gpk_check_update_get_distro_upgrades_fin + + /* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */ + title = _("Distribution upgrades available"); +- notification = notify_notification_new_with_status_icon (title, string->str, "help-browser", cupdate->priv->status_icon); ++ notification = notify_notification_new (title, string->str, "help-browser"); + if (notification == NULL) { + egg_warning ("failed to make bubble"); + goto out; Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-dbus-task.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-dbus-task.c Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,11 @@ +--- src/gpk-dbus-task.c.orig 2011-03-07 18:28:01.000000000 +0100 ++++ src/gpk-dbus-task.c 2011-03-07 18:28:10.000000000 +0100 +@@ -377,7 +377,7 @@ gpk_dbus_task_handle_error (GpkDbusTask + dtask->priv->cached_error_code = g_object_ref (error_code); + + /* do the bubble */ +- notification = notify_notification_new (title, message, "help-browser", NULL); ++ notification = notify_notification_new (title, message, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, "show-error-details", Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-dbus.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-dbus.c Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,59 @@ +--- src/gpk-dbus.c.orig 2010-07-20 09:56:17.000000000 +0200 ++++ src/gpk-dbus.c 2010-07-21 17:14:31.000000000 +0200 +@@ -32,6 +32,12 @@ + #include + #endif /* HAVE_UNISTD_H */ + ++#ifdef __FreeBSD__ ++#include ++//#include ++#include ++#endif ++ + #include + #include + +@@ -212,6 +218,13 @@ gpk_dbus_get_exec_for_sender (GpkDbus *d + GError *error = NULL; + guint pid; + ++#ifdef __FreeBSD__ ++ size_t len; ++ int mib[4]; ++/* figure out how to use the above GError */ ++ int error2; ++#endif ++ + g_return_val_if_fail (PK_IS_DBUS (dbus), NULL); + g_return_val_if_fail (sender != NULL, NULL); + +@@ -223,7 +236,29 @@ gpk_dbus_get_exec_for_sender (GpkDbus *d + } + + /* get command line from proc */ ++#ifdef __FreeBSD__ ++ mib[0] = CTL_KERN; ++ mib[1] = KERN_PROC; ++ mib[2] = KERN_PROC_PATHNAME; ++ mib[3] = pid; ++ ++ len = 0; ++ ++ error2 = sysctl(mib, 4, NULL, &len, NULL, 0); ++ if (error2) { ++ printf ("Error: %s\n", strerror(error2)); ++ goto out; ++ } ++ ++ filename = malloc(len); ++ error2 = sysctl(mib, 4, filename, &len, NULL, 0); ++ if (error2) { ++ printf ("Error: %s\n", strerror(error2)); ++ goto out; ++ } ++#else + filename = g_strdup_printf ("/proc/%i/exe", pid); ++#endif + cmdline = g_file_read_link (filename, &error); + if (cmdline == NULL) { + egg_warning ("failed to find exec: %s", error->message); Added: soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-firmware.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/gnome-packagekit/gnome-packagekit-2.32.0/gnome-packagekit/files/patch-src_gpk-firmware.c Wed Jun 19 12:33:20 2013 (r253238) @@ -0,0 +1,38 @@ +--- src/gpk-firmware.c.orig 2011-03-07 18:20:16.000000000 +0100 ++++ src/gpk-firmware.c 2011-03-07 18:20:38.000000000 +0100 +@@ -268,7 +268,7 @@ gpk_firmware_require_restart (GpkFirmwar + message = _("You will need to restart this computer before the hardware will work correctly."); + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +@@ -303,7 +303,7 @@ gpk_firmware_require_replug (GpkFirmware + message = _("You will need to remove and then reinsert the hardware before it will work correctly."); + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +@@ -330,7 +330,7 @@ gpk_firmware_require_nothing (GpkFirmwar + message = _("Your hardware has been set up and is now ready to use."); + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +@@ -624,7 +624,7 @@ gpk_firmware_timeout_cb (gpointer data) + } + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 12:50:12 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 822ED6BB for ; Wed, 19 Jun 2013 12:50:12 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 647CC1ECD for ; Wed, 19 Jun 2013 12:50:12 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JCoCqg031062 for ; Wed, 19 Jun 2013 12:50:12 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JCoCAW031044 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 12:50:12 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 12:50:12 GMT Message-Id: <201306191250.r5JCoCAW031044@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253239 - soc2013/jmuniz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 12:50:12 -0000 Author: jmuniz Date: Wed Jun 19 12:50:12 2013 New Revision: 253239 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253239 Log: Added the GPLv2 content to COPYING Modified: soc2013/jmuniz/COPYING Modified: soc2013/jmuniz/COPYING ============================================================================== --- soc2013/jmuniz/COPYING Wed Jun 19 12:33:20 2013 (r253238) +++ soc2013/jmuniz/COPYING Wed Jun 19 12:50:12 2013 (r253239) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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 Library General +Public License instead of this License. From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 12:52:15 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C62B3707 for ; Wed, 19 Jun 2013 12:52:15 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 9E7471EE8 for ; Wed, 19 Jun 2013 12:52:15 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JCqFi2099437 for ; Wed, 19 Jun 2013 12:52:15 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JCqFUi099431 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 12:52:15 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 12:52:15 GMT Message-Id: <201306191252.r5JCqFUi099431@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253240 - soc2013/jmuniz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 12:52:15 -0000 Author: jmuniz Date: Wed Jun 19 12:52:15 2013 New Revision: 253240 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253240 Log: Introduced TODO list Added: soc2013/jmuniz/TODO Added: soc2013/jmuniz/TODO ============================================================================== From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 13:00:35 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3E6DAB75 for ; Wed, 19 Jun 2013 13:00:35 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 304F21F65 for ; Wed, 19 Jun 2013 13:00:35 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JD0ZpZ032607 for ; Wed, 19 Jun 2013 13:00:35 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JD0Z9W032602 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 13:00:35 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 13:00:35 GMT Message-Id: <201306191300.r5JD0Z9W032602@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253241 - soc2013/jmuniz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 13:00:35 -0000 Author: jmuniz Date: Wed Jun 19 13:00:34 2013 New Revision: 253241 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253241 Log: Added information about the project to the readme Modified: soc2013/jmuniz/README Modified: soc2013/jmuniz/README ============================================================================== --- soc2013/jmuniz/README Wed Jun 19 12:52:15 2013 (r253240) +++ soc2013/jmuniz/README Wed Jun 19 13:00:34 2013 (r253241) @@ -0,0 +1,8 @@ +Qt and QTK+ Front Ends for PKGNG +Google Summer of Code Project +Justin Edward Muniz +FreeBSD +2013 + +Project homepage: https://wiki.freebsd.org/SummerOfCode2013/pkgQtGtk + From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 14:38:13 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A4D41B88 for ; Wed, 19 Jun 2013 14:38:13 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 93A5C16B4 for ; Wed, 19 Jun 2013 14:38:13 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JEcDlp058082 for ; Wed, 19 Jun 2013 14:38:13 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JEcDVf058074 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 14:38:13 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 19 Jun 2013 14:38:13 GMT Message-Id: <201306191438.r5JEcDVf058074@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253243 - in soc2013/jmuniz/PackageKit: PackageKit-0.6.11/packagekit PackageKit-0.6.11/packagekit/files PackageKit-0.8.9/packagekit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 14:38:13 -0000 Author: jmuniz Date: Wed Jun 19 14:38:13 2013 New Revision: 253243 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253243 Log: Deleted empty lines in PackageKit-0.8.9 pkg-plist, added base file for PackageKit-0.6.11 port Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/distinfo soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/patch-etc_Vendor.conf soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/patch-src_pk-lsof.c soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/pkg-descr soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/pkg-plist Modified: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile Wed Jun 19 14:38:13 2013 (r253243) @@ -0,0 +1,103 @@ +# Created by: Anders F Bjorklund +# $FreeBSD: ports-mgmt/packagekit/Makefile 316683 2013-04-27 18:25:24Z mva $ +# $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.26 2010/10/10 15:49:51 marcus Exp $ + +PORTNAME= PackageKit +PORTVERSION= 0.6.11 +PORTREVISION?= 3 +CATEGORIES= ports-mgmt sysutils +MASTER_SITES= http://www.packagekit.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT?= DBUS packaging abstraction layer + +BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ + ck-connector:${PORTSDIR}/sysutils/consolekit +RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ + ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info + +USE_GMAKE= yes +USES= gettext iconv +USE_GNOME= glib20 intltool gnomehier +USE_SQLITE= 3 +USE_LDCONFIG= yes +USE_PYTHON_BUILD= 2.5+ +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +CONFIGURE_ARGS+=--with-security-framework=polkit \ + --localstatedir=/var \ + --disable-gtk-doc \ + --disable-managed \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-networkmanager \ + --disable-connman + +MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" + +MAKE_JOBS_UNSAFE=yes + +.if !defined(SLAVEPORT) +OPTIONS_DEFINE= PORTS MANPAGES +OPTIONS_DEFAULT=PORTS +PORTS_DESC=Use portupgrade for management, dummy if disabled + +.include + +. if ${PORT_OPTIONS:MMANPAGES} +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 +. else +CONFIGURE_ARGS+=--disable-man-pages +. endif + +. if ${PORT_OPTIONS:MPORTS} +RUN_DEPENDS+= ${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade +USE_RUBY= yes +CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports +PLIST_SUB+= PORTS="" +. else +CONFIGURE_ARGS+=--disable-ports --with-default-backend=dummy +PLIST_SUB+= PORTS="@comment " +. endif + +CONFIGURE_ARGS+=--disable-gtk-module +PLIST_SUB+= GTK="@comment " + +CONFIGURE_ARGS+=--disable-qt + +.elif defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4" +LIB_DEPENDS+= packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit + +CONFIGURE_ARGS+=--enable-qt +LIB_DEPENDS+= cppunit-1.12:${PORTSDIR}/devel/cppunit +USE_QT4+= dbus gui xml sql moc_build +#.include "${PORTSDIR}/Mk/bsd.qt.mk" +.endif + +post-patch: + @${REINPLACE_CMD} -E -e 's/.*WARNINGFLAGS_CPP.*-Werror/#$$&/' \ + -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/pk-lsof.c + @${REINPLACE_CMD} -e 's|girepositry|girepository|g' \ + ${WRKSRC}/lib/packagekit-glib2/Makefile.in + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + '/xsltproc/s|.xsl [$$]? &> /dev|.xsl $$? > /dev|g' + +post-install: +.if !defined(SLAVEPORT) + @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ + ${PREFIX}/share/PackageKit/transactions.db + @-update-mime-database ${PREFIX}/share/mime > /dev/null +.endif + +.include Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/distinfo Wed Jun 19 14:38:13 2013 (r253243) @@ -0,0 +1,2 @@ +SHA256 (PackageKit-0.6.11.tar.gz) = f19c41ec216e390fa70002c8b683f40ca557e2ecfecfe931e035b91ddc9dbf6b +SIZE (PackageKit-0.6.11.tar.gz) = 9407231 Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/patch-etc_Vendor.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/patch-etc_Vendor.conf Wed Jun 19 14:38:13 2013 (r253243) @@ -0,0 +1,11 @@ +--- etc/Vendor.conf.orig 2010-01-08 02:40:37.000000000 +0100 ++++ etc/Vendor.conf 2010-01-08 02:41:09.000000000 +0100 +@@ -54,7 +54,7 @@ MimeUrl=none + # The vendor name shown for the 'vendor' group + # + # default=My Vendor +-VendorName=My Vendor ++VendorName=FreeBSD + + # The vendor icon name shown for the 'vendor' group + # Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/patch-src_pk-lsof.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/files/patch-src_pk-lsof.c Wed Jun 19 14:38:13 2013 (r253243) @@ -0,0 +1,11 @@ +--- src/pk-lsof.c.orig 2010-10-21 18:50:10.000000000 +0200 ++++ src/pk-lsof.c 2010-11-27 14:39:56.000000000 +0100 +@@ -154,7 +154,7 @@ + g_return_val_if_fail (PK_IS_LSOF (lsof), FALSE); + + /* try to find lsof */ +- lsof_name = "/usr/sbin/lsof"; ++ lsof_name = "%%LOCALBASE%%/sbin/lsof"; + ret = g_file_test (lsof_name, G_FILE_TEST_EXISTS); + if (!ret) { + lsof_name = "/usr/bin/lsof"; Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/pkg-descr Wed Jun 19 14:38:13 2013 (r253243) @@ -0,0 +1,4 @@ +PackageKit is a DBUS abstraction layer that allows the session user to manage +packages in a secure way using a cross-distro, cross-architecture API. + +WWW: http://www.packagekit.org Added: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/pkg-plist Wed Jun 19 14:38:13 2013 (r253243) @@ -0,0 +1,446 @@ +bin/packagekit-bugreport.sh +bin/pk-debuginfo-install +bin/pkcon +bin/pkgenpack +bin/pkmon +@unexec if cmp -s %D/etc/PackageKit/CommandNotFound.conf %D/etc/PackageKit/CommandNotFound.conf.default; then rm -f %D/etc/PackageKit/CommandNotFound.conf; fi +etc/PackageKit/CommandNotFound.conf +@exec [ -f %B/CommandNotFound.conf ] || cp %B/%f %B/CommandNotFound.conf +@unexec if cmp -s %D/etc/PackageKit/PackageKit.conf %D/etc/PackageKit/PackageKit.conf.default; then rm -f %D/etc/PackageKit/PackageKit.conf; fi +etc/PackageKit/PackageKit.conf +@exec [ -f %B/PackageKit.conf ] || cp %B/%f %B/PackageKit.conf +etc/PackageKit/Vendor.conf +etc/PackageKit/events/post-transaction.d/README +etc/PackageKit/events/pre-transaction.d/README +etc/bash_completion.d/pk-completion.bash +etc/cron.daily/packagekit-background.cron +etc/dbus-1/system.d/org.freedesktop.PackageKit.conf +etc/profile.d/PackageKit.sh +etc/sysconfig/packagekit-background +include/PackageKit/backend/pk-backend-spawn.h +include/PackageKit/backend/pk-backend.h +include/PackageKit/packagekit-glib2/packagekit.h +include/PackageKit/packagekit-glib2/pk-bitfield.h +include/PackageKit/packagekit-glib2/pk-catalog.h +include/PackageKit/packagekit-glib2/pk-category.h +include/PackageKit/packagekit-glib2/pk-client-helper.h +include/PackageKit/packagekit-glib2/pk-client-sync.h +include/PackageKit/packagekit-glib2/pk-client.h +include/PackageKit/packagekit-glib2/pk-common.h +include/PackageKit/packagekit-glib2/pk-control-sync.h +include/PackageKit/packagekit-glib2/pk-control.h +include/PackageKit/packagekit-glib2/pk-desktop.h +include/PackageKit/packagekit-glib2/pk-details.h +include/PackageKit/packagekit-glib2/pk-distro-upgrade.h +include/PackageKit/packagekit-glib2/pk-enum.h +include/PackageKit/packagekit-glib2/pk-error.h +include/PackageKit/packagekit-glib2/pk-eula-required.h +include/PackageKit/packagekit-glib2/pk-files.h +include/PackageKit/packagekit-glib2/pk-media-change-required.h +include/PackageKit/packagekit-glib2/pk-message.h +include/PackageKit/packagekit-glib2/pk-package-id.h +include/PackageKit/packagekit-glib2/pk-package-ids.h +include/PackageKit/packagekit-glib2/pk-package-sack-sync.h +include/PackageKit/packagekit-glib2/pk-package-sack.h +include/PackageKit/packagekit-glib2/pk-package.h +include/PackageKit/packagekit-glib2/pk-progress.h +include/PackageKit/packagekit-glib2/pk-repo-detail.h +include/PackageKit/packagekit-glib2/pk-repo-signature-required.h +include/PackageKit/packagekit-glib2/pk-require-restart.h +include/PackageKit/packagekit-glib2/pk-results.h +include/PackageKit/packagekit-glib2/pk-service-pack.h +include/PackageKit/packagekit-glib2/pk-source.h +include/PackageKit/packagekit-glib2/pk-task.h +include/PackageKit/packagekit-glib2/pk-transaction-list.h +include/PackageKit/packagekit-glib2/pk-transaction-past.h +include/PackageKit/packagekit-glib2/pk-update-detail.h +include/PackageKit/packagekit-glib2/pk-version.h +lib/girepository-1.0/PackageKitGlib-1.0.typelib +lib/libpackagekit-glib2.a +lib/libpackagekit-glib2.la +lib/libpackagekit-glib2.so +lib/libpackagekit-glib2.so.14 +lib/packagekit-backend/libpk_backend_dummy.a +lib/packagekit-backend/libpk_backend_dummy.la +lib/packagekit-backend/libpk_backend_dummy.so +%%PORTS%%lib/packagekit-backend/libpk_backend_ports.a +%%PORTS%%lib/packagekit-backend/libpk_backend_ports.la +%%PORTS%%lib/packagekit-backend/libpk_backend_ports.so +lib/packagekit-backend/libpk_backend_test_fail.a +lib/packagekit-backend/libpk_backend_test_fail.la +lib/packagekit-backend/libpk_backend_test_fail.so +lib/packagekit-backend/libpk_backend_test_nop.a +lib/packagekit-backend/libpk_backend_test_nop.la +lib/packagekit-backend/libpk_backend_test_nop.so +lib/packagekit-backend/libpk_backend_test_spawn.a +lib/packagekit-backend/libpk_backend_test_spawn.la +lib/packagekit-backend/libpk_backend_test_spawn.so +lib/packagekit-backend/libpk_backend_test_succeed.a +lib/packagekit-backend/libpk_backend_test_succeed.la +lib/packagekit-backend/libpk_backend_test_succeed.so +lib/packagekit-backend/libpk_backend_test_thread.a +lib/packagekit-backend/libpk_backend_test_thread.la +lib/packagekit-backend/libpk_backend_test_thread.so +lib/polkit-1/extensions/libpackagekit-action-lookup.a +lib/polkit-1/extensions/libpackagekit-action-lookup.la +lib/polkit-1/extensions/libpackagekit-action-lookup.so +%%PYTHON_SITELIBDIR%%/packagekit/__init__.py +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyc +%%PYTHON_SITELIBDIR%%/packagekit/__init__.pyo +%%PYTHON_SITELIBDIR%%/packagekit/backend.py +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyc +%%PYTHON_SITELIBDIR%%/packagekit/backend.pyo +%%PYTHON_SITELIBDIR%%/packagekit/client.py +%%PYTHON_SITELIBDIR%%/packagekit/client.pyc +%%PYTHON_SITELIBDIR%%/packagekit/client.pyo +%%PYTHON_SITELIBDIR%%/packagekit/enums.py +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyc +%%PYTHON_SITELIBDIR%%/packagekit/enums.pyo +%%PYTHON_SITELIBDIR%%/packagekit/filter.py +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyc +%%PYTHON_SITELIBDIR%%/packagekit/filter.pyo +%%PYTHON_SITELIBDIR%%/packagekit/frontend.py +%%PYTHON_SITELIBDIR%%/packagekit/frontend.pyc +%%PYTHON_SITELIBDIR%%/packagekit/frontend.pyo +%%PYTHON_SITELIBDIR%%/packagekit/misc.py +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyc +%%PYTHON_SITELIBDIR%%/packagekit/misc.pyo +%%PYTHON_SITELIBDIR%%/packagekit/package.py +%%PYTHON_SITELIBDIR%%/packagekit/package.pyc +%%PYTHON_SITELIBDIR%%/packagekit/package.pyo +%%PYTHON_SITELIBDIR%%/packagekit/pkdbus.py +%%PYTHON_SITELIBDIR%%/packagekit/pkdbus.pyc +%%PYTHON_SITELIBDIR%%/packagekit/pkdbus.pyo +%%PYTHON_SITELIBDIR%%/packagekit/pkexceptions.py +%%PYTHON_SITELIBDIR%%/packagekit/pkexceptions.pyc +%%PYTHON_SITELIBDIR%%/packagekit/pkexceptions.pyo +%%PYTHON_SITELIBDIR%%/packagekit/progress.py +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyc +%%PYTHON_SITELIBDIR%%/packagekit/progress.pyo +libdata/pkgconfig/packagekit-glib2.pc +libexec/packagekitd +libexec/pk-command-not-found +%%PORTS%%share/PackageKit/helpers/ports/portsBackend.rb +%%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/enums.rb +%%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/prints.rb +share/PackageKit/helpers/test_spawn/search-name.sh +share/PackageKit/pk-upgrade-distro.sh +share/PackageKit/transactions.db +@exec mkdir -p /var/lib/PackageKit +@exec if [ ! -f /var/lib/PackageKit/%f ]; then cp -f %B/%f /var/lib/PackageKit; chmod o-r /var/lib/PackageKit/%f; fi +share/PackageKit/website/img/assassin.png +share/PackageKit/website/img/author-alefebvre.png +share/PackageKit/website/img/author-btimothy.png +share/PackageKit/website/img/author-caglar.png +share/PackageKit/website/img/author-elliot.png +share/PackageKit/website/img/author-glatzor.png +share/PackageKit/website/img/author-grzegorzdabrowski.png +share/PackageKit/website/img/author-hughsie.png +share/PackageKit/website/img/author-jbowes.png +share/PackageKit/website/img/author-kenvandine.png +share/PackageKit/website/img/author-lmacken.png +share/PackageKit/website/img/author-rnorwood.png +share/PackageKit/website/img/author-timlau.png +share/PackageKit/website/img/author-tomparker.png +share/PackageKit/website/img/author-unknown.png +share/PackageKit/website/img/author-zodman.png +share/PackageKit/website/img/dialog-information.png +share/PackageKit/website/img/gpk-added-deps.png +share/PackageKit/website/img/gpk-application-groups.png +share/PackageKit/website/img/gpk-application-search.png +share/PackageKit/website/img/gpk-auto-update.png +share/PackageKit/website/img/gpk-backend-status.png +share/PackageKit/website/img/gpk-battery.png +share/PackageKit/website/img/gpk-client-codecs.png +share/PackageKit/website/img/gpk-client-firmware.png +share/PackageKit/website/img/gpk-client-font.png +share/PackageKit/website/img/gpk-client-mime-type.png +share/PackageKit/website/img/gpk-distro-upgrade-notify.png +share/PackageKit/website/img/gpk-eula.png +share/PackageKit/website/img/gpk-inhibit.png +share/PackageKit/website/img/gpk-log.png +share/PackageKit/website/img/gpk-markdown.png +share/PackageKit/website/img/gpk-network.png +share/PackageKit/website/img/gpk-prefs.png +share/PackageKit/website/img/gpk-progress.png +share/PackageKit/website/img/gpk-remove-confirm.png +share/PackageKit/website/img/gpk-repo-auth.png +share/PackageKit/website/img/gpk-repo-more.png +share/PackageKit/website/img/gpk-repo.png +share/PackageKit/website/img/gpk-require-restart.png +share/PackageKit/website/img/gpk-run-application.png +share/PackageKit/website/img/gpk-service-pack.png +share/PackageKit/website/img/gpk-signature.png +share/PackageKit/website/img/gpk-updates-overview.png +share/PackageKit/website/img/gpk-updates-warning.png +share/PackageKit/website/img/gpk-updates.png +share/PackageKit/website/img/gpk-waiting.png +share/PackageKit/website/img/kpk-confirm.png +share/PackageKit/website/img/kpk-information.png +share/PackageKit/website/img/kpk-notify.png +share/PackageKit/website/img/kpk-progress.png +share/PackageKit/website/img/kpk-search.png +share/PackageKit/website/img/kpk-settings.png +share/PackageKit/website/img/kpk-update.png +share/PackageKit/website/img/large-accessories-text-editor.png +share/PackageKit/website/img/large-application-certificate.png +share/PackageKit/website/img/large-applications-development.png +share/PackageKit/website/img/large-authors.png +share/PackageKit/website/img/large-dialog-information.png +share/PackageKit/website/img/large-emblem-favorite.png +share/PackageKit/website/img/large-emblem-photos.png +share/PackageKit/website/img/large-help-browser.png +share/PackageKit/website/img/large-preferences-system.png +share/PackageKit/website/img/large-system-users.png +share/PackageKit/website/img/packagekit.png +share/PackageKit/website/img/pk-command-not-found.png +share/PackageKit/website/img/pk-opensuse-updater.png +share/PackageKit/website/img/pk-self-check.png +share/PackageKit/website/img/pk-update-bugfix.png +share/PackageKit/website/img/pk-update-enhancement.png +share/PackageKit/website/img/pk-update-high.png +share/PackageKit/website/img/pk-update-low.png +share/PackageKit/website/img/pk-update-normal.png +share/PackageKit/website/img/pk-update-security.png +share/PackageKit/website/img/pk-web-plugin.png +share/PackageKit/website/img/profile-bevan.png +share/PackageKit/website/img/profile-graham.png +share/PackageKit/website/img/profile-suzan.png +share/PackageKit/website/img/status-bad.png +share/PackageKit/website/img/status-good.png +share/PackageKit/website/img/thumbnails/assassin.png +share/PackageKit/website/img/thumbnails/gpk-added-deps.png +share/PackageKit/website/img/thumbnails/gpk-application-groups.png +share/PackageKit/website/img/thumbnails/gpk-application-search.png +share/PackageKit/website/img/thumbnails/gpk-auto-update.png +share/PackageKit/website/img/thumbnails/gpk-backend-status.png +share/PackageKit/website/img/thumbnails/gpk-battery.png +share/PackageKit/website/img/thumbnails/gpk-client-codecs.png +share/PackageKit/website/img/thumbnails/gpk-client-firmware.png +share/PackageKit/website/img/thumbnails/gpk-client-font.png +share/PackageKit/website/img/thumbnails/gpk-client-mime-type.png +share/PackageKit/website/img/thumbnails/gpk-distro-upgrade-notify.png +share/PackageKit/website/img/thumbnails/gpk-eula.png +share/PackageKit/website/img/thumbnails/gpk-inhibit.png +share/PackageKit/website/img/thumbnails/gpk-log.png +share/PackageKit/website/img/thumbnails/gpk-markdown.png +share/PackageKit/website/img/thumbnails/gpk-network.png +share/PackageKit/website/img/thumbnails/gpk-prefs.png +share/PackageKit/website/img/thumbnails/gpk-progress.png +share/PackageKit/website/img/thumbnails/gpk-remove-confirm.png +share/PackageKit/website/img/thumbnails/gpk-repo-auth.png +share/PackageKit/website/img/thumbnails/gpk-repo-more.png +share/PackageKit/website/img/thumbnails/gpk-repo.png +share/PackageKit/website/img/thumbnails/gpk-require-restart.png +share/PackageKit/website/img/thumbnails/gpk-run-application.png +share/PackageKit/website/img/thumbnails/gpk-service-pack.png +share/PackageKit/website/img/thumbnails/gpk-signature.png +share/PackageKit/website/img/thumbnails/gpk-updates-overview.png +share/PackageKit/website/img/thumbnails/gpk-updates-warning.png +share/PackageKit/website/img/thumbnails/gpk-updates.png +share/PackageKit/website/img/thumbnails/gpk-waiting.png +share/PackageKit/website/img/thumbnails/kpk-confirm.png +share/PackageKit/website/img/thumbnails/kpk-information.png +share/PackageKit/website/img/thumbnails/kpk-notify.png +share/PackageKit/website/img/thumbnails/kpk-progress.png +share/PackageKit/website/img/thumbnails/kpk-search.png +share/PackageKit/website/img/thumbnails/kpk-settings.png +share/PackageKit/website/img/thumbnails/kpk-update.png +share/PackageKit/website/img/thumbnails/pk-command-not-found.png +share/PackageKit/website/img/thumbnails/pk-opensuse-updater.png +share/PackageKit/website/img/thumbnails/pk-self-check.png +share/PackageKit/website/img/thumbnails/pk-update-bugfix.png +share/PackageKit/website/img/thumbnails/pk-update-enhancement.png +share/PackageKit/website/img/thumbnails/pk-update-high.png +share/PackageKit/website/img/thumbnails/pk-update-low.png +share/PackageKit/website/img/thumbnails/pk-update-normal.png +share/PackageKit/website/img/thumbnails/pk-update-security.png +share/PackageKit/website/img/thumbnails/pk-web-plugin.png +share/PackageKit/website/img/users-fedora.png +share/PackageKit/website/img/users-foresight.png +share/PackageKit/website/img/users-kubuntu.png +share/PackageKit/website/img/users-moblin.png +share/PackageKit/website/index.html +share/PackageKit/website/pk-authors.html +share/PackageKit/website/pk-bugs.html +share/PackageKit/website/pk-download.html +share/PackageKit/website/pk-faq.html +share/PackageKit/website/pk-help.html +share/PackageKit/website/pk-intro.html +share/PackageKit/website/pk-matrix.html +share/PackageKit/website/pk-package-not-found.html +share/PackageKit/website/pk-profiles.html +share/PackageKit/website/pk-reference.html +share/PackageKit/website/pk-screenshots.html +share/PackageKit/website/pk-using.html +share/PackageKit/website/style.css +share/dbus-1/system-services/org.freedesktop.PackageKit.service +share/gir-1.0/PackageKitGlib-1.0.gir +share/gtk-doc/html/PackageKit/PackageKit-pk-bitfield.html +share/gtk-doc/html/PackageKit/PackageKit-pk-client-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-common.html +share/gtk-doc/html/PackageKit/PackageKit-pk-control-sync.html +share/gtk-doc/html/PackageKit/PackageKit-pk-enum.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-id.html +share/gtk-doc/html/PackageKit/PackageKit-pk-package-ids.html +share/gtk-doc/html/PackageKit/PackageKit.devhelp +share/gtk-doc/html/PackageKit/PackageKit.devhelp2 +share/gtk-doc/html/PackageKit/PackageKit.html +share/gtk-doc/html/PackageKit/PkCatalog.html +share/gtk-doc/html/PackageKit/PkCategory.html +share/gtk-doc/html/PackageKit/PkClient.html +share/gtk-doc/html/PackageKit/PkControl.html +share/gtk-doc/html/PackageKit/PkDesktop.html +share/gtk-doc/html/PackageKit/PkDetails.html +share/gtk-doc/html/PackageKit/PkDistroUpgrade.html +share/gtk-doc/html/PackageKit/PkError.html +share/gtk-doc/html/PackageKit/PkEulaRequired.html +share/gtk-doc/html/PackageKit/PkFiles.html +share/gtk-doc/html/PackageKit/PkMediaChangeRequired.html +share/gtk-doc/html/PackageKit/PkMessage.html +share/gtk-doc/html/PackageKit/PkPackage.html +share/gtk-doc/html/PackageKit/PkPackageSack.html +share/gtk-doc/html/PackageKit/PkProgress.html +share/gtk-doc/html/PackageKit/PkRepoDetail.html +share/gtk-doc/html/PackageKit/PkRepoSignatureRequired.html +share/gtk-doc/html/PackageKit/PkRequireRestart.html +share/gtk-doc/html/PackageKit/PkResults.html +share/gtk-doc/html/PackageKit/PkServicePack.html +share/gtk-doc/html/PackageKit/PkTask.html +share/gtk-doc/html/PackageKit/PkTransactionPast.html +share/gtk-doc/html/PackageKit/PkUpdateDetail.html +share/gtk-doc/html/PackageKit/Transaction.html +share/gtk-doc/html/PackageKit/api-reference.html +share/gtk-doc/html/PackageKit/backend-compiled.html +share/gtk-doc/html/PackageKit/backend-spawn.html +share/gtk-doc/html/PackageKit/backends-spawn-common.html +share/gtk-doc/html/PackageKit/backends-spawn-methods.html +share/gtk-doc/html/PackageKit/concepts.html +share/gtk-doc/html/PackageKit/config-main.html +share/gtk-doc/html/PackageKit/developer-faq.html +share/gtk-doc/html/PackageKit/faq.html +share/gtk-doc/html/PackageKit/home.png +share/gtk-doc/html/PackageKit/index.html +share/gtk-doc/html/PackageKit/index.sgml +share/gtk-doc/html/PackageKit/introduction-backends.html +share/gtk-doc/html/PackageKit/introduction-cancellation.html +share/gtk-doc/html/PackageKit/introduction-errors.html +share/gtk-doc/html/PackageKit/introduction-group-type.html +share/gtk-doc/html/PackageKit/introduction-ideas-filters.html +share/gtk-doc/html/PackageKit/introduction-ideas-simultaneous.html +share/gtk-doc/html/PackageKit/introduction-ideas-status.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactionid.html +share/gtk-doc/html/PackageKit/introduction-ideas-transactions.html +share/gtk-doc/html/PackageKit/introduction.html +share/gtk-doc/html/PackageKit/left.png +share/gtk-doc/html/PackageKit/libpackagekit-gobject.html +share/gtk-doc/html/PackageKit/libpackagekit-helpers.html +share/gtk-doc/html/PackageKit/pk-faq-error-code.png +share/gtk-doc/html/PackageKit/pk-faq-filter.png +share/gtk-doc/html/PackageKit/pk-faq-status.png +share/gtk-doc/html/PackageKit/pk-structure.png +share/gtk-doc/html/PackageKit/pk-structure.svg +share/gtk-doc/html/PackageKit/pk-transactions-download.png +share/gtk-doc/html/PackageKit/pk-transactions-failure.png +share/gtk-doc/html/PackageKit/pk-transactions-set-locale.png +share/gtk-doc/html/PackageKit/pk-transactions-sig-install.png +share/gtk-doc/html/PackageKit/pk-transactions-success.png +share/gtk-doc/html/PackageKit/pk-transactions-trusted.png +share/gtk-doc/html/PackageKit/pk-transactions.svg +share/gtk-doc/html/PackageKit/right.png +share/gtk-doc/html/PackageKit/specification.html +share/gtk-doc/html/PackageKit/style.css +share/gtk-doc/html/PackageKit/up.png +share/locale/as/LC_MESSAGES/PackageKit.mo +share/locale/bg/LC_MESSAGES/PackageKit.mo +share/locale/bn_IN/LC_MESSAGES/PackageKit.mo +share/locale/ca/LC_MESSAGES/PackageKit.mo +share/locale/cs/LC_MESSAGES/PackageKit.mo +share/locale/da/LC_MESSAGES/PackageKit.mo +share/locale/de/LC_MESSAGES/PackageKit.mo +share/locale/el/LC_MESSAGES/PackageKit.mo +share/locale/en_GB/LC_MESSAGES/PackageKit.mo +share/locale/es/LC_MESSAGES/PackageKit.mo +share/locale/fi/LC_MESSAGES/PackageKit.mo +share/locale/fr/LC_MESSAGES/PackageKit.mo +share/locale/gu/LC_MESSAGES/PackageKit.mo +share/locale/he/LC_MESSAGES/PackageKit.mo +share/locale/hi/LC_MESSAGES/PackageKit.mo +share/locale/hu/LC_MESSAGES/PackageKit.mo +share/locale/it/LC_MESSAGES/PackageKit.mo +share/locale/ja/LC_MESSAGES/PackageKit.mo +share/locale/kn/LC_MESSAGES/PackageKit.mo +share/locale/ko/LC_MESSAGES/PackageKit.mo +share/locale/lt/LC_MESSAGES/PackageKit.mo +share/locale/ml/LC_MESSAGES/PackageKit.mo +share/locale/mr/LC_MESSAGES/PackageKit.mo +share/locale/ms/LC_MESSAGES/PackageKit.mo +share/locale/nb/LC_MESSAGES/PackageKit.mo +share/locale/nl/LC_MESSAGES/PackageKit.mo +share/locale/or/LC_MESSAGES/PackageKit.mo +share/locale/pa/LC_MESSAGES/PackageKit.mo +share/locale/pl/LC_MESSAGES/PackageKit.mo +share/locale/pt/LC_MESSAGES/PackageKit.mo +share/locale/pt_BR/LC_MESSAGES/PackageKit.mo +share/locale/ro/LC_MESSAGES/PackageKit.mo +share/locale/ru/LC_MESSAGES/PackageKit.mo +share/locale/sk/LC_MESSAGES/PackageKit.mo +share/locale/sr/LC_MESSAGES/PackageKit.mo +share/locale/sr@latin/LC_MESSAGES/PackageKit.mo +share/locale/sv/LC_MESSAGES/PackageKit.mo +share/locale/ta/LC_MESSAGES/PackageKit.mo +share/locale/te/LC_MESSAGES/PackageKit.mo +share/locale/th/LC_MESSAGES/PackageKit.mo +share/locale/tr/LC_MESSAGES/PackageKit.mo +share/locale/uk/LC_MESSAGES/PackageKit.mo +share/locale/zh_CN/LC_MESSAGES/PackageKit.mo +share/locale/zh_TW/LC_MESSAGES/PackageKit.mo +share/mime/packages/packagekit-catalog.xml +share/mime/packages/packagekit-package-list.xml +share/mime/packages/packagekit-servicepack.xml +share/polkit-1/actions/org.freedesktop.packagekit.policy +@exec mkdir -p /var/cache/PackageKit/downloads +@unexec rmdir /var/cache/PackageKit/downloads 2>/dev/null || true +@unexec rmdir /var/cache/PackageKit 2>/dev/null || true +@unexec rmdir /var/cache 2>/dev/null || true +@unexec rmdir /var/lib/PackageKit 2>/dev/null || true +@unexec rmdir /var/lib 2>/dev/null || true +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as +@dirrm share/gtk-doc/html/PackageKit +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc +%%PORTS%%@dirrm share/PackageKit/website/img/thumbnails +%%PORTS%%@dirrm share/PackageKit/website/img +%%PORTS%%@dirrm share/PackageKit/website +%%PORTS%%@dirrm share/PackageKit/helpers/test_spawn +%%PORTS%%@dirrm share/PackageKit/helpers/ports/ruby_packagekit +%%PORTS%%@dirrm share/PackageKit/helpers/ports +%%PORTS%%@dirrm share/PackageKit/helpers +%%PORTS%%@dirrm share/PackageKit +@dirrm %%PYTHON_SITELIBDIR%%/packagekit +@dirrm lib/packagekit-backend +@dirrm include/PackageKit/packagekit-glib2 +@dirrm include/PackageKit/backend +@dirrm include/PackageKit +@dirrmtry etc/sysconfig +@dirrmtry etc/profile.d +@dirrmtry etc/cron.daily +@dirrmtry etc/PackageKit/events/post-transaction.d +@dirrmtry etc/PackageKit/events/pre-transaction.d +@dirrmtry etc/PackageKit/events +@dirrmtry etc/PackageKit +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime Modified: soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist ============================================================================== --- soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist Wed Jun 19 13:37:29 2013 (r253242) +++ soc2013/jmuniz/PackageKit/PackageKit-0.8.9/packagekit/pkg-plist Wed Jun 19 14:38:13 2013 (r253243) @@ -3,12 +3,8 @@ bin/pkcon bin/pkgenpack bin/pkmon - %%ETCDIR%%/CommandNotFound.conf - - %%ETCDIR%%/PackageKit.conf - %%ETCDIR%%/Vendor.conf %%ETCDIR%%/events/post-transaction.d/README %%ETCDIR%%/events/pre-transaction.d/README From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 19:47:56 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 53943270 for ; Wed, 19 Jun 2013 19:47:56 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 436481B79 for ; Wed, 19 Jun 2013 19:47:56 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JJluS9092523 for ; Wed, 19 Jun 2013 19:47:56 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JJlupp092521 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 19:47:56 GMT (envelope-from dpl@FreeBSD.org) Date: Wed, 19 Jun 2013 19:47:56 GMT Message-Id: <201306191947.r5JJlupp092521@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253253 - soc2013/dpl/head/contrib/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 19:47:56 -0000 Author: dpl Date: Wed Jun 19 19:47:55 2013 New Revision: 253253 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253253 Log: Work with PF_LOCAL sockets and fork to separate the bzip2 main program from the compression/uncompression algorithms. Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Wed Jun 19 18:44:55 2013 (r253252) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Wed Jun 19 19:47:55 2013 (r253253) @@ -93,6 +93,9 @@ # if __FreeBSD_version >= 900041 # define CAPSICUM # include +# include +# include +# include # endif # endif @@ -218,6 +221,12 @@ FILE *outputHandleJustInCase; Int32 workFactor; +#ifdef CAPSICUM +int s, s2, len; +struct sockaddr_un sock, remoteSock; +char *sockPath = "/tmp/bzip2"; +#endif + static void panic ( const Char* ) NORETURN; static void ioError ( void ) NORETURN; static void outOfMemory ( void ) NORETURN; @@ -971,9 +980,9 @@ FILE* fp; IntNative fh; fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR); -# ifdef CAPSICUM - cap_rights_limit(fh, CAP_WRITE); -# endif +/*# ifdef CAPSICUM*/ + /*cap_rights_limit(fh, CAP_WRITE);*/ +/*# endif*/ if (fh == -1) return NULL; fp = fdopen(fh, mode); if (fp == NULL) close(fh); @@ -1145,7 +1154,7 @@ { FILE *inStr; FILE *outStr; - Int32 n, i, infd; + Int32 n, i, forkpid, infd; struct MY_STAT statBuf; deleteOutputOnInterrupt = False; @@ -1233,6 +1242,17 @@ saveInputFileMetaInfo ( inName ); } + if ( srcMode != SM_I2O ){ +# ifdef CAPSICUM + infd = open( inName, O_RDONLY ); + /*cap_rights_limit(infd, CAP_READ);*/ + inStr = fdopen ( infd, "rb" ); +# else + infd = NULL; + inStr = fopen ( inName, "rb" ); +# endif + } + switch ( srcMode ) { case SM_I2O: @@ -1250,14 +1270,6 @@ break; case SM_F2O: -# ifdef CAPSICUM - infd = open( inName, O_RDONLY ); - cap_rights_limit(infd, CAP_READ); - inStr = fdopen ( infd, "rb" ); -# else - infd = NULL; - inStr = fopen ( inName, "rb" ); -# endif outStr = stdout; if ( isatty ( fileno ( stdout ) ) ) { fprintf ( stderr, @@ -1278,14 +1290,6 @@ break; case SM_F2F: -# ifdef CAPSICUM - infd = open( inName, O_RDONLY ); - cap_rights_limit(infd, CAP_READ); - inStr = fdopen ( infd, "rb" ); -# else - infd = NULL; - inStr = fopen ( inName, "rb" ); -# endif outStr = fopen_output_safely ( outName, "wb" ); if ( outStr == NULL) { fprintf ( stderr, "%s: Can't create output file %s: %s.\n", @@ -1314,30 +1318,56 @@ fflush ( stderr ); } -# ifdef CAPSICUM - if (cap_enter() < 0) { - fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); - exit(1); - } -# endif +# ifdef CAPSICUM + /* Pass the limited file descriptors with a unix domain socket. */ + switch( forkpid = rfork(RFPROC | RFCFDG) ) { + case ( 0 ): + if (cap_enter() < 0) { + fprintf ( stderr, "%s: Couldn't enter capability mode: %s.\n", + progName, strerror(errno) ); + exit(1); + } - /*--- Now the input and output handles are sane. Do the Biz. ---*/ - outputHandleJustInCase = outStr; - deleteOutputOnInterrupt = True; - compressStream ( inStr, outStr ); - outputHandleJustInCase = NULL; +# endif + /*--- Now the input and output handles are sane. Do the Biz. ---*/ + outputHandleJustInCase = outStr; + deleteOutputOnInterrupt = True; + compressStream ( inStr, outStr ); + outputHandleJustInCase = NULL; + + /*--- If there was an I/O error, we won't get here. ---*/ + if ( srcMode == SM_F2F ) { + applySavedTimeInfoToOutputFile ( outName ); + deleteOutputOnInterrupt = False; + if ( !keepInputFiles ) { + IntNative retVal = remove ( inName ); + ERROR_IF_NOT_ZERO ( retVal ); + } + } + + deleteOutputOnInterrupt = False; - /*--- If there was an I/O error, we won't get here. ---*/ - if ( srcMode == SM_F2F ) { - applySavedTimeInfoToOutputFile ( outName ); - deleteOutputOnInterrupt = False; - if ( !keepInputFiles ) { - IntNative retVal = remove ( inName ); - ERROR_IF_NOT_ZERO ( retVal ); - } +# ifdef CAPSICUM + break; + + case ( -1 ): + fprintf ( stderr, "%s: Couldn't fork: %s.\n", progName, strerror(errno) ); + exit(1); + + default: + listen(s, 2); + len = sizeof(struct sockaddr_un); + accept(s, (struct sockaddr *) &remoteSock, &len); + /* Send the two FDs */ + wait(NULL); + if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ + fprintf ( stderr, "%s: Can't unlink socket: %s.\n", progName, strerror(errno) ); + exit(1); + } + return; } +# endif - deleteOutputOnInterrupt = False; } @@ -1440,6 +1470,17 @@ saveInputFileMetaInfo ( inName ); } + if ( srcMode != SM_I2O ){ +# ifdef CAPSICUM + infd = open( inName, O_RDONLY ); + /*cap_rights_limit(infd, CAP_READ);*/ + inStr = fdopen ( infd, "rb" ); +# else + infd = NULL; + inStr = fopen ( inName, "rb" ); +# endif + } + switch ( srcMode ) { case SM_I2O: @@ -1457,14 +1498,6 @@ break; case SM_F2O: -# ifdef CAPSICUM - infd = open( inName, O_RDONLY ); - cap_rights_limit(infd, CAP_READ); - inStr = fdopen ( infd, "rb" ); -# else - infd = NULL; - inStr = fopen ( inName, "rb" ); -# endif outStr = stdout; if ( inStr == NULL ) { fprintf ( stderr, "%s: Can't open input file %s:%s.\n", @@ -1476,14 +1509,6 @@ break; case SM_F2F: -# ifdef CAPSICUM - infd = open( inName, O_RDONLY ); - cap_rights_limit(infd, CAP_READ); - inStr = fdopen ( infd, "rb" ); -# else - infd = NULL; - inStr = fopen ( inName, "rb" ); -# endif outStr = fopen_output_safely ( outName, "wb" ); if ( outStr == NULL) { fprintf ( stderr, "%s: Can't create output file %s: %s.\n", @@ -1512,13 +1537,6 @@ fflush ( stderr ); } -# ifdef CAPSICUM - if (cap_enter() < 0) { - fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName ); - exit(1); - } -# endif - /*--- Now the input and output handles are sane. Do the Biz. ---*/ outputHandleJustInCase = outStr; deleteOutputOnInterrupt = True; @@ -2009,6 +2027,35 @@ # endif } +# ifdef CAPSICUM + + sock.sun_family = PF_LOCAL; + strncpy(sock.sun_path, sockPath, sizeof(sock.sun_path)); + + if ( (s = socket(PF_LOCAL, SOCK_STREAM, 0)) == -1 ){ + fprintf ( stderr, "%s: Can't create socket: %s.\n", progName, strerror(errno) ); + exit(1); + } + + if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ + fprintf ( stderr, "%s: Can't unlink socket: %s.\n", progName, strerror(errno) ); + exit(1); + } + + if ( (s = bind(s, (struct sockaddr *) &sock, SUN_LEN( &sock ) )) == -1 ){ + fprintf ( stderr, "%s: Can't bind socket: %s.\n", progName, strerror(errno) ); + exit(1); + } + + /* XXX - Factorize code here */ + /*if (srcMode == SM_I2O) {*/ + /*if (opMode == OM_Z )*/ + /*compress( NULL );*/ + /*else if (opMode == OM_UNZ )*/ + /*uncompress (NULL);*/ + /*}*/ +# endif + if (opMode == OM_Z) { if (srcMode == SM_I2O) { compress ( NULL ); From owner-svn-soc-all@FreeBSD.ORG Wed Jun 19 22:51:12 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E432F64B for ; Wed, 19 Jun 2013 22:51:12 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id D4A7D13CC for ; Wed, 19 Jun 2013 22:51:12 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JMpCPj026778 for ; Wed, 19 Jun 2013 22:51:12 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5JMpC8U026731 for svn-soc-all@FreeBSD.org; Wed, 19 Jun 2013 22:51:12 GMT (envelope-from mattbw@FreeBSD.org) Date: Wed, 19 Jun 2013 22:51:12 GMT Message-Id: <201306192251.r5JMpC8U026731@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253262 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 22:51:13 -0000 Author: mattbw Date: Wed Jun 19 22:51:11 2013 New Revision: 253262 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253262 Log: start again against packagekit 0.6.11, until 0.8.9 or some version in between works with FreeBSD. Added: soc2013/mattbw/dummy/egg-string.h soc2013/mattbw/dummy/pk-backend-dummy-089.c soc2013/mattbw/dummy/pk-backend.h soc2013/mattbw/dummy/pk-store.h Modified: soc2013/mattbw/dummy/Makefile soc2013/mattbw/dummy/pk-backend-dummy.c Modified: soc2013/mattbw/dummy/Makefile ============================================================================== --- soc2013/mattbw/dummy/Makefile Wed Jun 19 21:52:32 2013 (r253261) +++ soc2013/mattbw/dummy/Makefile Wed Jun 19 22:51:11 2013 (r253262) @@ -4,7 +4,17 @@ SHLIB_MAJOR= 1 SRCS= pk-backend-dummy.c -PKGS= pkg packagekit-plugin gio-2.0 gio-unix-2.0 +USE_PK_PKGCONF= 0 + +PKGS= pkg gio-2.0 gio-unix-2.0 + +.if USE_PK_PKGCONF +PKGS+= packagekit-glib2 +.else +CFLAGS+= -I/usr/local/include/PackageKit -I/usr/local/include/PackageKit/backend +LDFLAGS+= -L/usr/local/lib -lpackagekit-glib2 +.endif + CFLAGS+= `pkg-config --cflags ${PKGS}` CFLAGS+= -DPK_COMPILATION LDFLAGS+= `pkg-config --libs ${PKGS}` Added: soc2013/mattbw/dummy/egg-string.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/egg-string.h Wed Jun 19 22:51:11 2013 (r253262) @@ -0,0 +1,48 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2007-2008 Richard Hughes + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __EGG_STRING_H +#define __EGG_STRING_H + +#include + +G_BEGIN_DECLS + +guint egg_strlen (const gchar *text, + guint len) + G_GNUC_WARN_UNUSED_RESULT; +gboolean egg_strzero (const gchar *text) + G_GNUC_WARN_UNUSED_RESULT; +gboolean egg_strvequal (gchar **id1, + gchar **id2) + G_GNUC_WARN_UNUSED_RESULT; +gboolean egg_strtoint (const gchar *text, + gint *value); +gboolean egg_strtouint (const gchar *text, + guint *value); +gchar *egg_strreplace (const gchar *text, + const gchar *find, + const gchar *replace); +void egg_string_test (gpointer user_data); + +G_END_DECLS + +#endif /* __EGG_STRING_H */ Added: soc2013/mattbw/dummy/pk-backend-dummy-089.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/pk-backend-dummy-089.c Wed Jun 19 22:51:11 2013 (r253262) @@ -0,0 +1,1738 @@ +/*- + * Copyright (C) 2007-2010 Richard Hughes + * 2013 Matt Windsor + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* NB: This is under heavy construction. Currently, it's just the dummy backend + * from PackageKit with a few modifications to build using BSD makefiles. + * Eventually it will actually support pkgng! + */ + +#include +#include +#include +#include +#include +#include + +#include "plugin/pk-backend.h" +#include "plugin/pk-backend-job.h" + +#include "pkg.h" + + +typedef struct { + gboolean has_signature; + gboolean repo_enabled_devel; + gboolean repo_enabled_fedora; + gboolean repo_enabled_livna; + gboolean repo_enabled_local; + gboolean updated_gtkhtml; + gboolean updated_kernel; + gboolean updated_powertop; + gboolean use_blocked; + gboolean use_distro_upgrade; + gboolean use_eula; + gboolean use_gpg; + gboolean use_media; + gboolean use_trusted; + gchar **package_ids; + gchar **values; + PkBitfield filters; + gboolean fake_db_locked; +} PkBackendDummyPrivate; + +typedef struct { + guint progress_percentage; + GSocket *socket; + guint socket_listen_id; + GCancellable *cancellable; + gulong signal_timeout; +} PkBackendDummyJobData; + +static PkBackendDummyPrivate *priv; + +/** + * pk_backend_initialize: + */ +void +pk_backend_initialize(PkBackend * backend) +{ + /* create private area */ + priv = g_new0(PkBackendDummyPrivate, 1); + priv->repo_enabled_fedora = TRUE; + priv->repo_enabled_devel = TRUE; + priv->repo_enabled_livna = TRUE; + priv->use_trusted = TRUE; +} + +/** + * pk_backend_destroy: + */ +void +pk_backend_destroy(PkBackend * backend) +{ + g_free(priv); +} + +/** + * pk_backend_get_groups: + */ +PkBitfield +pk_backend_get_groups(PkBackend * backend) +{ + return pk_bitfield_from_enums(PK_GROUP_ENUM_ACCESSIBILITY, + PK_GROUP_ENUM_GAMES, + PK_GROUP_ENUM_SYSTEM, + -1); +} + +/** + * pk_backend_get_filters: + */ +PkBitfield +pk_backend_get_filters(PkBackend * backend) +{ + return pk_bitfield_from_enums(PK_FILTER_ENUM_GUI, + PK_FILTER_ENUM_INSTALLED, + PK_FILTER_ENUM_DEVELOPMENT, + -1); +} + +/** + * pk_backend_get_mime_types: + */ +gchar ** +pk_backend_get_mime_types(PkBackend * backend) +{ + const gchar *mime_types[] = { + "application/x-rpm", + "application/x-deb", + NULL}; + return g_strdupv((gchar **) mime_types); +} + +/** + * pk_backend_cancel_timeout: + */ +static gboolean +pk_backend_cancel_timeout(gpointer data) +{ + PkBackendJob *job = (PkBackendJob *) data; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + /* we can now cancel again */ + job_data->signal_timeout = 0; + + /* now mark as finished */ + pk_backend_job_error_code(job, PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished(job); + return FALSE; +} + +/** + * pk_backend_cancel: + */ +void +pk_backend_cancel(PkBackend * backend, PkBackendJob * job) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + /* try to cancel the transaction */ + g_debug("cancelling transaction"); + g_cancellable_cancel(job_data->cancellable); + if (job_data->signal_timeout != 0) { + g_source_remove(job_data->signal_timeout); + + /* emulate that it takes us a few ms to cancel */ + g_timeout_add(1500, pk_backend_cancel_timeout, job); + } +} + +/** + * pk_backend_get_depends: + */ +void +pk_backend_get_depends(PkBackend * backend, PkBackendJob * job, PkBitfield filters, gchar ** package_ids, gboolean recursive) +{ + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + + if (g_strcmp0(package_ids[0], "scribus;1.3.4-1.fc8;i386;fedora") == 0) { + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "scribus-clipart;1.3.4-1.fc8;i386;fedora", "Clipart for scribus"); + } else { + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "glib2;2.14.0;i386;fedora", "The GLib library"); + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + } + pk_backend_job_finished(job); +} + +/** + * pk_backend_get_details: + */ +void +pk_backend_get_details(PkBackend * backend, PkBackendJob * job, gchar ** package_ids) +{ + guint i; + guint len; + const gchar *package_id; + + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage(job, 0); + + /* each one has a different detail for testing */ + len = g_strv_length(package_ids); + for (i = 0; i < len; i++) { + package_id = package_ids[i]; + if (g_strcmp0(package_id, "powertop;1.8-1.fc8;i386;fedora") == 0) { + pk_backend_job_details(job, "powertop;1.8-1.fc8;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING, + "PowerTOP is a tool that finds the software component(s) that make your " + "computer use more power than necessary while it is idle.", "http://live.gnome.org/powertop", 101 * 1024); + } else if (g_strcmp0(package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) { + pk_backend_job_details(job, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", "GPL2", PK_GROUP_ENUM_PROGRAMMING, + "The kernel package contains the Linux kernel (vmlinuz), the core of any " + "Linux operating system. The kernel handles the basic functions of the " + "operating system: memory allocation, process allocation, device input " + "and output, etc.", "http://www.kernel.org", 33 * 1024 * 1024); + } else if (g_strcmp0(package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) { + pk_backend_job_details(job, "gtkhtml2;2.19.1-4.fc8;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING, + "GtkHTML2 (sometimes called libgtkhtml) is a widget for displaying html " + "pages.", "http://live.gnome.org/gtkhtml", 133 * 1024); + } else if (g_strcmp0(package_id, "vino;2.24.2.fc9;i386;fedora") == 0) { + pk_backend_job_details(job, "vino;2.24.2.fc9;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING, + "Vino is a VNC server for GNOME. It allows remote users to " + "connect to a running GNOME session using VNC.", "http://live.gnome.org/powertop", 3 * 1024 * 1024); + } else if (g_strcmp0(package_id, "gnome-power-manager;2.6.19;i386;fedora") == 0) { + pk_backend_job_details(job, "gnome-power-manager;2.6.19;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING, + "GNOME Power Manager uses the information and facilities provided by HAL " + "displaying icons and handling user callbacks in an interactive GNOME session.\n" + "GNOME Power Preferences allows authorised users to set policy and " + "change preferences.", "http://projects.gnome.org/gnome-power-manager/", 13 * 1024 * 1024); + //TODO: add other packages + } else { + pk_backend_job_details(job, "scribus;1.3.4-1.fc8;i386;fedora", "GPL2", PK_GROUP_ENUM_PROGRAMMING, + "Scribus is an desktop *open source* page layöut program with " + "the aim of producing commercial grade output in **PDF** and " + "**Postscript**, primarily, though not exclusively for Linux.\n" + "\n" + "While the goals of the program are for ease of use and simple easy to " + "understand tools, Scribus offers support for professional publishing " + "features, such as CMYK color, easy PDF creation, Encapsulated Postscript " + "import/export and creation of color separations.", "http://live.gnome.org/scribus", 44 * 1024 * 1024); + } + } + pk_backend_job_set_percentage(job, 100); + pk_backend_job_finished(job); +} + +/** + * pk_backend_get_distro_upgrades: + */ +void +pk_backend_get_distro_upgrades(PkBackend * backend, PkBackendJob * job) +{ + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + if (!priv->use_distro_upgrade) + goto out; + pk_backend_job_distro_upgrade(job, PK_DISTRO_UPGRADE_ENUM_STABLE, + "fedora-9", "Fedora 9"); + pk_backend_job_distro_upgrade(job, PK_DISTRO_UPGRADE_ENUM_UNSTABLE, + "fedora-10-rc1", "Fedora 10 RC1"); +out: + pk_backend_job_finished(job); +} + +/** + * pk_backend_get_files: + */ +void +pk_backend_get_files(PkBackend * backend, PkBackendJob * job, gchar ** package_ids) +{ + guint i; + guint len; + const gchar *package_id; + + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + + len = g_strv_length(package_ids); + for (i = 0; i < len; i++) { + package_id = package_ids[i]; + if (g_strcmp0(package_id, "powertop;1.8-1.fc8;i386;fedora") == 0) + pk_backend_job_files(job, package_id, "/usr/share/man/man1/boo;/usr/bin/xchat-gnome"); + else if (g_strcmp0(package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) + pk_backend_job_files(job, package_id, "/usr/share/man/man1;/usr/share/man/man1/gnome-power-manager.1.gz;/usr/lib/firefox-3.5.7/firefox"); + else if (g_strcmp0(package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) + pk_backend_job_files(job, package_id, "/usr/share/man/man1;/usr/bin/ck-xinit-session;/lib/libselinux.so.1"); + else + pk_backend_job_files(job, package_id, "/usr/share/gnome-power-manager;/usr/bin/ck-xinit-session"); + } + pk_backend_job_finished(job); +} + +/** + * pk_backend_get_requires: + */ +void +pk_backend_get_requires(PkBackend * backend, PkBackendJob * job, PkBitfield filters, gchar ** package_ids, gboolean recursive) +{ + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "glib2;2.14.0;i386;fedora", "The GLib library"); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + pk_backend_job_finished(job); +} + +/** + * pk_backend_get_update_detail_timeout: + **/ +static gboolean +pk_backend_get_update_detail_timeout(gpointer data) +{ + guint i; + guint len; + const gchar *package_id; + PkBackendJob *job = (PkBackendJob *) data; + const gchar *changelog; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + /* dummy */ + changelog = "**Thu Mar 12 2009** Adam Jackson 1.6.0-13\n" + "- xselinux-1.6.0-selinux-nlfd.patch: Acquire the netlink socket from selinux,\n" + " check it ourselves rather than having libselinux bang on it all the time.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-10\n" + "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n" + " says to be an object manager.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-11\n" + "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n" + " ACPI code.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-12\n" + "- Requires: pixman >= 0.14.0\n" + "\n" + "**Fri Mar 6 2009** Adam Jackson 1.6.0-8\n" + "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n"; + + /* each one has a different detail for testing */ + pk_backend_job_set_percentage(job, 0); + len = g_strv_length(priv->package_ids); + for (i = 0; i < len; i++) { + const gchar *to_array1[] = {NULL, NULL, NULL}; + const gchar *to_array2[] = {NULL, NULL, NULL}; + const gchar *to_array3[] = {NULL, NULL, NULL}; + const gchar *to_array4[] = {NULL, NULL, NULL}; + package_id = priv->package_ids[i]; + if (g_strcmp0(package_id, "powertop;1.8-1.fc8;i386;fedora") == 0) { + to_array1[0] = "powertop;1.7-1.fc8;i386;installed"; + to_array2[0] = "http://www.distro-update.org/page?moo"; + to_array3[0] = "http://bgzilla.fd.org/result.php?#12344"; + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + (gchar **) to_array2, + (gchar **) to_array3, + NULL, + PK_RESTART_ENUM_NONE, + "Update to newest upstream source", + changelog, PK_UPDATE_STATE_ENUM_STABLE, + "2009-11-17T09:19:00", "2009-11-19T09:19:00"); + } else if (g_strcmp0(package_id, "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) { + to_array1[0] = "kernel;2.6.22-0.104.rc3.git6.fc8;i386;installed"; + to_array1[1] = "kernel;2.6.22-0.105.rc3.git7.fc8;i386;installed"; + to_array2[0] = "http://www.distro-update.org/page?moo"; + to_array3[0] = "http://bgzilla.fd.org/result.php?#12344"; + to_array3[1] = "http://bgzilla.gnome.org/result.php?#9876"; + to_array4[0] = "http://nvd.nist.gov/nvd.cfm?cvename=CVE-2007-3381;CVE-2007-3381"; + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + (gchar **) to_array2, + (gchar **) to_array3, + (gchar **) to_array4, + PK_RESTART_ENUM_SYSTEM, + "Update to newest upstream version.\n" + "* This should fix many driver bugs when using nouveau\n" + " * This also introduces the new `frobnicator` driver for *vibrating* rabbit hardware.", + changelog, + PK_UPDATE_STATE_ENUM_UNSTABLE, + "2008-06-28T09:19:00", + NULL); + } else if (g_strcmp0(package_id, "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) { + to_array1[0] = "gtkhtml2;2.18.1-22.fc8;i386;installed"; + to_array2[0] = "http://www.distro-update.org/page?moo"; + to_array3[0] = "http://bgzilla.gnome.org/result.php?#9876"; + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + (gchar **) to_array2, + (gchar **) to_array3, + NULL, + PK_RESTART_ENUM_SESSION, + "Update to latest *whizz* **bang** version\n" + "* support this new thing\n" + "* something else\n" + "- and that new thing", + changelog, + PK_UPDATE_STATE_ENUM_UNKNOWN, + "2008-07-25T09:19:00", + NULL); + + } else if (g_strcmp0(package_id, "vino;2.24.2.fc9;i386;fedora") == 0) { + to_array1[0] = "vino;2.24.1.fc9;i386;fedora"; + pk_backend_job_update_detail(job, package_id, + (gchar **) to_array1, + NULL, + NULL, + NULL, + NULL, + PK_RESTART_ENUM_NONE, + "Cannot get update as update conflics with vncviewer", + changelog, + PK_UPDATE_STATE_ENUM_UNKNOWN, + "2008-07-25", + NULL); + } else { + /* signal to UI */ + pk_backend_job_error_code(job, + PK_ERROR_ENUM_INTERNAL_ERROR, + "the package update detail was not found for %s", + package_id); + } + } + pk_backend_job_set_percentage(job, 100); + pk_backend_job_finished(job); + job_data->signal_timeout = 0; + return FALSE; +} + +/** + * pk_backend_get_update_detail: + */ +void +pk_backend_get_update_detail(PkBackend * backend, PkBackendJob * job, gchar ** package_ids) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + priv->package_ids = package_ids; + job_data->signal_timeout = g_timeout_add(500, pk_backend_get_update_detail_timeout, job); +} + +/** + * pk_backend_get_updates_timeout: + **/ +static gboolean +pk_backend_get_updates_timeout(gpointer data) +{ + PkBackendJob *job = (PkBackendJob *) data; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + if (priv->use_blocked) { + if (!priv->updated_powertop && !priv->updated_kernel && !priv->updated_gtkhtml) { + pk_backend_job_package(job, PK_INFO_ENUM_BLOCKED, + "vino;2.24.2.fc9;i386;fedora", + "Remote desktop server for the desktop"); + } + } + if (!priv->updated_powertop) { + pk_backend_job_package(job, PK_INFO_ENUM_NORMAL, + "powertop;1.8-1.fc8;i386;fedora", + "Power consumption monitor"); + } + if (!priv->updated_kernel) { + pk_backend_job_package(job, PK_INFO_ENUM_BUGFIX, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", + "The Linux kernel (the core of the Linux operating system)"); + } + if (!priv->updated_gtkhtml) { + pk_backend_job_package(job, PK_INFO_ENUM_SECURITY, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + } + pk_backend_job_finished(job); + job_data->signal_timeout = 0; + return FALSE; +} + +/** + * pk_backend_get_updates: + */ +void +pk_backend_get_updates(PkBackend * backend, PkBackendJob * job, PkBitfield filters) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage(job, PK_BACKEND_PERCENTAGE_INVALID); + /* check network state */ + if (!pk_backend_is_online(backend)) { + pk_backend_job_error_code(job, PK_ERROR_ENUM_NO_NETWORK, "Cannot check when offline"); + pk_backend_job_finished(job); + return; + } + job_data->signal_timeout = g_timeout_add(1000, pk_backend_get_updates_timeout, job); +} + +/** + * pk_backend_install_thread: + */ +static void +pk_backend_install_thread(PkBackendJob * job, GVariant * params, gpointer user_data) +{ + gchar **package_ids; + PkBitfield transaction_flags; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + g_variant_get(params, "(t^a&s)", + &transaction_flags, + &package_ids); + + while (TRUE) { + + /* check cancelled */ + if (g_cancellable_is_cancelled(job_data->cancellable)) { + pk_backend_job_error_code(job, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished(job); + break; + } + if (job_data->progress_percentage == 100) { + pk_backend_job_finished(job); + break; + } + if (job_data->progress_percentage == 30) { + pk_backend_job_set_allow_cancel(job, FALSE); + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + pk_backend_job_set_status(job, PK_STATUS_ENUM_INSTALL); + } + if (job_data->progress_percentage == 50) { + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", + "Devel files for gtkhtml"); + /* this duplicate package should be ignored */ + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtkhtml2-devel;2.19.1-0.fc8;i386;fedora", NULL); + pk_backend_job_set_status(job, PK_STATUS_ENUM_INSTALL); + } + job_data->progress_percentage += 1; + pk_backend_job_set_percentage(job, job_data->progress_percentage); + + /* sleep 100 milliseconds */ + g_usleep(100000); + } + + /* unlock backend again */ + priv->fake_db_locked = FALSE; + pk_backend_job_set_locked(job, FALSE); +} + +/** + * pk_backend_install_packages: + */ +void +pk_backend_install_packages(PkBackend * backend, PkBackendJob * job, PkBitfield transaction_flags, gchar ** package_ids) +{ + const gchar *license_agreement; + const gchar *eula_id; + gboolean has_eula; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + /* simulate */ + if (pk_bitfield_contain(transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) { + pk_backend_job_set_status(job, PK_STATUS_ENUM_DEP_RESOLVE); + + pk_backend_job_package(job, PK_INFO_ENUM_REMOVING, + "powertop;1.8-1.fc8;i386;fedora", "Power consumption monitor"); + + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLING, + "gtk2;2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + + pk_backend_job_package(job, PK_INFO_ENUM_UPDATING, + "lib7;7.0.1-6.fc13;i386;fedora", "C Libraries"); + + pk_backend_job_package(job, PK_INFO_ENUM_REINSTALLING, + "libssl;3.5.7-2.fc13;i386;fedora", "SSL Libraries"); + + pk_backend_job_package(job, PK_INFO_ENUM_DOWNGRADING, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", "The Linux kernel (the core of the Linux operating system)"); + + pk_backend_job_package(job, PK_INFO_ENUM_UPDATING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", "An HTML widget for GTK+ 2.0"); + + pk_backend_job_finished(job); + return; + } + if (g_strcmp0(package_ids[0], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { + if (priv->use_gpg && !priv->has_signature) { + pk_backend_job_repo_signature_required(job, package_ids[0], "updates", + "http://example.com/gpgkey", + "Test Key (Fedora) fedora@example.com", + "BB7576AC", + "D8CC 06C2 77EC 9C53 372F C199 B1EE 1799 F24F 1B08", + "2007-10-04", PK_SIGTYPE_ENUM_GPG); + pk_backend_job_error_code(job, PK_ERROR_ENUM_GPG_FAILURE, + "GPG signed package could not be verified"); + pk_backend_job_finished(job); + return; + } + eula_id = "eula_hughsie_dot_com"; + has_eula = pk_backend_is_eula_valid(backend, eula_id); + if (priv->use_eula && !has_eula) { + license_agreement = "Narrator: In A.D. 2101, war was beginning.\n" + "Captain: What happen ?\n" + "Mechanic: Somebody set up us the bomb.\n\n" + "Operator: We get signal.\n" + "Captain: What !\n" + "Operator: Main screen turn on.\n" + "Captain: It's you !!\n" + "CATS: How are you gentlemen !!\n" + "CATS: All your base are belong to us.\n" + "CATS: You are on the way to destruction.\n\n" + "Captain: What you say !!\n" + "CATS: You have no chance to survive make your time.\n" + "CATS: Ha Ha Ha Ha ....\n\n" + "Operator: Captain!! *\n" + "Captain: Take off every 'ZIG' !!\n" + "Captain: You know what you doing.\n" + "Captain: Move 'ZIG'.\n" + "Captain: For great justice.\n"; + pk_backend_job_eula_required(job, eula_id, package_ids[0], + "CATS Inc.", license_agreement); + pk_backend_job_error_code(job, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, + "licence not installed so cannot install"); + pk_backend_job_finished(job); + return; + } + if (priv->use_media) { + priv->use_media = FALSE; + pk_backend_job_media_change_required(job, PK_MEDIA_TYPE_ENUM_DVD, "linux-disk-1of7", "Linux Disc 1 of 7"); + pk_backend_job_error_code(job, PK_ERROR_ENUM_MEDIA_CHANGE_REQUIRED, + "additional media linux-disk-1of7 required"); + pk_backend_job_finished(job); + return; + } + } + if ((g_strcmp0(package_ids[0], "foobar;1.1.0;i386;debian") != 0) && (g_strcmp0(package_ids[0], "libawesome;42;i386;debian") != 0)) { + if (priv->use_trusted && pk_bitfield_contain(transaction_flags, PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED)) { + pk_backend_job_error_code(job, PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED, + "Can't install as untrusted"); + pk_backend_job_finished(job); + return; + } + } + /* check if something else locked the "fake-db" */ + if (priv->fake_db_locked) { + pk_backend_job_error_code(job, PK_ERROR_ENUM_LOCK_REQUIRED, + "we require lock"); + pk_backend_job_finished(job); + return; + } + /* we're now locked */ + priv->fake_db_locked = TRUE; + pk_backend_job_set_locked(job, TRUE); + + pk_backend_job_set_allow_cancel(job, TRUE); + job_data->progress_percentage = 0; + pk_backend_job_package(job, PK_INFO_ENUM_DOWNLOADING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + + pk_backend_job_thread_create(job, pk_backend_install_thread, NULL, NULL); +} + +/** + * pk_backend_install_signature: + */ +void +pk_backend_install_signature(PkBackend * backend, PkBackendJob * job, PkSigTypeEnum type, + const gchar * key_id, const gchar * package_id) +{ + pk_backend_job_set_status(job, PK_STATUS_ENUM_INSTALL); + if (type == PK_SIGTYPE_ENUM_GPG && + /* egg_strequal (package_id, "vips-doc;7.12.4-2.fc8;noarch;linva") && */ + g_strcmp0(key_id, "BB7576AC") == 0) { + g_debug("installed signature %s for %s", key_id, package_id); + priv->has_signature = TRUE; + } else { + pk_backend_job_error_code(job, PK_ERROR_ENUM_GPG_FAILURE, + "GPG key %s not recognised for package_id %s", + key_id, package_id); + } + pk_backend_job_finished(job); +} + +/** + * pk_backend_refresh_cache_timeout: + */ +static gboolean +pk_backend_install_files_timeout(gpointer data) +{ + PkBackendJob *job = (PkBackendJob *) data; + pk_backend_job_finished(job); + return FALSE; +} + +/** + * pk_backend_install_files: + */ +void +pk_backend_install_files(PkBackend * backend, PkBackendJob * job, PkBitfield transaction_flags, gchar ** full_paths) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + pk_backend_job_set_status(job, PK_STATUS_ENUM_INSTALL); + pk_backend_job_set_percentage(job, 101); + job_data->signal_timeout = g_timeout_add(2000, pk_backend_install_files_timeout, job); +} + +/** + * pk_backend_refresh_cache_thread: + */ +static void +pk_backend_refresh_cache_thread(PkBackendJob * job, GVariant * params, gpointer user_data) +{ + gboolean force; + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + + g_variant_get(params, "(b)", + &force); + + while (TRUE) { + + /* check cancelled */ + if (g_cancellable_is_cancelled(job_data->cancellable)) { + pk_backend_job_error_code(job, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_job_finished(job); + break; + } + if (job_data->progress_percentage == 100) { + pk_backend_job_finished(job); + break; + } + if (job_data->progress_percentage == 80) + pk_backend_job_set_allow_cancel(job, FALSE); + job_data->progress_percentage += 10; + pk_backend_job_set_percentage(job, job_data->progress_percentage); + + /* sleep 500 milliseconds */ + g_usleep(500000); + } + + /* unlock backend again */ + priv->fake_db_locked = FALSE; + pk_backend_job_set_locked(job, FALSE); +} + +/** + * pk_backend_refresh_cache: + */ +void +pk_backend_refresh_cache(PkBackend * backend, PkBackendJob * job, gboolean force) +{ + PkBackendDummyJobData *job_data = pk_backend_job_get_user_data(job); + job_data->progress_percentage = 0; + + /* reset */ + priv->updated_gtkhtml = FALSE; + priv->updated_kernel = FALSE; + priv->updated_powertop = FALSE; + + pk_backend_job_set_allow_cancel(job, TRUE); + pk_backend_job_set_status(job, PK_STATUS_ENUM_REFRESH_CACHE); + + /* check if some other action has lock */ + if (priv->fake_db_locked) { + pk_backend_job_error_code(job, PK_ERROR_ENUM_LOCK_REQUIRED, + "we require lock"); + pk_backend_job_finished(job); + return; + } + /* we're now locked */ + priv->fake_db_locked = TRUE; + pk_backend_job_set_locked(job, TRUE); + + pk_backend_job_thread_create(job, pk_backend_refresh_cache_thread, NULL, NULL); +} + +/** + * pk_backend_resolve_thread: + */ +static void +pk_backend_resolve_thread(PkBackendJob * job, GVariant * params, gpointer user_data) +{ + gchar **search; + guint i; + guint len; + PkBitfield filters; + + g_variant_get(params, "(t^a&s)", + &filters, + &search); + + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_percentage(job, 0); + + /* each one has a different detail for testing */ + len = g_strv_length(search); + for (i = 0; i < len; i++) { + if (g_strcmp0(search[i], "vips-doc") == 0 || g_strcmp0(search[i], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { + if (!pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED)) { + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips documentation package."); + } + } else if (g_strcmp0(search[i], "glib2") == 0 || g_strcmp0(search[i], "glib2;2.14.0;i386;fedora") == 0) { + if (!pk_bitfield_contain(filters, PK_FILTER_ENUM_NOT_INSTALLED)) { + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "glib2;2.14.0;i386;fedora", + "The GLib library"); + } + } else if (g_strcmp0(search[i], "powertop") == 0 || g_strcmp0(search[i], "powertop;1.8-1.fc8;i386;fedora") == 0) + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "powertop;1.8-1.fc8;i386;fedora", + "Power consumption monitor"); + else if (g_strcmp0(search[i], "kernel") == 0 || g_strcmp0(search[i], "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed") == 0) + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "kernel;2.6.23-0.115.rc3.git1.fc8;i386;installed", + "The Linux kernel (the core of the Linux operating system)"); + else if (g_strcmp0(search[i], "gtkhtml2") == 0 || g_strcmp0(search[i], "gtkhtml2;2.19.1-4.fc8;i386;fedora") == 0) + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + else if (g_strcmp0(search[i], "foobar") == 0 || g_strcmp0(search[i], "foobar;1.1.0;i386;debian") == 0) { + if (!pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED)) { + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "foobar;1.1.0;i386;debian", + "The awesome FooBar application"); + } + } else if (g_strcmp0(search[i], "libawesome") == 0 || g_strcmp0(search[i], "libawesome;42;i386;debian") == 0) { + if (!pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED)) { + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "libawesome;42;i386;debian", + "Simple library for warping reality"); + } + } + } + pk_backend_job_set_percentage(job, 100); + pk_backend_job_finished(job); +} + +/** + * pk_backend_resolve: + */ +void +pk_backend_resolve(PkBackend * backend, PkBackendJob * job, PkBitfield filters, gchar ** packages) +{ + pk_backend_job_thread_create(job, pk_backend_resolve_thread, NULL, NULL); +} + +/** + * pk_backend_remove_packages: + */ +void +pk_backend_remove_packages(PkBackend * backend, PkBackendJob * job, + PkBitfield transaction_flags, + gchar ** package_ids, + gboolean allow_deps, + gboolean autoremove) +{ + /* check if something else locked the "fake-db" */ + if (priv->fake_db_locked) { + pk_backend_job_error_code(job, PK_ERROR_ENUM_LOCK_REQUIRED, + "we require lock"); + pk_backend_job_finished(job); + return; + } + /* we're now locked */ + priv->fake_db_locked = TRUE; + pk_backend_job_set_locked(job, TRUE); + + pk_backend_job_set_status(job, PK_STATUS_ENUM_REMOVE); + pk_backend_job_error_code(job, PK_ERROR_ENUM_NO_NETWORK, "No network connection available"); + pk_backend_job_finished(job); + + /* unlock backend again */ + priv->fake_db_locked = FALSE; + pk_backend_job_set_locked(job, FALSE); +} + +/** + * pk_backend_search_details_thread: + **/ +static void +pk_backend_search_details_thread(PkBackendJob * job, GVariant * params, gpointer user_data) +{ + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_allow_cancel(job, TRUE); + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips \"documentation\" package."); + pk_backend_job_finished(job); +} + +/** + * pk_backend_search_details: + */ +void +pk_backend_search_details(PkBackend * backend, PkBackendJob * job, PkBitfield filters, gchar ** values) +{ + pk_backend_job_thread_create(job, pk_backend_search_details_thread, NULL, NULL); +} + +/** + * pk_backend_search_files: + */ +void +pk_backend_search_files(PkBackend * backend, PkBackendJob * job, PkBitfield filters, gchar ** values) +{ + pk_backend_job_set_status(job, PK_STATUS_ENUM_QUERY); + pk_backend_job_set_allow_cancel(job, TRUE); + if (!pk_bitfield_contain(filters, PK_FILTER_ENUM_INSTALLED)) + pk_backend_job_package(job, PK_INFO_ENUM_AVAILABLE, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips documentation package"); + else + pk_backend_job_package(job, PK_INFO_ENUM_INSTALLED, + "vips-doc;7.12.4-2.fc8;noarch;linva", + "The vips documentation package"); + pk_backend_job_finished(job); +} + +/** + * pk_backend_search_groups: *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Thu Jun 20 00:56:21 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B0370AB3 for ; Thu, 20 Jun 2013 00:56:21 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id A014B1AA3 for ; Thu, 20 Jun 2013 00:56:21 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5K0uLrc003574 for ; Thu, 20 Jun 2013 00:56:21 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5K0uL6u003570 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 00:56:21 GMT (envelope-from mattbw@FreeBSD.org) Date: Thu, 20 Jun 2013 00:56:21 GMT Message-Id: <201306200056.r5K0uL6u003570@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253264 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 00:56:21 -0000 Author: mattbw Date: Thu Jun 20 00:56:21 2013 New Revision: 253264 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253264 Log: initial work on get-details; does not work yet; heavily inspired by opkg Added: soc2013/mattbw/dummy/pk-backend-pkgng.c Modified: soc2013/mattbw/dummy/Makefile soc2013/mattbw/dummy/pk-backend-dummy.c Modified: soc2013/mattbw/dummy/Makefile ============================================================================== --- soc2013/mattbw/dummy/Makefile Wed Jun 19 23:09:10 2013 (r253263) +++ soc2013/mattbw/dummy/Makefile Thu Jun 20 00:56:21 2013 (r253264) @@ -1,8 +1,8 @@ # $FreeBSD$ -LIB= pk_backend_dummy +LIB= pk_backend_pkgng SHLIB_MAJOR= 1 -SRCS= pk-backend-dummy.c +SRCS= pk-backend-pkgng.c USE_PK_PKGCONF= 0 Modified: soc2013/mattbw/dummy/pk-backend-dummy.c ============================================================================== --- soc2013/mattbw/dummy/pk-backend-dummy.c Wed Jun 19 23:09:10 2013 (r253263) +++ soc2013/mattbw/dummy/pk-backend-dummy.c Thu Jun 20 00:56:21 2013 (r253264) @@ -30,34 +30,34 @@ #include "pk-backend.h" /* static bodges */ -static guint _progress_percentage = 0; -static gulong _signal_timeout = 0; -static gchar **_package_ids; -static gchar **_values; -static guint _package_current = 0; -static gboolean _repo_enabled_local = FALSE; -static gboolean _repo_enabled_fedora = TRUE; -static gboolean _repo_enabled_devel = TRUE; -static gboolean _repo_enabled_livna = TRUE; -static gboolean _updated_gtkhtml = FALSE; -static gboolean _updated_kernel = FALSE; -static gboolean _updated_powertop = FALSE; -static gboolean _has_signature = FALSE; -static gboolean _use_blocked = FALSE; -static gboolean _use_eula = FALSE; -static gboolean _use_media = FALSE; -static gboolean _use_gpg = FALSE; -static gboolean _use_trusted = TRUE; -static gboolean _use_distro_upgrade = FALSE; +static guint _progress_percentage = 0; +static gulong _signal_timeout = 0; +static gchar **_package_ids; +static gchar **_values; +static guint _package_current = 0; +static gboolean _repo_enabled_local = FALSE; +static gboolean _repo_enabled_fedora = TRUE; +static gboolean _repo_enabled_devel = TRUE; +static gboolean _repo_enabled_livna = TRUE; +static gboolean _updated_gtkhtml = FALSE; +static gboolean _updated_kernel = FALSE; +static gboolean _updated_powertop = FALSE; +static gboolean _has_signature = FALSE; +static gboolean _use_blocked = FALSE; +static gboolean _use_eula = FALSE; +static gboolean _use_media = FALSE; +static gboolean _use_gpg = FALSE; +static gboolean _use_trusted = TRUE; +static gboolean _use_distro_upgrade = FALSE; static PkBitfield _filters = 0; static GSocket *_socket = NULL; -static guint _socket_listen_id = 0; +static guint _socket_listen_id = 0; /** * pk_backend_initialize: */ void -pk_backend_initialize (PkBackend *backend) +pk_backend_initialize(PkBackend * backend) { _progress_percentage = 0; } @@ -66,7 +66,7 @@ * pk_backend_destroy: */ void -pk_backend_destroy (PkBackend *backend) +pk_backend_destroy(PkBackend * backend) { } @@ -74,50 +74,50 @@ * pk_backend_get_groups: */ PkBitfield -pk_backend_get_groups (PkBackend *backend) +pk_backend_get_groups(PkBackend * backend) { - return pk_bitfield_from_enums (PK_GROUP_ENUM_ACCESSIBILITY, - PK_GROUP_ENUM_GAMES, - PK_GROUP_ENUM_SYSTEM, - -1); + return pk_bitfield_from_enums(PK_GROUP_ENUM_ACCESSIBILITY, + PK_GROUP_ENUM_GAMES, + PK_GROUP_ENUM_SYSTEM, + -1); } /** * pk_backend_get_filters: */ PkBitfield -pk_backend_get_filters (PkBackend *backend) +pk_backend_get_filters(PkBackend * backend) { - return pk_bitfield_from_enums (PK_FILTER_ENUM_GUI, - PK_FILTER_ENUM_INSTALLED, - PK_FILTER_ENUM_DEVELOPMENT, - -1); + return pk_bitfield_from_enums(PK_FILTER_ENUM_GUI, + PK_FILTER_ENUM_INSTALLED, + PK_FILTER_ENUM_DEVELOPMENT, + -1); } /** * pk_backend_get_mime_types: */ -gchar * -pk_backend_get_mime_types (PkBackend *backend) +gchar * +pk_backend_get_mime_types(PkBackend * backend) { - return g_strdup ("application/x-rpm;application/x-deb"); + return g_strdup("application/x-rpm;application/x-deb"); } /** * pk_backend_cancel_timeout: */ -static gboolean -pk_backend_cancel_timeout (gpointer data) +static gboolean +pk_backend_cancel_timeout(gpointer data) { - PkBackend *backend = (PkBackend *) data; + PkBackend *backend = (PkBackend *) data; /* we can now cancel again */ _signal_timeout = 0; /* now mark as finished */ - pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_CANCELLED, - "The task was stopped successfully"); - pk_backend_finished (backend); + pk_backend_error_code(backend, PK_ERROR_ENUM_TRANSACTION_CANCELLED, + "The task was stopped successfully"); + pk_backend_finished(backend); return FALSE; } @@ -125,14 +125,14 @@ * pk_backend_cancel: */ void -pk_backend_cancel (PkBackend *backend) +pk_backend_cancel(PkBackend * backend) { /* cancel the timeout */ if (_signal_timeout != 0) { - g_source_remove (_signal_timeout); + g_source_remove(_signal_timeout); /* emulate that it takes us a few ms to cancel */ - g_timeout_add (1500, pk_backend_cancel_timeout, backend); + g_timeout_add(1500, pk_backend_cancel_timeout, backend); } } @@ -140,220 +140,220 @@ * pk_backend_get_depends: */ void -pk_backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids, gboolean recursive) +pk_backend_get_depends(PkBackend * backend, PkBitfield filters, gchar ** package_ids, gboolean recursive) { - pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY); + pk_backend_set_status(backend, PK_STATUS_ENUM_QUERY); - if (g_strcmp0 (package_ids[0], "scribus;1.3.4-1.fc8;i386;fedora") == 0) { - pk_backend_package (backend, PK_INFO_ENUM_AVAILABLE, - "scribus-clipart;1.3.4-1.fc8;i386;fedora", "Clipart for scribus"); + if (g_strcmp0(package_ids[0], "scribus;1.3.4-1.fc8;i386;fedora") == 0) { + pk_backend_package(backend, PK_INFO_ENUM_AVAILABLE, + "scribus-clipart;1.3.4-1.fc8;i386;fedora", "Clipart for scribus"); } else { - pk_backend_package (backend, PK_INFO_ENUM_INSTALLED, - "glib2;2.14.0;i386;fedora", "The GLib library"); - pk_backend_package (backend, PK_INFO_ENUM_AVAILABLE, - "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); + pk_backend_package(backend, PK_INFO_ENUM_INSTALLED, + "glib2;2.14.0;i386;fedora", "The GLib library"); + pk_backend_package(backend, PK_INFO_ENUM_AVAILABLE, + "gtk2;gtk2-2.11.6-6.fc8;i386;fedora", "GTK+ Libraries for GIMP"); } - pk_backend_finished (backend); + pk_backend_finished(backend); } /** * pk_backend_get_details: */ void -pk_backend_get_details (PkBackend *backend, gchar **package_ids) +pk_backend_get_details(PkBackend * backend, gchar ** package_ids) { - guint i; - guint len; - const gchar *package_id; + guint i; + guint len; + const gchar *package_id; - pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY); - pk_backend_set_percentage (backend, 0); + pk_backend_set_status(backend, PK_STATUS_ENUM_QUERY); + pk_backend_set_percentage(backend, 0); /* each one has a different detail for testing */ - len = g_strv_length (package_ids); - for (i=0; i 1.6.0-10\n" - "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n" - " says to be an object manager.\n" - "\n" - "**Wed Mar 11 2009** Adam Jackson 1.6.0-11\n" - "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n" - " ACPI code.\n" - "\n" - "**Wed Mar 11 2009** Adam Jackson 1.6.0-12\n" - "- Requires: pixman >= 0.14.0\n" - "\n" - "**Fri Mar 6 2009** Adam Jackson 1.6.0-8\n" - "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n"; + "- xselinux-1.6.0-selinux-nlfd.patch: Acquire the netlink socket from selinux,\n" + " check it ourselves rather than having libselinux bang on it all the time.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-10\n" + "- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy\n" + " says to be an object manager.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-11\n" + "- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)\n" + " ACPI code.\n" + "\n" + "**Wed Mar 11 2009** Adam Jackson 1.6.0-12\n" + "- Requires: pixman >= 0.14.0\n" + "\n" + "**Fri Mar 6 2009** Adam Jackson 1.6.0-8\n" + "- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)\n"; /* each one has a different detail for testing */ - pk_backend_set_percentage (backend, 0); - len = g_strv_length (_package_ids); - for (i=0; i 30 && _progress_percentage < 50) { - sub_percent = ((gfloat) (_progress_percentage - 30.0f) / 20.0f) * 100.0f; - pk_backend_set_sub_percentage (backend, sub_percent); + sub_percent = ((gfloat) (_progress_percentage - 30.0 f) / 20.0 f) * 100.0 f; + pk_backend_set_sub_percentage(backend, sub_percent); } else { - pk_backend_set_sub_percentage (backend, PK_BACKEND_PERCENTAGE_INVALID); + pk_backend_set_sub_percentage(backend, PK_BACKEND_PERCENTAGE_INVALID); } _progress_percentage += 1; - pk_backend_set_percentage (backend, _progress_percentage); + pk_backend_set_percentage(backend, _progress_percentage); return TRUE; } @@ -462,109 +462,107 @@ * pk_backend_install_packages: */ void -pk_backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **package_ids) +pk_backend_install_packages(PkBackend * backend, gboolean only_trusted, gchar ** package_ids) { - const gchar *license_agreement; - const gchar *eula_id; - gboolean has_eula; + const gchar *license_agreement; + const gchar *eula_id; + gboolean has_eula; /* FIXME: support only_trusted */ - if (g_strcmp0 (package_ids[0], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { + if (g_strcmp0(package_ids[0], "vips-doc;7.12.4-2.fc8;noarch;linva") == 0) { if (_use_gpg && !_has_signature) { - pk_backend_repo_signature_required (backend, package_ids[0], "updates", - "http://example.com/gpgkey", - "Test Key (Fedora) fedora@example.com", - "BB7576AC", - "D8CC 06C2 77EC 9C53 372F C199 B1EE 1799 F24F 1B08", - "2007-10-04", PK_SIGTYPE_ENUM_GPG); - pk_backend_error_code (backend, PK_ERROR_ENUM_GPG_FAILURE, - "GPG signed package could not be verified"); - pk_backend_finished (backend); + pk_backend_repo_signature_required(backend, package_ids[0], "updates", + "http://example.com/gpgkey", + "Test Key (Fedora) fedora@example.com", + "BB7576AC", + "D8CC 06C2 77EC 9C53 372F C199 B1EE 1799 F24F 1B08", + "2007-10-04", PK_SIGTYPE_ENUM_GPG); + pk_backend_error_code(backend, PK_ERROR_ENUM_GPG_FAILURE, + "GPG signed package could not be verified"); + pk_backend_finished(backend); return; } eula_id = "eula_hughsie_dot_com"; - has_eula = pk_backend_is_eula_valid (backend, eula_id); + has_eula = pk_backend_is_eula_valid(backend, eula_id); if (_use_eula && !has_eula) { license_agreement = "Narrator: In A.D. 2101, war was beginning.\n" - "Captain: What happen ?\n" - "Mechanic: Somebody set up us the bomb.\n\n" - "Operator: We get signal.\n" - "Captain: What !\n" - "Operator: Main screen turn on.\n" - "Captain: It's you !!\n" - "CATS: How are you gentlemen !!\n" - "CATS: All your base are belong to us.\n" - "CATS: You are on the way to destruction.\n\n" - "Captain: What you say !!\n" - "CATS: You have no chance to survive make your time.\n" - "CATS: Ha Ha Ha Ha ....\n\n" - "Operator: Captain!! *\n" - "Captain: Take off every 'ZIG' !!\n" - "Captain: You know what you doing.\n" - "Captain: Move 'ZIG'.\n" - "Captain: For great justice.\n"; - pk_backend_eula_required (backend, eula_id, package_ids[0], - "CATS Inc.", license_agreement); - pk_backend_error_code (backend, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, - "licence not installed so cannot install"); - pk_backend_finished (backend); + "Captain: What happen ?\n" + "Mechanic: Somebody set up us the bomb.\n\n" + "Operator: We get signal.\n" + "Captain: What !\n" + "Operator: Main screen turn on.\n" + "Captain: It's you !!\n" + "CATS: How are you gentlemen !!\n" + "CATS: All your base are belong to us.\n" + "CATS: You are on the way to destruction.\n\n" + "Captain: What you say !!\n" + "CATS: You have no chance to survive make your time.\n" + "CATS: Ha Ha Ha Ha ....\n\n" + "Operator: Captain!! *\n" + "Captain: Take off every 'ZIG' !!\n" + "Captain: You know what you doing.\n" + "Captain: Move 'ZIG'.\n" + "Captain: For great justice.\n"; + pk_backend_eula_required(backend, eula_id, package_ids[0], + "CATS Inc.", license_agreement); + pk_backend_error_code(backend, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, + "licence not installed so cannot install"); + pk_backend_finished(backend); return; } if (_use_media) { _use_media = FALSE; - pk_backend_media_change_required (backend, PK_MEDIA_TYPE_ENUM_DVD, "linux-disk-1of7", "Linux Disc 1 of 7"); - pk_backend_error_code (backend, PK_ERROR_ENUM_MEDIA_CHANGE_REQUIRED, - "additional media linux-disk-1of7 required"); - pk_backend_finished (backend); + pk_backend_media_change_required(backend, PK_MEDIA_TYPE_ENUM_DVD, "linux-disk-1of7", "Linux Disc 1 of 7"); + pk_backend_error_code(backend, PK_ERROR_ENUM_MEDIA_CHANGE_REQUIRED, + "additional media linux-disk-1of7 required"); + pk_backend_finished(backend); return; } } - if (_use_trusted && only_trusted) { - pk_backend_error_code (backend, PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED, - "Can't install as untrusted"); - pk_backend_finished (backend); + pk_backend_error_code(backend, PK_ERROR_ENUM_CANNOT_INSTALL_REPO_UNSIGNED, + "Can't install as untrusted"); + pk_backend_finished(backend); return; } - - pk_backend_set_allow_cancel (backend, TRUE); + pk_backend_set_allow_cancel(backend, TRUE); _progress_percentage = 0; - pk_backend_package (backend, PK_INFO_ENUM_DOWNLOADING, - "gtkhtml2;2.19.1-4.fc8;i386;fedora", - "An HTML widget for GTK+ 2.0"); - _signal_timeout = g_timeout_add (100, pk_backend_install_timeout, backend); + pk_backend_package(backend, PK_INFO_ENUM_DOWNLOADING, + "gtkhtml2;2.19.1-4.fc8;i386;fedora", + "An HTML widget for GTK+ 2.0"); + _signal_timeout = g_timeout_add(100, pk_backend_install_timeout, backend); } /** * pk_backend_install_signature: */ void -pk_backend_install_signature (PkBackend *backend, PkSigTypeEnum type, - const gchar *key_id, const gchar *package_id) +pk_backend_install_signature(PkBackend * backend, PkSigTypeEnum type, + const gchar * key_id, const gchar * package_id) { - pk_backend_set_status (backend, PK_STATUS_ENUM_INSTALL); + pk_backend_set_status(backend, PK_STATUS_ENUM_INSTALL); if (type == PK_SIGTYPE_ENUM_GPG && - /* egg_strequal (package_id, "vips-doc;7.12.4-2.fc8;noarch;linva") && */ - g_strcmp0 (key_id, "BB7576AC") == 0) { - g_debug ("installed signature %s for %s", key_id, package_id); + /* egg_strequal (package_id, "vips-doc;7.12.4-2.fc8;noarch;linva") && */ + g_strcmp0(key_id, "BB7576AC") == 0) { + g_debug("installed signature %s for %s", key_id, package_id); _has_signature = TRUE; } else { - pk_backend_error_code (backend, PK_ERROR_ENUM_GPG_FAILURE, - "GPG key %s not recognised for package_id %s", - key_id, package_id); + pk_backend_error_code(backend, PK_ERROR_ENUM_GPG_FAILURE, + "GPG key %s not recognised for package_id %s", + key_id, package_id); } - pk_backend_finished (backend); + pk_backend_finished(backend); } /** * pk_backend_refresh_cache_timeout: */ -static gboolean -pk_backend_install_files_timeout (gpointer data) +static gboolean +pk_backend_install_files_timeout(gpointer data) { - PkBackend *backend = (PkBackend *) data; - pk_backend_finished (backend); + PkBackend *backend = (PkBackend *) data; + pk_backend_finished(backend); return FALSE; } @@ -572,28 +570,28 @@ * pk_backend_install_files: */ void -pk_backend_install_files (PkBackend *backend, gboolean only_trusted, gchar **full_paths) +pk_backend_install_files(PkBackend * backend, gboolean only_trusted, gchar ** full_paths) { - pk_backend_set_status (backend, PK_STATUS_ENUM_INSTALL); - pk_backend_set_percentage (backend, 101); - _signal_timeout = g_timeout_add (2000, pk_backend_install_files_timeout, backend); + pk_backend_set_status(backend, PK_STATUS_ENUM_INSTALL); + pk_backend_set_percentage(backend, 101); + _signal_timeout = g_timeout_add(2000, pk_backend_install_files_timeout, backend); } /** * pk_backend_refresh_cache_timeout: */ -static gboolean -pk_backend_refresh_cache_timeout (gpointer data) +static gboolean +pk_backend_refresh_cache_timeout(gpointer data) { - PkBackend *backend = (PkBackend *) data; + PkBackend *backend = (PkBackend *) data; if (_progress_percentage == 100) { - pk_backend_finished (backend); + pk_backend_finished(backend); return FALSE; } if (_progress_percentage == 80) - pk_backend_set_allow_cancel (backend, FALSE); + pk_backend_set_allow_cancel(backend, FALSE); _progress_percentage += 10; - pk_backend_set_percentage (backend, _progress_percentage); + pk_backend_set_percentage(backend, _progress_percentage); return TRUE; } @@ -601,7 +599,7 @@ * pk_backend_refresh_cache: */ void -pk_backend_refresh_cache (PkBackend *backend, gboolean force) +pk_backend_refresh_cache(PkBackend * backend, gboolean force) { _progress_percentage = 0; @@ -610,50 +608,50 @@ _updated_kernel = FALSE; _updated_powertop = FALSE; - pk_backend_set_allow_cancel (backend, TRUE); - pk_backend_set_status (backend, PK_STATUS_ENUM_REFRESH_CACHE); - _signal_timeout = g_timeout_add (500, pk_backend_refresh_cache_timeout, backend); + pk_backend_set_allow_cancel(backend, TRUE); + pk_backend_set_status(backend, PK_STATUS_ENUM_REFRESH_CACHE); + _signal_timeout = g_timeout_add(500, pk_backend_refresh_cache_timeout, backend); } /** * pk_backend_resolve_timeout: */ -static gboolean -pk_backend_resolve_timeout (gpointer data) +static gboolean +pk_backend_resolve_timeout(gpointer data) { - PkBackend *backend = (PkBackend *) data; - guint i; - guint len; - gchar **packages = _package_ids; + PkBackend *backend = (PkBackend *) data; + guint i; + guint len; + gchar **packages = _package_ids; - pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY); - pk_backend_set_percentage (backend, 0); + pk_backend_set_status(backend, PK_STATUS_ENUM_QUERY); + pk_backend_set_percentage(backend, 0); /* each one has a different detail for testing */ - len = g_strv_length (packages); - for (i=0; i Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DD652239 for ; Thu, 20 Jun 2013 11:40:38 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id B5A971EC6 for ; Thu, 20 Jun 2013 11:40:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KBecQL093318 for ; Thu, 20 Jun 2013 11:40:38 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5KBecEu093306 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 11:40:38 GMT (envelope-from dpl@FreeBSD.org) Date: Thu, 20 Jun 2013 11:40:38 GMT Message-Id: <201306201140.r5KBecEu093306@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253280 - soc2013/dpl/head/contrib/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 11:40:38 -0000 Author: dpl Date: Thu Jun 20 11:40:38 2013 New Revision: 253280 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253280 Log: Switch to socketpair(2). Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Thu Jun 20 09:55:53 2013 (r253279) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Thu Jun 20 11:40:38 2013 (r253280) @@ -222,7 +222,7 @@ Int32 workFactor; #ifdef CAPSICUM -int s, s2, len; +int sv[2], len; struct sockaddr_un sock, remoteSock; char *sockPath = "/tmp/bzip2"; #endif @@ -981,7 +981,7 @@ IntNative fh; fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR); /*# ifdef CAPSICUM*/ - /*cap_rights_limit(fh, CAP_WRITE);*/ + cap_rights_limit(fh, CAP_WRITE); /*# endif*/ if (fh == -1) return NULL; fp = fdopen(fh, mode); @@ -1245,7 +1245,7 @@ if ( srcMode != SM_I2O ){ # ifdef CAPSICUM infd = open( inName, O_RDONLY ); - /*cap_rights_limit(infd, CAP_READ);*/ + cap_rights_limit(infd, CAP_READ); inStr = fdopen ( infd, "rb" ); # else infd = NULL; @@ -1322,6 +1322,7 @@ /* Pass the limited file descriptors with a unix domain socket. */ switch( forkpid = rfork(RFPROC | RFCFDG) ) { case ( 0 ): + /* revmsg() the FDs */ if (cap_enter() < 0) { fprintf ( stderr, "%s: Couldn't enter capability mode: %s.\n", progName, strerror(errno) ); @@ -1355,9 +1356,6 @@ exit(1); default: - listen(s, 2); - len = sizeof(struct sockaddr_un); - accept(s, (struct sockaddr *) &remoteSock, &len); /* Send the two FDs */ wait(NULL); if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ @@ -2032,21 +2030,11 @@ sock.sun_family = PF_LOCAL; strncpy(sock.sun_path, sockPath, sizeof(sock.sun_path)); - if ( (s = socket(PF_LOCAL, SOCK_STREAM, 0)) == -1 ){ + if ( socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) == -1 ){ fprintf ( stderr, "%s: Can't create socket: %s.\n", progName, strerror(errno) ); exit(1); } - if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ - fprintf ( stderr, "%s: Can't unlink socket: %s.\n", progName, strerror(errno) ); - exit(1); - } - - if ( (s = bind(s, (struct sockaddr *) &sock, SUN_LEN( &sock ) )) == -1 ){ - fprintf ( stderr, "%s: Can't bind socket: %s.\n", progName, strerror(errno) ); - exit(1); - } - /* XXX - Factorize code here */ /*if (srcMode == SM_I2O) {*/ /*if (opMode == OM_Z )*/ From owner-svn-soc-all@FreeBSD.ORG Thu Jun 20 19:29:26 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 347609F1 for ; Thu, 20 Jun 2013 19:29:26 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 17E3F1144 for ; Thu, 20 Jun 2013 19:29:26 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KJTPfL035390 for ; Thu, 20 Jun 2013 19:29:25 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5KJTP3E035385 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 19:29:25 GMT (envelope-from mattbw@FreeBSD.org) Date: Thu, 20 Jun 2013 19:29:25 GMT Message-Id: <201306201929.r5KJTP3E035385@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253294 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 19:29:26 -0000 Author: mattbw Date: Thu Jun 20 19:29:25 2013 New Revision: 253294 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253294 Log: Split off get-details implementation details to their own file. Temporarily force clang in Makefile. Added: soc2013/mattbw/dummy/get-details.c soc2013/mattbw/dummy/get-details.h Modified: soc2013/mattbw/dummy/Makefile soc2013/mattbw/dummy/pk-backend-pkgng.c Modified: soc2013/mattbw/dummy/Makefile ============================================================================== --- soc2013/mattbw/dummy/Makefile Thu Jun 20 18:25:10 2013 (r253293) +++ soc2013/mattbw/dummy/Makefile Thu Jun 20 19:29:25 2013 (r253294) @@ -1,8 +1,11 @@ # $FreeBSD$ +# Temporary +CC= clang + LIB= pk_backend_pkgng SHLIB_MAJOR= 1 -SRCS= pk-backend-pkgng.c +SRCS= pk-backend-pkgng.c get-details.c USE_PK_PKGCONF= 0 Added: soc2013/mattbw/dummy/get-details.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/get-details.c Thu Jun 20 19:29:25 2013 (r253294) @@ -0,0 +1,122 @@ +/*- + * Copyright (C) 2013 Matt Windsor + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include "pk-backend.h" +#include "pkg.h" + +gboolean +get_details_check_matches(struct pkgdb_it *matches, gchar *id_name, gchar *id_version, gchar *id_arch, gchar *id_data, PkBackend *backend) +{ + gboolean found; + int err; + struct pkg *match; + + found = FALSE; + do { + err = pkgdb_it_next(matches, &match, PKG_LOAD_BASIC); + if (err == EPKG_OK) { + const char *name; + const char *version; + const char *description; + const char *arch; + const char *reponame; + const char *data; + const char *www; + pkg_t type; + + pkg_get2(match, + PKG_NAME, &name, + PKG_VERSION, &version, + PKG_DESC, &description, + PKG_ARCH, &arch, + PKG_REPONAME, &reponame, + PKG_WWW, &www); + + if (type == PKG_FILE) + data = "local"; + else if (type == PKG_INSTALLED) + data = "installed"; + else + data = reponame; + + if ((id_name == NULL || g_strcmp0(name, id_name) == 0) && + (id_version == NULL || g_strcmp0(version, id_version) == 0) && + (id_arch == NULL || g_strcmp0(arch, id_arch) == 0) && + (id_data == NULL || g_strcmp0(data, id_data) == 0)) { + gchar *new_id; + + found = TRUE; + new_id = pk_package_id_build(name, version, arch, data); + + /* TODO: implement category, size and licence */ + pk_backend_details(backend, + new_id, + NULL, + PK_GROUP_ENUM_PROGRAMMING, + description, + www, + 0 + ); + + g_free(new_id); + } + } + } while (err == EPKG_OK && found == FALSE); + + if (found == FALSE) + pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); + + return found; +} + +gboolean +get_details_for(gchar *package_id, PkBackend *backend, struct pkgdb *db) +{ + gchar **parts; + gboolean success; + + success = FALSE; + + parts = pk_package_id_split(package_id); + if (parts == NULL) { + pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id"); + } else { + struct pkgdb_it *packages; + + packages = pkgdb_search(db, parts[PK_PACKAGE_ID_NAME], MATCH_EXACT, FIELD_NAME, NULL); + + if (packages) { + success = get_details_check_matches(packages, + parts[PK_PACKAGE_ID_NAME], + parts[PK_PACKAGE_ID_VERSION], + parts[PK_PACKAGE_ID_ARCH], + parts[PK_PACKAGE_ID_DATA], + backend); + + pkgdb_it_free(packages); + } else + pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); + + g_strfreev(parts); + } + + return success; +} Added: soc2013/mattbw/dummy/get-details.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/get-details.h Thu Jun 20 19:29:25 2013 (r253294) @@ -0,0 +1,26 @@ +/*- + * Copyright (C) 2013 Matt Windsor + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _GET_DETAILS_H_ +#define _GET_DETAILS_H_ + +gboolean get_details_for(gchar *package_id, PkBackend *backend, struct pkgdb *db); + +#endif /* !_GET_DETAILS_H_ */ Modified: soc2013/mattbw/dummy/pk-backend-pkgng.c ============================================================================== --- soc2013/mattbw/dummy/pk-backend-pkgng.c Thu Jun 20 18:25:10 2013 (r253293) +++ soc2013/mattbw/dummy/pk-backend-pkgng.c Thu Jun 20 19:29:25 2013 (r253294) @@ -30,6 +30,8 @@ #include "pk-backend.h" #include "pkg.h" +#include "get-details.h" + /* static bodges */ static guint _progress_percentage = 0; static gulong _signal_timeout = 0; @@ -171,106 +173,6 @@ pk_backend_finished(backend); } - -gboolean -get_details_check_matches(struct pkgdb_it *matches, gchar *id_name, gchar *id_version, gchar *id_arch, gchar *id_data, PkBackend *backend) -{ - gboolean found; - int err; - struct pkg *match; - - found = FALSE; - do { - err = pkgdb_it_next(matches, &match, PKG_LOAD_BASIC); - if (err == EPKG_OK) { - const char *name; - const char *version; - const char *description; - const char *arch; - const char *reponame; - const char *data; - const char *www; - pkg_t type; - - pkg_get2(match, - PKG_NAME, &name, - PKG_VERSION, &version, - PKG_DESC, &description, - PKG_ARCH, &arch, - PKG_REPONAME, &reponame, - PKG_WWW, &www); - - if (type == PKG_FILE) - data = "local"; - else if (type == PKG_INSTALLED) - data = "installed"; - else - data = reponame; - - if ((id_name == NULL || g_strcmp0(name, id_name) == 0) && - (id_version == NULL || g_strcmp0(version, id_version) == 0) && - (id_arch == NULL || g_strcmp0(arch, id_arch) == 0) && - (id_data == NULL || g_strcmp0(data, id_data) == 0)) { - gchar *new_id; - - found = TRUE; - new_id = pk_package_id_build(name, version, arch, data); - - /* TODO: implement category, size and licence */ - pk_backend_details(backend, - new_id, - NULL, - PK_GROUP_ENUM_PROGRAMMING, - description, - www, - 0 - ); - - g_free(new_id); - } - } - } while (err == EPKG_OK && found == FALSE); - - if (found == FALSE) - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); - - return found; -} - -gboolean -get_details_for(gchar *package_id, PkBackend *backend) -{ - gchar **parts; - gboolean success; - - success = FALSE; - - parts = pk_package_id_split(package_id); - if (parts == NULL) { - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id"); - } else { - struct pkgdb_it *packages; - - packages = pkgdb_search(priv.db, parts[PK_PACKAGE_ID_NAME], MATCH_EXACT, FIELD_NAME, NULL); - - if (packages) { - success = get_details_check_matches(packages, - parts[PK_PACKAGE_ID_NAME], - parts[PK_PACKAGE_ID_VERSION], - parts[PK_PACKAGE_ID_ARCH], - parts[PK_PACKAGE_ID_DATA], - backend); - - pkgdb_it_free(packages); - } else - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); - - g_strfreev(parts); - } - - return success; -} - gboolean backend_get_details_thread(PkBackend *backend) { @@ -285,8 +187,8 @@ len = g_strv_length(package_ids); pk_backend_set_percentage(backend, 0); - for (i = 0, no_error_yet = TRUE; i < len, no_error_yet; i++) { - no_error_yet = get_details_for(package_ids[0], backend); + for (i = 0, no_error_yet = TRUE; i < len && no_error_yet; i++) { + no_error_yet = get_details_for(package_ids[0], backend, priv.db); pk_backend_set_percentage(backend, ((i * 100) / len)); } From owner-svn-soc-all@FreeBSD.ORG Thu Jun 20 21:36:40 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3C667DF8 for ; Thu, 20 Jun 2013 21:36:40 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 1F3A21887 for ; Thu, 20 Jun 2013 21:36:40 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KLad80069911 for ; Thu, 20 Jun 2013 21:36:39 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5KLadaA069903 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 21:36:39 GMT (envelope-from mattbw@FreeBSD.org) Date: Thu, 20 Jun 2013 21:36:39 GMT Message-Id: <201306202136.r5KLadaA069903@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253297 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 21:36:40 -0000 Author: mattbw Date: Thu Jun 20 21:36:39 2013 New Revision: 253297 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253297 Log: create database when needed; init and shutdown pkg; currently segfaults. Modified: soc2013/mattbw/dummy/get-details.c soc2013/mattbw/dummy/pk-backend-pkgng.c Modified: soc2013/mattbw/dummy/get-details.c ============================================================================== --- soc2013/mattbw/dummy/get-details.c Thu Jun 20 19:56:26 2013 (r253296) +++ soc2013/mattbw/dummy/get-details.c Thu Jun 20 21:36:39 2013 (r253297) @@ -42,7 +42,7 @@ const char *www; pkg_t type; - pkg_get2(match, + pkg_get(match, PKG_NAME, &name, PKG_VERSION, &version, PKG_DESC, &description, @@ -82,7 +82,7 @@ } while (err == EPKG_OK && found == FALSE); if (found == FALSE) - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); + pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, "name matches found but no packageid matches"); return found; } @@ -96,9 +96,9 @@ success = FALSE; parts = pk_package_id_split(package_id); - if (parts == NULL) { + if (parts == NULL) pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id"); - } else { + else { struct pkgdb_it *packages; packages = pkgdb_search(db, parts[PK_PACKAGE_ID_NAME], MATCH_EXACT, FIELD_NAME, NULL); @@ -113,7 +113,7 @@ pkgdb_it_free(packages); } else - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, NULL); + pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, "no name matches"); g_strfreev(parts); } Modified: soc2013/mattbw/dummy/pk-backend-pkgng.c ============================================================================== --- soc2013/mattbw/dummy/pk-backend-pkgng.c Thu Jun 20 19:56:26 2013 (r253296) +++ soc2013/mattbw/dummy/pk-backend-pkgng.c Thu Jun 20 21:36:39 2013 (r253297) @@ -62,19 +62,43 @@ static struct pkgng_private priv; +gboolean +open_remote_db(struct pkgdb **db, PkBackend *backend) +{ + gboolean success; + int open_return; + + success = FALSE; + open_return = pkgdb_open(db, PKGDB_REMOTE); + if (open_return != EPKG_OK) + pk_backend_error_code(backend, + PK_ERROR_ENUM_INTERNAL_ERROR, + "pkgdb_open returned an error"); + else if (*db == NULL) + pk_backend_error_code(backend, + PK_ERROR_ENUM_INTERNAL_ERROR, + "pkgdb_open gave us a null pointer"); + else + success = TRUE; + + return success; +} + /** * pk_backend_initialize: */ void pk_backend_initialize(PkBackend * backend) { - int open_return; + int err; _progress_percentage = 0; - open_return = pkgdb_open(&(priv.db), PKGDB_REMOTE); - - /* TODO: handle open_return not being EPKG_OK */ + err = pkg_init(NULL); + if (err) + pk_backend_error_code(backend, + PK_ERROR_ENUM_INTERNAL_ERROR, + "could not initialise pkg"); } /** @@ -83,8 +107,7 @@ void pk_backend_destroy(PkBackend * backend) { - if (priv.db) - pkgdb_close(priv.db); + pkg_shutdown(); } /** @@ -180,19 +203,21 @@ gchar **package_ids; guint len; guint i; - struct pkgdb_it *packages; + struct pkgdb *db; package_ids = pk_backend_get_strv(backend, "package_ids"); len = g_strv_length(package_ids); + db = NULL; + no_error_yet = open_remote_db(&db, backend); + pk_backend_set_percentage(backend, 0); - for (i = 0, no_error_yet = TRUE; i < len && no_error_yet; i++) { - no_error_yet = get_details_for(package_ids[0], backend, priv.db); + for (i = 0; i < len && no_error_yet; i++) { + no_error_yet = get_details_for(package_ids[0], backend, db); pk_backend_set_percentage(backend, ((i * 100) / len)); } - - + pkgdb_close(db); pk_backend_finished(backend); return no_error_yet; From owner-svn-soc-all@FreeBSD.ORG Thu Jun 20 22:55:43 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7457A5F1 for ; Thu, 20 Jun 2013 22:55:43 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 63D561B5D for ; Thu, 20 Jun 2013 22:55:43 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KMtgnq090893 for ; Thu, 20 Jun 2013 22:55:42 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5KMtg57090890 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 22:55:42 GMT (envelope-from mattbw@FreeBSD.org) Date: Thu, 20 Jun 2013 22:55:42 GMT Message-Id: <201306202255.r5KMtg57090890@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253303 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 22:55:43 -0000 Author: mattbw Date: Thu Jun 20 22:55:42 2013 New Revision: 253303 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253303 Log: use query/rquery instead of search; first signs of working Modified: soc2013/mattbw/dummy/Makefile soc2013/mattbw/dummy/get-details.c Modified: soc2013/mattbw/dummy/Makefile ============================================================================== --- soc2013/mattbw/dummy/Makefile Thu Jun 20 21:50:04 2013 (r253302) +++ soc2013/mattbw/dummy/Makefile Thu Jun 20 22:55:42 2013 (r253303) @@ -1,8 +1,5 @@ # $FreeBSD$ -# Temporary -CC= clang - LIB= pk_backend_pkgng SHLIB_MAJOR= 1 SRCS= pk-backend-pkgng.c get-details.c Modified: soc2013/mattbw/dummy/get-details.c ============================================================================== --- soc2013/mattbw/dummy/get-details.c Thu Jun 20 21:50:04 2013 (r253302) +++ soc2013/mattbw/dummy/get-details.c Thu Jun 20 22:55:42 2013 (r253303) @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include + #include #include "pk-backend.h" #include "pkg.h" @@ -30,6 +32,7 @@ struct pkg *match; found = FALSE; + match = NULL; do { err = pkgdb_it_next(matches, &match, PKG_LOAD_BASIC); if (err == EPKG_OK) { @@ -50,12 +53,17 @@ PKG_REPONAME, &reponame, PKG_WWW, &www); - if (type == PKG_FILE) + switch(pkg_type(match)) { + case PKG_FILE: data = "local"; - else if (type == PKG_INSTALLED) + break; + case PKG_INSTALLED: data = "installed"; - else + break; + default: data = reponame; + break; + } if ((id_name == NULL || g_strcmp0(name, id_name) == 0) && (id_version == NULL || g_strcmp0(version, id_version) == 0) && @@ -81,13 +89,57 @@ } } while (err == EPKG_OK && found == FALSE); - if (found == FALSE) - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, "name matches found but no packageid matches"); - return found; } gboolean +get_local_details(gchar *name, + gchar *version, + gchar *arch, + PkBackend *backend, + struct pkgdb *db) +{ + struct pkgdb_it *it; + gboolean success; + + success = FALSE; + it = pkgdb_query(db, name, MATCH_EXACT); + if (it) + success = get_details_check_matches( + it, + name, + version, + arch, + "installed", + backend); + return success; +} + +gboolean +get_remote_details(gchar *name, + gchar *version, + gchar *arch, + gchar *reponame, + PkBackend *backend, + struct pkgdb *db) +{ + struct pkgdb_it *it; + gboolean success; + + success = FALSE; + it = pkgdb_rquery(db, name, MATCH_EXACT, reponame); + if (it) + success = get_details_check_matches( + it, + name, + version, + arch, + reponame, + backend); + return success; +} + +gboolean get_details_for(gchar *package_id, PkBackend *backend, struct pkgdb *db) { gchar **parts; @@ -97,24 +149,58 @@ parts = pk_package_id_split(package_id); if (parts == NULL) - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_ID_INVALID, "invalid package id"); + pk_backend_error_code(backend, + PK_ERROR_ENUM_PACKAGE_ID_INVALID, + "invalid package id"); else { struct pkgdb_it *packages; + /* Parts of the package ID */ + gchar *name; + gchar *version; + gchar *arch; + gchar *data; + + name = parts[PK_PACKAGE_ID_NAME]; + if (name != NULL && strlen(name) == 0) + name = NULL; + + version = parts[PK_PACKAGE_ID_VERSION]; + if (version != NULL && strlen(version) == 0) + version = NULL; + + arch = parts[PK_PACKAGE_ID_ARCH]; + if (arch != NULL && strlen(arch) == 0) + arch = NULL; + + data = parts[PK_PACKAGE_ID_DATA]; + if (data != NULL && strlen(data) == 0) + data = NULL; - packages = pkgdb_search(db, parts[PK_PACKAGE_ID_NAME], MATCH_EXACT, FIELD_NAME, NULL); - if (packages) { - success = get_details_check_matches(packages, - parts[PK_PACKAGE_ID_NAME], - parts[PK_PACKAGE_ID_VERSION], - parts[PK_PACKAGE_ID_ARCH], - parts[PK_PACKAGE_ID_DATA], - backend); - - pkgdb_it_free(packages); - } else - pk_backend_error_code(backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, "no name matches"); + /* If the PackageID is for an installed package, do a local query. + * If it is for a specific repo, do a remote query on it. + * And if the PackageID has no repository information at all, + * check both local and repo-generic remote. + * (TODO: local packages?) + */ + if (g_strcmp0(data, "installed") == 0) + success = get_local_details(name, version, arch, backend, db); + else if (data != NULL) /* FIXME: treats 'local' as repo */ + success = get_remote_details(name, version, arch, data, backend, db); + else { + /* TODO: ensure this is correct behaviour */ + success = get_local_details(name, version, arch, backend, db); + if (success == FALSE) + success = get_remote_details(name, version, arch, data, backend, db); + } + /* Assume any error is due to not finding packages. + * At time of writing this is true, but may change. + */ + if (success == FALSE) + pk_backend_error_code(backend, + PK_ERROR_ENUM_PACKAGE_NOT_FOUND, + "package not found"); g_strfreev(parts); } From owner-svn-soc-all@FreeBSD.ORG Thu Jun 20 23:13:11 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D45D3AB1 for ; Thu, 20 Jun 2013 23:13:11 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id B689A1C11 for ; Thu, 20 Jun 2013 23:13:11 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KNDBeS088771 for ; Thu, 20 Jun 2013 23:13:11 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5KNDBHQ088767 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 23:13:11 GMT (envelope-from mattbw@FreeBSD.org) Date: Thu, 20 Jun 2013 23:13:11 GMT Message-Id: <201306202313.r5KNDBHQ088767@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253306 - soc2013/mattbw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 23:13:11 -0000 Author: mattbw Date: Thu Jun 20 23:13:11 2013 New Revision: 253306 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253306 Log: belatedly add testing code I wrote for get-updates, for posterity Added: soc2013/mattbw/querytest.c soc2013/mattbw/searchtest.c Modified: soc2013/mattbw/test.c Added: soc2013/mattbw/querytest.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/querytest.c Thu Jun 20 23:13:11 2013 (r253306) @@ -0,0 +1,85 @@ +#include +#include +#include "pkg.h" + +void handle_it(struct pkgdb_it *it); + +int +getdb(struct pkgdb **db) +{ + int err; + + /* err = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO); + + if (err == EPKG_ENOACCESS) + fprintf(stderr, "check your privilege\n", err); + else if (err != EPKG_OK) + fprintf(stderr, "access error: %i\n", err); + else */{ + err = pkgdb_open(db, PKGDB_REMOTE); + if (err != EPKG_OK) + fprintf(stderr, "open error: %i\n", err); + } + return err; +} + +int +main(int argc, char **argv) +{ + struct pkgdb *db; + int err; + + db = NULL; + + err = pkg_init(NULL); + if (err == EPKG_OK) + err = getdb(&db); + else + fprintf(stderr, "could not parse config file\n"); + + if (err == EPKG_OK) { + struct pkgdb_it *it; + + it = pkgdb_query(db, "pkg", MATCH_EXACT); + if (it == NULL) + printf("no local matches!\n"); + else handle_it(it); + + it = pkgdb_rquery(db, "pkg", MATCH_EXACT, NULL); + if (it == NULL) + printf("no remote matches!\n"); + else handle_it(it); + + printf("shutting down\n"); + pkgdb_it_free(it); + pkgdb_close(db); + pkg_shutdown(); + printf("shutdown\n"); + } +} + + +void +handle_it(struct pkgdb_it *it) +{ + int err; + struct pkg *match; + + match = NULL; + do { + err = pkgdb_it_next(it, &match, PKG_LOAD_BASIC); + if (err == EPKG_OK) { + const char *name; + const char *repo; + const char *desc; + const char *origin; + + pkg_get(match, PKG_NAME, &name, PKG_DESC, &desc, PKG_REPONAME, &repo, PKG_ORIGIN, &origin); + + printf("name: %s\nrepo: %s\ndesc: %s\n", name, repo, desc); + } + + } while (err == EPKG_OK); + + pkg_free(match); +} Added: soc2013/mattbw/searchtest.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/searchtest.c Thu Jun 20 23:13:11 2013 (r253306) @@ -0,0 +1,82 @@ +#include +#include +#include "pkg.h" + +int +getdb(struct pkgdb **db) +{ + int err; + + /* err = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO); + + if (err == EPKG_ENOACCESS) + fprintf(stderr, "check your privilege\n", err); + else if (err != EPKG_OK) + fprintf(stderr, "access error: %i\n", err); + else */{ + err = pkgdb_open(db, PKGDB_REMOTE); + if (err != EPKG_OK) + fprintf(stderr, "open error: %i\n", err); + } + return err; +} + +int +main(int argc, char **argv) +{ + struct pkgdb *db; + int err; + + db = NULL; + + err = pkg_init(NULL); + if (err == EPKG_OK) + err = getdb(&db); + else + fprintf(stderr, "could not parse config file\n"); + + if (err == EPKG_OK) { + struct pkgdb_it *it; + + it = pkgdb_search(db, + "pkg", + MATCH_EXACT, + FIELD_NAME, + NULL); + if (it == NULL) + printf("no matches!\n"); + else { + int err; + struct pkg *match; + + match = NULL; + do { + err = pkgdb_it_next(it, &match, PKG_LOAD_BASIC); + if (err == EPKG_OK) { + const char *name; + const char *repo; + const char *desc; + const char *origin; + + pkg_get(match, PKG_NAME, &name, PKG_DESC, &desc, PKG_REPONAME, &repo, PKG_ORIGIN, &origin); + + printf("name: %s\nrepo: %s\ndesc: %s\n", name, repo, desc); + + if (pkg_is_installed(db, origin) == EPKG_OK) + printf("installed\n"); + else + printf("not installed\n"); + } + + } while (err == EPKG_OK); + + pkg_free(match); + } + + printf("shutting down\n"); + pkgdb_it_free(it); + pkgdb_close(db); + pkg_shutdown(); + printf("shutdown\n"); + } +} Modified: soc2013/mattbw/test.c ============================================================================== --- soc2013/mattbw/test.c Thu Jun 20 22:50:08 2013 (r253305) +++ soc2013/mattbw/test.c Thu Jun 20 23:13:11 2013 (r253306) @@ -28,6 +28,7 @@ printf("pkgng version: %s\n", PKGVERSION); printf("packagekit version: %i.%i.%i\n", PK_MAJOR_VERSION, PK_MINOR_VERSION, PK_MICRO_VERSION); + printf("network: %s\n", ((g_network_monitor_get_network_available(nmon) == TRUE) ? "up" : "down")); for(;;) ; From owner-svn-soc-all@FreeBSD.ORG Fri Jun 21 18:04:38 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6207D7A0 for ; Fri, 21 Jun 2013 18:04:38 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 538DC1D3B for ; Fri, 21 Jun 2013 18:04:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LI4bXX083359 for ; Fri, 21 Jun 2013 18:04:37 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5LI4bYr083348 for svn-soc-all@FreeBSD.org; Fri, 21 Jun 2013 18:04:37 GMT (envelope-from mattbw@FreeBSD.org) Date: Fri, 21 Jun 2013 18:04:37 GMT Message-Id: <201306211804.r5LI4bYr083348@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253322 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jun 2013 18:04:38 -0000 Author: mattbw Date: Fri Jun 21 18:04:37 2013 New Revision: 253322 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253322 Log: some indent-ing, added flatsize, have not compiled yet, may not work. Will fix up later Added: soc2013/mattbw/dummy/.indent.pro Modified: soc2013/mattbw/dummy/get-details.c Added: soc2013/mattbw/dummy/.indent.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/.indent.pro Fri Jun 21 18:04:37 2013 (r253322) @@ -0,0 +1,3 @@ +-TPkBackend +-Tgchar +-Tgboolean Modified: soc2013/mattbw/dummy/get-details.c ============================================================================== --- soc2013/mattbw/dummy/get-details.c Fri Jun 21 17:36:33 2013 (r253321) +++ soc2013/mattbw/dummy/get-details.c Fri Jun 21 18:04:37 2013 (r253322) @@ -24,36 +24,65 @@ #include "pk-backend.h" #include "pkg.h" +/* + * Checks two strings with strcmp and emits TRUE if they match. If either + * string is NULL, emit TRUE as well (this is so that missing PackageID + * elements trigger matches). + */ gboolean -get_details_check_matches(struct pkgdb_it *matches, gchar *id_name, gchar *id_version, gchar *id_arch, gchar *id_data, PkBackend *backend) +string_match(const char *left, const char *right) +{ + int result; + + if (left == NULL || right == NULL) + result = TRUE; + else + result = (strcmp(left, right) == 0 ? TRUE : FALSE); + + return result; +} + +/* + * Go through a database iterator of possible package matches and emit any + * that match the split PackageID. + */ +gboolean +get_details_check_matches(struct pkgdb_it *matches, + gchar *id_name, + gchar *id_version, + gchar *id_arch, + gchar *id_data, + PkBackend *backend) { gboolean found; int err; - struct pkg *match; + struct pkg *match; found = FALSE; match = NULL; do { err = pkgdb_it_next(matches, &match, PKG_LOAD_BASIC); if (err == EPKG_OK) { - const char *name; - const char *version; - const char *description; - const char *arch; - const char *reponame; - const char *data; - const char *www; - pkg_t type; + const char *arch; + const char *data; + const char *description; + const char *name; + const char *reponame; + const char *version; + const char *www; + pkg_t type; + int64_t flatsize; pkg_get(match, - PKG_NAME, &name, - PKG_VERSION, &version, - PKG_DESC, &description, - PKG_ARCH, &arch, - PKG_REPONAME, &reponame, - PKG_WWW, &www); + PKG_ARCH, &arch, + PKG_DESC, &description, + PKG_NAME, &name, + PKG_REPONAME, &reponame, + PKG_VERSION, &version, + PKG_WWW, &www, + PKG_FLATSIZE, &size); - switch(pkg_type(match)) { + switch (pkg_type(match)) { case PKG_FILE: data = "local"; break; @@ -65,24 +94,29 @@ break; } - if ((id_name == NULL || g_strcmp0(name, id_name) == 0) && - (id_version == NULL || g_strcmp0(version, id_version) == 0) && - (id_arch == NULL || g_strcmp0(arch, id_arch) == 0) && - (id_data == NULL || g_strcmp0(data, id_data) == 0)) { - gchar *new_id; + /* + * Emit if this package's PackageID fields match the + * original PackageID. Of course, the original ID + * might have missing fields (NULLs), so we treat a + * comparison involving one as a success. + */ + if (string_match(name, id_name) && + string_match(version, id_version) && + string_match(arch, id_arch) && + string_match(data, id_data)) { + gchar *new_id; found = TRUE; new_id = pk_package_id_build(name, version, arch, data); /* TODO: implement category, size and licence */ pk_backend_details(backend, - new_id, - NULL, - PK_GROUP_ENUM_PROGRAMMING, - description, - www, - 0 - ); + new_id, + NULL, + PK_GROUP_ENUM_PROGRAMMING, + description, + www, + flatsize); g_free(new_id); } @@ -92,12 +126,13 @@ return found; } +/* Looks the split PackageID up in the local database. */ gboolean get_local_details(gchar *name, - gchar *version, - gchar *arch, - PkBackend *backend, - struct pkgdb *db) + gchar *version, + gchar *arch, + PkBackend *backend, + struct pkgdb *db) { struct pkgdb_it *it; gboolean success; @@ -106,22 +141,23 @@ it = pkgdb_query(db, name, MATCH_EXACT); if (it) success = get_details_check_matches( - it, - name, - version, - arch, - "installed", - backend); + it, + name, + version, + arch, + "installed", + backend); return success; } +/* Looks the split PackageID up in the remote database. */ gboolean get_remote_details(gchar *name, - gchar *version, - gchar *arch, - gchar *reponame, - PkBackend *backend, - struct pkgdb *db) + gchar *version, + gchar *arch, + gchar *reponame, + PkBackend *backend, + struct pkgdb *db) { struct pkgdb_it *it; gboolean success; @@ -130,35 +166,35 @@ it = pkgdb_rquery(db, name, MATCH_EXACT, reponame); if (it) success = get_details_check_matches( - it, - name, - version, - arch, - reponame, - backend); + it, + name, + version, + arch, + reponame, + backend); return success; } gboolean get_details_for(gchar *package_id, PkBackend *backend, struct pkgdb *db) { - gchar **parts; + gchar **parts; gboolean success; success = FALSE; parts = pk_package_id_split(package_id); - if (parts == NULL) + if (parts == NULL) pk_backend_error_code(backend, - PK_ERROR_ENUM_PACKAGE_ID_INVALID, - "invalid package id"); + PK_ERROR_ENUM_PACKAGE_ID_INVALID, + "invalid package id"); else { struct pkgdb_it *packages; /* Parts of the package ID */ - gchar *name; - gchar *version; - gchar *arch; - gchar *data; + gchar *name; + gchar *version; + gchar *arch; + gchar *data; name = parts[PK_PACKAGE_ID_NAME]; if (name != NULL && strlen(name) == 0) @@ -178,15 +214,16 @@ - /* If the PackageID is for an installed package, do a local query. - * If it is for a specific repo, do a remote query on it. - * And if the PackageID has no repository information at all, - * check both local and repo-generic remote. - * (TODO: local packages?) + /* + * If the PackageID is for an installed package, do a local + * query. If it is for a specific repo, do a remote query on + * it. And if the PackageID has no repository information at + * all, check both local and repo-generic remote. (TODO: + * local packages?) */ if (g_strcmp0(data, "installed") == 0) success = get_local_details(name, version, arch, backend, db); - else if (data != NULL) /* FIXME: treats 'local' as repo */ + else if (data != NULL) /* FIXME: treats 'local' as repo */ success = get_remote_details(name, version, arch, data, backend, db); else { /* TODO: ensure this is correct behaviour */ @@ -194,15 +231,16 @@ if (success == FALSE) success = get_remote_details(name, version, arch, data, backend, db); } - /* Assume any error is due to not finding packages. - * At time of writing this is true, but may change. + /* + * Assume any error is due to not finding packages. At time + * of writing this is true, but may change. */ if (success == FALSE) pk_backend_error_code(backend, - PK_ERROR_ENUM_PACKAGE_NOT_FOUND, - "package not found"); + PK_ERROR_ENUM_PACKAGE_NOT_FOUND, + "package not found"); g_strfreev(parts); } - + return success; } From owner-svn-soc-all@FreeBSD.ORG Fri Jun 21 22:34:18 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 659BB7E3 for ; Fri, 21 Jun 2013 22:34:18 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id 3C9B21CEC for ; Fri, 21 Jun 2013 22:34:18 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LMYImd062355 for ; Fri, 21 Jun 2013 22:34:18 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5LMYIEi062348 for svn-soc-all@FreeBSD.org; Fri, 21 Jun 2013 22:34:18 GMT (envelope-from dpl@FreeBSD.org) Date: Fri, 21 Jun 2013 22:34:18 GMT Message-Id: <201306212234.r5LMYIEi062348@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253331 - soc2013/dpl/head/contrib/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jun 2013 22:34:18 -0000 Author: dpl Date: Fri Jun 21 22:34:17 2013 New Revision: 253331 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253331 Log: Declare things only if we're going to use them. Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Fri Jun 21 21:59:58 2013 (r253330) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Fri Jun 21 22:34:17 2013 (r253331) @@ -223,8 +223,15 @@ #ifdef CAPSICUM int sv[2], len; -struct sockaddr_un sock, remoteSock; -char *sockPath = "/tmp/bzip2"; +struct cmsghdr *cmsg; + +cmsg->cmsg_level = SOL_SOCKET; +cmsg->cmsg_type = SOL_RIGHTS; +struct msghdr msg; +msg.msg_name = NULL; +msg.msg_namelen = 0; +msg.msg_iov = NULL; +msg.msg_iovlen = 0; #endif static void panic ( const Char* ) NORETURN; @@ -980,9 +987,9 @@ FILE* fp; IntNative fh; fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR); -/*# ifdef CAPSICUM*/ +# ifdef CAPSICUM cap_rights_limit(fh, CAP_WRITE); -/*# endif*/ +# endif if (fh == -1) return NULL; fp = fdopen(fh, mode); if (fp == NULL) close(fh); @@ -1154,7 +1161,11 @@ { FILE *inStr; FILE *outStr; - Int32 n, i, forkpid, infd; + Int32 n, i; +# ifdef CAPSICUM + Int32 infd; + pid_t forkpid; +# endif struct MY_STAT statBuf; deleteOutputOnInterrupt = False; @@ -1248,7 +1259,6 @@ cap_rights_limit(infd, CAP_READ); inStr = fdopen ( infd, "rb" ); # else - infd = NULL; inStr = fopen ( inName, "rb" ); # endif } @@ -1357,11 +1367,8 @@ default: /* Send the two FDs */ + sendmsg(); wait(NULL); - if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ - fprintf ( stderr, "%s: Can't unlink socket: %s.\n", progName, strerror(errno) ); - exit(1); - } return; } # endif @@ -1375,7 +1382,11 @@ { FILE *inStr; FILE *outStr; - Int32 n, i, infd; + Int32 n, i; +# ifdef CAPSICUM + Int32 infd; + pid_t forkpid; +# endif Bool magicNumberOK; Bool cantGuess; struct MY_STAT statBuf; @@ -1471,10 +1482,9 @@ if ( srcMode != SM_I2O ){ # ifdef CAPSICUM infd = open( inName, O_RDONLY ); - /*cap_rights_limit(infd, CAP_READ);*/ + cap_rights_limit(infd, CAP_READ); inStr = fdopen ( infd, "rb" ); # else - infd = NULL; inStr = fopen ( inName, "rb" ); # endif } @@ -2027,9 +2037,6 @@ # ifdef CAPSICUM - sock.sun_family = PF_LOCAL; - strncpy(sock.sun_path, sockPath, sizeof(sock.sun_path)); - if ( socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) == -1 ){ fprintf ( stderr, "%s: Can't create socket: %s.\n", progName, strerror(errno) ); exit(1); From owner-svn-soc-all@FreeBSD.ORG Sat Jun 22 15:20:05 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4390D516 for ; Sat, 22 Jun 2013 15:20:05 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 25C1F111C for ; Sat, 22 Jun 2013 15:20:05 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5MFK5RX022722 for ; Sat, 22 Jun 2013 15:20:05 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5MFK5OJ022708 for svn-soc-all@FreeBSD.org; Sat, 22 Jun 2013 15:20:05 GMT (envelope-from mattbw@FreeBSD.org) Date: Sat, 22 Jun 2013 15:20:05 GMT Message-Id: <201306221520.r5MFK5OJ022708@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253357 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jun 2013 15:20:05 -0000 Author: mattbw Date: Sat Jun 22 15:20:04 2013 New Revision: 253357 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253357 Log: adds untested group support; some of the groups may be a bit contentious but are temporary for now. Added: soc2013/mattbw/dummy/groups.c soc2013/mattbw/dummy/groups.h Modified: soc2013/mattbw/dummy/Makefile soc2013/mattbw/dummy/get-details.c Modified: soc2013/mattbw/dummy/Makefile ============================================================================== --- soc2013/mattbw/dummy/Makefile Sat Jun 22 13:11:27 2013 (r253356) +++ soc2013/mattbw/dummy/Makefile Sat Jun 22 15:20:04 2013 (r253357) @@ -2,7 +2,7 @@ LIB= pk_backend_pkgng SHLIB_MAJOR= 1 -SRCS= pk-backend-pkgng.c get-details.c +SRCS= pk-backend-pkgng.c get-details.c groups.c USE_PK_PKGCONF= 0 Modified: soc2013/mattbw/dummy/get-details.c ============================================================================== --- soc2013/mattbw/dummy/get-details.c Sat Jun 22 13:11:27 2013 (r253356) +++ soc2013/mattbw/dummy/get-details.c Sat Jun 22 15:20:04 2013 (r253357) @@ -24,6 +24,8 @@ #include "pk-backend.h" #include "pkg.h" +#include "groups.h" + /* * Checks two strings with strcmp and emits TRUE if they match. If either * string is NULL, emit TRUE as well (this is so that missing PackageID @@ -67,6 +69,7 @@ const char *data; const char *description; const char *name; + const char *origin; const char *reponame; const char *version; const char *www; @@ -76,11 +79,12 @@ pkg_get(match, PKG_ARCH, &arch, PKG_DESC, &description, + PKG_FLATSIZE, &flatsize, PKG_NAME, &name, + PKG_ORIGIN, &origin, PKG_REPONAME, &reponame, PKG_VERSION, &version, - PKG_WWW, &www, - PKG_FLATSIZE, &size); + PKG_WWW, &www); switch (pkg_type(match)) { case PKG_FILE: @@ -113,7 +117,7 @@ pk_backend_details(backend, new_id, NULL, - PK_GROUP_ENUM_PROGRAMMING, + group_from_origin(origin), description, www, flatsize); @@ -122,6 +126,7 @@ } } } while (err == EPKG_OK && found == FALSE); + pkg_free(match); return found; } Added: soc2013/mattbw/dummy/groups.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/groups.c Sat Jun 22 15:20:04 2013 (r253357) @@ -0,0 +1,145 @@ +/*- + * Copyright (C) 2013 Matt Windsor + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include /* NULL */ +#include /* strdup */ + +#include "glib.h" /* g_strcmp0 */ +#include "pk-backend.h" /* PkGroupEnum, PK_* */ + +struct group_mapping { + const char *dir; + PkGroupEnum group; +}; + +/* Mappings between ports directories (as in the first part of PKG_ORIGIN) and + * PackageKit enums. + * + * Some of these mappings are a bit iffy, peer review would be greatly + * appreciated. + */ +static struct group_mapping group_mappings[] = { + {"accessibility", PK_GROUP_ENUM_ACCESSIBILITY}, + {"arabic", PK_GROUP_ENUM_LOCALIZATION}, + {"archivers", PK_GROUP_ENUM_ACCESSORIES}, + {"astro", PK_GROUP_ENUM_SCIENCE}, + {"audio", PK_GROUP_ENUM_MULTIMEDIA}, + {"benchmarks", PK_GROUP_ENUM_PROGRAMMING}, + {"biology", PK_GROUP_ENUM_SCIENCE}, + {"cad", PK_GROUP_ENUM_SCIENCE}, /* dubious */ + {"chinese", PK_GROUP_ENUM_LOCALIZATION}, + {"comms", PK_GROUP_ENUM_COMMUNICATION}, + {"converters", PK_GROUP_ENUM_ACCESSORIES}, /* dubious */ + {"databases", PK_GROUP_ENUM_SERVERS}, /* dubious */ + {"deskutils", PK_GROUP_ENUM_ACCESSORIES}, + {"devel", PK_GROUP_ENUM_PROGRAMMING}, + {"distfiles", PK_GROUP_ENUM_OTHER}, /* ?? */ + {"dns", PK_GROUP_ENUM_NETWORK}, + {"editors", PK_GROUP_ENUM_OFFICE}, /* dubious */ + {"emulators", PK_GROUP_ENUM_OTHER}, /* ?? */ + {"finance", PK_GROUP_ENUM_OFFICE}, /* dubious */ + {"french", PK_GROUP_ENUM_LOCALIZATION}, + {"ftp", PK_GROUP_ENUM_NETWORK}, + {"games", PK_GROUP_ENUM_GAMES}, + {"german", PK_GROUP_ENUM_LOCALIZATION}, + {"graphics", PK_GROUP_ENUM_GRAPHICS}, + {"hebrew", PK_GROUP_ENUM_LOCALIZATION}, + {"hungarian", PK_GROUP_ENUM_LOCALIZATION}, + {"irc", PK_GROUP_ENUM_COMMUNICATION}, + {"japanese", PK_GROUP_ENUM_LOCALIZATION}, + {"java", PK_GROUP_ENUM_PROGRAMMING}, + {"korean", PK_GROUP_ENUM_LOCALIZATION}, + {"lang", PK_GROUP_ENUM_PROGRAMMING}, + {"mail", PK_GROUP_ENUM_COMMUNICATION}, + {"math", PK_GROUP_ENUM_SCIENCE}, + {"misc", PK_GROUP_ENUM_OTHER}, + {"multimedia", PK_GROUP_ENUM_MULTIMEDIA}, + {"net", PK_GROUP_ENUM_NETWORK}, + {"net-im", PK_GROUP_ENUM_COMMUNICATION}, + {"net-mgmt", PK_GROUP_ENUM_NETWORK}, + {"net-p2p", PK_GROUP_ENUM_NETWORK}, /* possibly COMMUNICATION */ + {"news", PK_GROUP_ENUM_COMMUNICATION}, /* ?? */ + {"packages", PK_GROUP_ENUM_OTHER}, /* ?? */ + {"palm", PK_GROUP_ENUM_OTHER}, + {"polish", PK_GROUP_ENUM_LOCALIZATION}, + {"ports-mgmt", PK_GROUP_ENUM_ADMIN_TOOLS}, /* dubious? */ + {"portuguese", PK_GROUP_ENUM_LOCALIZATION}, + {"print", PK_GROUP_ENUM_OFFICE}, /* dubious */ + {"russian", PK_GROUP_ENUM_LOCALIZATION}, + {"science", PK_GROUP_ENUM_SCIENCE}, + {"security", PK_GROUP_ENUM_SECURITY}, + {"shells", PK_GROUP_ENUM_ACCESSORIES}, /* dubious */ + {"sysutils", PK_GROUP_ENUM_ADMIN_TOOLS}, + {"textproc", PK_GROUP_ENUM_PUBLISHING}, /* dubious */ + {"ukrainian", PK_GROUP_ENUM_LOCALIZATION}, + {"vietnamese", PK_GROUP_ENUM_LOCALIZATION}, + {"www", PK_GROUP_ENUM_NETWORK}, /* could be COMMUNICATION? prob. not */ + /* Some of the X directories could be better classified possibly */ + {"x11", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-clocks", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-drivers", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-fm", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-fonts", PK_GROUP_ENUM_FONTS}, + {"x11-servers", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-themes", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-toolkits", PK_GROUP_ENUM_DESKTOP_OTHER}, + {"x11-wm", PK_GROUP_ENUM_DESKTOP_OTHER}, + /* Default (for new/unspecified ports directories */ + {NULL, PK_GROUP_ENUM_UNKNOWN} +}; + +/* Maps from port/origin directories to PackageKit groups. */ +PkGroupEnum +group_from_port_dir(const char *port_dir) +{ + int i; + + i = 0; + while (group_mappings[i].dir != NULL && + g_strcmp0(group_mappings[i].dir, port_dir) != 0) + i++; + return group_mappings[i].group; +} + +/* Maps from package origins to PackageKit groups. */ +PkGroupEnum +group_from_origin(const char *origin) +{ + char *dir; + int i; + PkGroupEnum group; + + /* Find the separation between dir and port name */ + for (i = 0; origin[i] != '/' && origin[i] != '\0'; i++) + ; + + /* Is this a valid origin? If not, we want the default group */ + if (origin[i] == '\0') + dir = NULL; + else + dir = strndup(origin, i); + + group = group_from_port_dir(dir); + + if (dir) + free(dir); + + return group; +} Added: soc2013/mattbw/dummy/groups.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/groups.h Sat Jun 22 15:20:04 2013 (r253357) @@ -0,0 +1,34 @@ +/*- + * Copyright (C) 2013 Matt Windsor + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _PKGNG_BACKEND_GROUPS_H_ +#define _PKGNG_BACKEND_GROUPS_H_ + +#include "pk-backend.h" + +PkGroupEnum group_from_port_dir(const char *port_dir); + +PkGroupEnum group_from_origin(const char *origin); + +#endif /* _PKGNG_BACKEND_GROUPS_H_ */ + + + + From owner-svn-soc-all@FreeBSD.ORG Sat Jun 22 15:20:39 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 711375AC for ; Sat, 22 Jun 2013 15:20:39 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 62E7B1132 for ; Sat, 22 Jun 2013 15:20:39 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5MFKdlH033782 for ; Sat, 22 Jun 2013 15:20:39 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5MFKd42033772 for svn-soc-all@FreeBSD.org; Sat, 22 Jun 2013 15:20:39 GMT (envelope-from mattbw@FreeBSD.org) Date: Sat, 22 Jun 2013 15:20:39 GMT Message-Id: <201306221520.r5MFKd42033772@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253358 - soc2013/mattbw/dummy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jun 2013 15:20:39 -0000 Author: mattbw Date: Sat Jun 22 15:20:39 2013 New Revision: 253358 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253358 Log: get_details.h somehow got missed out, oops. readded. Added: soc2013/mattbw/dummy/get_details.h Added: soc2013/mattbw/dummy/get_details.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/mattbw/dummy/get_details.h Sat Jun 22 15:20:39 2013 (r253358) @@ -0,0 +1,30 @@ +/*- + * Copyright (C) 2013 Matt Windsor + * + * Licensed under the GNU General Public License Version 2 + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _PKGNG_BACKEND_GET_DETAILS_H_ +#define _PKGNG_BACKEND_GET_DETAILS_H_ + +#include +#include +#include + +gboolean get_details_for(gchar *package_id, PkBackend *backend, struct pkgdb *db); + +#endif /* _PKGNG_BACKEND_GET_DETAILS_H_ */