# HG changeset patch # User Petr Cvachoucek # Date 1338280216 25200 # Node ID 649912414225d5db60bd7db5ea6e360168609571 # Parent 023bffdeb9c606900abeaa8d500d8b718e732fad 6953366 Update foomatic to v4.0.15 7076448 Problem with print/foomatic diff -r 023bffdeb9c6 -r 649912414225 components/foomatic/filters/Makefile --- a/components/foomatic/filters/Makefile Tue May 22 12:58:14 2012 -0700 +++ b/components/foomatic/filters/Makefile Tue May 29 01:30:16 2012 -0700 @@ -18,24 +18,25 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk COMPONENT_NAME= foomatic-filters -COMPONENT_VERSION= 3.0.2 +COMPONENT_VERSION= 4.0.15 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 -COMPONENT_ARCHIVE_HASH= sha1:31528f3bf0e933b7aac745471c31463023b40eec -COMPONENT_ARCHIVE_URL= $(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE) -COMPONENT_PROJECT_URL= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= \ + sha256:f5b7b67aacedec4c0294d242cbffbe0d7d3cd0fdd2b410c055e818f25ed3bc79 +COMPONENT_ARCHIVE_URL= http://www.openprinting.org/download/foomatic/$(COMPONENT_ARCHIVE) +COMPONENT_PROJECT_URL= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/ include ../../../make-rules/prep.mk include ../../../make-rules/configure.mk include ../../../make-rules/ips.mk CONFIGURE_OPTIONS += --prefix=$(USRLIBDIR)/lp -CONFIGURE_OPTIONS += --sysconfdir=/$(ETCDIR)/gnu +CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)/gnu CONFIGURE_OPTIONS += --bindir=$(USRLIBDIR)/lp/bin CONFIGURE_OPTIONS += --with-echo=wecho CONFIGURE_OPTIONS += --with-file-converter="a2ps -1 -q -c -B @@--medium=@@PAGESIZE@@ -o -" @@ -44,6 +45,8 @@ CONFIGURE_OPTIONS += PERL=$(PERL) CONFIGURE_OPTIONS += A2PS=$(USRBINDIR)/a2ps +COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) + # common targets build: $(BUILD_32) diff -r 023bffdeb9c6 -r 649912414225 components/foomatic/filters/foomatic-filters.license --- a/components/foomatic/filters/foomatic-filters.license Tue May 22 12:58:14 2012 -0700 +++ b/components/foomatic/filters/foomatic-filters.license Tue May 29 01:30:16 2012 -0700 @@ -1,54 +1,347 @@ -Oracle elects to use only the GNU Lesser General Public License version -2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software -where a choice of LGPL/GPL license versions are made available with the -language indicating that LGPLv2.1/GPLv2 or any later version may be -used, or where a choice of which version of the LGPL/GPL is applied is -unspecified. Unless specifically stated otherwise, where a choice -exists between another license and either the GPL or the LGPL, Oracle -chooses the other license. ------------------------------------------------------------------------ +--------------------------- +- foomatic-filters 4.0.15 - +--------------------------- +Oracle Internal Tracking Number 6400 + +-------------------------------------------------------------------------------- + + 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 - Copyright 2001-2004 LinuxPrinting.org + 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, - 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, or (at your option) any later - version. + 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 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 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 - 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. + 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 -Oracle elects to use only the GNU Lesser General Public License version -2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software -where a choice of LGPL/GPL license versions are made available with the -language indicating that LGPLv2.1/GPLv2 or any later version may be -used, or where a choice of which version of the LGPL/GPL is applied is -unspecified. Unless specifically stated otherwise, where a choice -exists between another license and either the GPL or the LGPL, Oracle -chooses the other license. ------------------------------------------------------------------------ +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: - Copyright 2001-2004 LinuxPrinting.org + 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. - 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, or (at your option) any later - version. +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. - 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. + , 1 April 1989 + Ty Coon, President of Vice - 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. - - +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. diff -r 023bffdeb9c6 -r 649912414225 components/foomatic/filters/foomatic-rip.p5m --- a/components/foomatic/filters/foomatic-rip.p5m Tue May 22 12:58:14 2012 -0700 +++ b/components/foomatic/filters/foomatic-rip.p5m Tue May 29 01:30:16 2012 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability volatile> @@ -39,11 +39,11 @@ license foomatic-filters.license license='GPLv2' legacy pkg=SUNWffiltersr \ - desc="foomatic-filters - Foomatic Print Filters (root) 3.0.2" \ + desc="foomatic-filters - Foomatic Print Filters (root)" \ name="foomatic-filters - Foomatic Print Filters (root)" legacy pkg=SUNWffiltersu \ - desc="foomatic-filters - Foomatic Print Filters (user) 3.0.2" \ + desc="foomatic-filters - Foomatic Print Filters (user)" \ name="foomatic-filters - Foomatic Print Filters (user)" dir path=etc @@ -71,12 +71,10 @@ file path=etc/gnu/foomatic/filter.conf preserve=renamenew file path=etc/gnu/foomatic/filter.conf.sample file path=usr/lib/cups/backend/beh -file path=usr/lib/lp/bin/foomatic-gswrapper file path=usr/lib/lp/bin/foomatic-rip file Solaris/wecho.sh path=usr/lib/lp/bin/wecho file Solaris/netstandard_foomatic path=usr/lib/lp/model/netstandard_foomatic mode=0555 file Solaris/standard_foomatic path=usr/lib/lp/model/standard_foomatic mode=0555 -file path=usr/share/man/man1/foomatic-gswrapper.1 file path=usr/share/man/man1/foomatic-rip.1 link path=usr/lib/cups/filter/foomatic-rip target=../../lp/bin/foomatic-rip diff -r 023bffdeb9c6 -r 649912414225 components/foomatic/filters/patches/pid_t.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/foomatic/filters/patches/pid_t.patch Tue May 29 01:30:16 2012 -0700 @@ -0,0 +1,93 @@ +This patch fixes the build when SPRO C compiler is used. The original source +code inconsistently mix "int" and "pid_t" data types. + +compile error seen: + +"process.c", line 185: identifier redeclared: start_system_process +"process.c", line 190: identifier redeclared: start_process +cc: acomp failed for process.c +make[2]: *** [foomatic_rip-process.o] Error 1 +make[1]: *** [all] Error 2 + +--- a/foomaticrip.c 2012-03-14 20:45:28.000000000 +0100 ++++ b/foomaticrip.c 2012-03-19 10:45:27.569249000 +0100 +@@ -981,7 +981,8 @@ + int startpos; + size_t n; + FILE *fchandle = NULL; +- int fcpid = 0, ret; ++ pid_t fcpid = 0; ++ int ret; + + if (!strcasecmp(filename, "")) + file = stdin; +--- a/process.c 2012-03-14 20:45:28.000000000 +0100 ++++ b/process.c 2012-03-19 10:36:39.639793000 +0100 +@@ -45,7 +45,7 @@ + { "", -1, 0 } + }; + +-void add_process(const char *name, int pid, int isgroup) ++void add_process(const char *name, pid_t pid, int isgroup) + { + int i; + for (i = 0; i < MAX_CHILDS; i++) { +@@ -59,7 +59,7 @@ + rip_die(EXIT_PRNERR_NORETRY_BAD_SETTINGS, "Didn't think there would be that many child processes... Exiting.\n"); + } + +-int find_process(int pid) ++int find_process(pid_t pid) + { + int i; + for (i = 0; i < MAX_CHILDS; i++) +@@ -90,7 +90,7 @@ + clear_proc_list(); + } + +-static int _start_process(const char *name, ++static pid_t _start_process(const char *name, + int (*proc_func)(FILE *, FILE *, void *), + void *user_arg, FILE **pipe_in, FILE **pipe_out, + int createprocessgroup) +@@ -182,17 +182,17 @@ + return EXIT_PRNERR_NORETRY_BAD_SETTINGS; + } + +-int start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout) ++pid_t start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout) + { + return _start_process(name, exec_command, (void*)command, fdin, fdout, 1); + } + +-int start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout) ++pid_t start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout) + { + return _start_process(name, proc_func, user_arg, fdin, fdout, 0); + } + +-int wait_for_process(int pid) ++int wait_for_process(pid_t pid) + { + int i; + int status; +@@ -216,7 +216,7 @@ + + int run_system_process(const char *name, const char *command) + { +- int pid = start_system_process(name, command, NULL, NULL); ++ pid_t pid = start_system_process(name, command, NULL, NULL); + return wait_for_process(pid); + } + +--- a/process.h 2012-03-14 20:45:28.000000000 +0100 ++++ b/process.h 2012-03-19 10:37:07.577847000 +0100 +@@ -40,7 +40,7 @@ + const char *alreadyread, + size_t alreadyread_len); + +-int wait_for_process(int pid); ++int wait_for_process(pid_t pid); + + void kill_all_processes(); +