From ae5caa645f6c090ff1015220807d16808cec3211 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 15:33:31 +0200 Subject: [PATCH 1/7] add LGPL file --- COPYING.LESSER | 510 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 510 insertions(+) create mode 100644 COPYING.LESSER diff --git a/COPYING.LESSER b/COPYING.LESSER new file mode 100644 index 0000000..cc6f365 --- /dev/null +++ b/COPYING.LESSER @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. +^L + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. +^L + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. +^L + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. +^L + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. +^L + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. +^L + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS +^L + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + From d1f2f854daf3a945ebdb2de6cdd8bd9f492de0f2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 15:54:03 +0200 Subject: [PATCH 2/7] ld_iscsi: use constructor attribute This is cleaner, and libtool otherwise complains. --- src/ld_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ld_iscsi.c b/src/ld_iscsi.c index 00ec834..4ff933d 100644 --- a/src/ld_iscsi.c +++ b/src/ld_iscsi.c @@ -291,7 +291,7 @@ int dup2(int oldfd, int newfd) } -void _init(void) +static void __attribute__((constructor)) _init(void) { int i; From d56fa027ff9c233162bad9e614aa85145bd3c300 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 16:38:18 +0200 Subject: [PATCH 3/7] add .gitignore --- .gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cc44a62 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +/autom4te.cache +/configure +/config.h.in +/Makefile +/stamp-h1 +*.o +*.a +*.so* +bin +/config.h +/config.log +/config.status +libiscsi-*.tar.gz From 17319072b192c327012626818465ab9115a20c42 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 14:29:43 +0200 Subject: [PATCH 4/7] use automake and libtool This commits replaces the handwritten makefile with automake+libtool. There is some hackery needed for the LD_PRELOAD shared library, but apart from that there is nothing special and it is a large gain in portability and standardization. The spec file is modified as little as is needed to properly build the RPMs. --- .gitignore | 16 ++++++- Makefile.am | 78 ++++++++++++++++++++++++++++++++++ Makefile.in | 72 ------------------------------- autogen.sh | 12 +++--- configure.ac | 47 +++++--------------- m4/.gitignore | 5 +++ packaging/RPM/.gitignore | 1 + packaging/RPM/libiscsi.spec.in | 24 +++-------- packaging/RPM/makerpms.sh | 8 ++-- test-tool/Makefile | 16 ------- 10 files changed, 127 insertions(+), 152 deletions(-) create mode 100644 Makefile.am delete mode 100644 Makefile.in create mode 100644 m4/.gitignore create mode 100644 packaging/RPM/.gitignore delete mode 100644 test-tool/Makefile diff --git a/.gitignore b/.gitignore index cc44a62..06dff23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,25 @@ /autom4te.cache +/depcomp +/aclocal.m4 +/missing +/config.guess +/config.sub +/install-sh /configure /config.h.in +/Makefile.in /Makefile +.deps +.libs /stamp-h1 *.o -*.a -*.so* +*.lo +*.la bin /config.h /config.log /config.status +.dirstamp +/libtool +/ltmain.sh libiscsi-*.tar.gz diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..6d91f4f --- /dev/null +++ b/Makefile.am @@ -0,0 +1,78 @@ +# Generic definitions + +ACLOCAL_AMFLAGS =-I m4 +AUTOMAKE_OPTIONS = foreign subdir-objects +AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" +AM_CFLAGS=$(WARN_CFLAGS) +LDADD = lib/libiscsi.la -lpopt + +EXTRA_DIST = autogen.sh COPYING.LESSER \ + packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh + +# libiscsi shared library + +iscsi_includedir = $(includedir)/iscsi +dist_iscsi_include_HEADERS = include/iscsi.h include/scsi-lowlevel.h +dist_noinst_HEADERS = include/iscsi-private.h include/md5.h include/slist.h + +lib_LTLIBRARIES = lib/libiscsi.la +lib_libiscsi_la_SOURCES = \ + lib/connect.c lib/crc32c.c lib/discovery.c lib/init.c \ + lib/login.c lib/md5.c lib/nop.c lib/pdu.c lib/scsi-command.c \ + lib/scsi-lowlevel.c lib/socket.c lib/sync.c lib/task_mgmt.c + +SONAME=$(firstword $(subst ., ,$(VERSION))) +SOREL=$(shell printf "%d%02d%02d" $(subst ., ,$(VERSION))) +lib_libiscsi_la_LDFLAGS = \ + -version-info $(SONAME):$(SOREL):0 -bindir $(bindir) -no-undefined + +# libiscsi utilities + +bin_PROGRAMS = bin/iscsi-inq bin/iscsi-ls +bin_iscsi_inq_SOURCES = src/iscsi-inq.c +bin_iscsi_ls_SOURCES = src/iscsi-ls.c + +# Other examples + +noinst_PROGRAMS = bin/iscsiclient +bin_iscsiclient_SOURCES = examples/iscsiclient.c + +EXTRA_PROGRAMS = bin/iscsi-dd +bin_iscsi_dd_SOURCES = examples/iscsi-dd.c + +# libiscsi test tool + +noinst_PROGRAMS += bin/iscsi-test +dist_noinst_HEADERS += test-tool/iscsi-test.h +bin_iscsi_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/test-tool +bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \ + test-tool/0100_read10_simple.c test-tool/0101_read10_beyond_eol.c \ + test-tool/0102_read10_0blocks.c test-tool/0103_read10_rdprotect.c \ + test-tool/0104_read10_flags.c test-tool/0105_read10_invalid.c \ + test-tool/0110_readcapacity10_simple.c \ + test-tool/0111_readcapacity10_pmi.c test-tool/0120_read6_simple.c \ + test-tool/0121_read6_beyond_eol.c test-tool/0122_read6_invalid.c + +# LD_PRELOAD library. + +if LD_ISCSI +EXTRA_PROGRAMS += bin/ld_iscsi +CLEANFILES = bin/ld_iscsi.o bin/ld_iscsi.so + +# This gets a bit messy: +# +# 1) let automake compile the sources +bin_ld_iscsi_SOURCES = src/ld_iscsi.c +bin_ld_iscsi_CFLAGS = $(AM_CFLAGS) -fPIC + +# 2) let libtool link in the static version of the library +noinst_LTLIBRARIES = lib/libiscsi_convenience.la +lib_libiscsi_convenience_la_SOURCES = $(lib_libiscsi_la_SOURCES) +bin/ld_iscsi.o: src/bin_ld_iscsi-ld_iscsi.o lib/libiscsi_convenience.la + $(LIBTOOL) --mode=link $(CC) -o $@ $^ + +# 3) Manually create the .so file. +bin_SCRIPTS = bin/ld_iscsi.so +bin/ld_iscsi.so: bin/ld_iscsi.o + $(CC) -shared -o bin/ld_iscsi.so bin/ld_iscsi.o -ldl +endif diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index a5b4e8f..0000000 --- a/Makefile.in +++ /dev/null @@ -1,72 +0,0 @@ -prefix = $(DESTDIR) -ifeq ($(prefix),) - prefix = @prefix@ -endif -exec_prefix = @exec_prefix@ -libdir = $(LIBDIR) -ifeq ($(libdir),) - libdir = @libdir@ -endif -bindir = @bindir@ -LIBS=-lpopt @LIBS@ -CC=gcc -CFLAGS=-g -O2 -fPIC -Wall -W -I. -I./include "-D_U_=__attribute__((unused))" -LIBISCSI_OBJ = lib/connect.o lib/crc32c.o lib/discovery.o lib/init.o lib/login.o lib/md5.o lib/nop.o lib/pdu.o lib/scsi-command.o lib/scsi-lowlevel.o lib/socket.o lib/sync.o lib/task_mgmt.o - -INSTALLCMD = @install@ -c - -LIBISCSI_SO_NAME=libiscsi.so.1 -VERSION=1.0.0 -LIBISCSI_SO=libiscsi.so.$(VERSION) - -all: bin/iscsi-inq bin/iscsi-ls lib/$(LIBISCSI_SO) @ld_iscsi@ - -bin/ld_iscsi.so: src/ld_iscsi.o lib/libiscsi.a - mkdir -p bin - ld -shared -o $@ src/ld_iscsi.o lib/libiscsi.a -ldl - -bin/iscsi-ls: src/iscsi-ls.c lib/libiscsi.a - mkdir -p bin - $(CC) $(CFLAGS) -o $@ src/iscsi-ls.c lib/libiscsi.a $(LIBS) - -bin/iscsi-inq: src/iscsi-inq.c lib/libiscsi.a - mkdir -p bin - $(CC) $(CFLAGS) -o $@ src/iscsi-inq.c lib/libiscsi.a $(LIBS) - -lib/$(LIBISCSI_SO): $(LIBISCSI_OBJ) - @echo Creating shared library $@ - $(CC) -shared -Wl,-soname=$(LIBISCSI_SO_NAME) -o $@ $(LIBISCSI_OBJ) - -lib/libiscsi.a: $(LIBISCSI_OBJ) - @echo Creating library $@ - ar r lib/libiscsi.a $(LIBISCSI_OBJ) - ranlib lib/libiscsi.a - -examples: bin/iscsiclient - -bin/iscsiclient: examples/iscsiclient.c lib/libiscsi.a - mkdir -p bin - $(CC) $(CFLAGS) -o $@ examples/iscsiclient.c lib/libiscsi.a $(LIBS) - -install: lib/libiscsi.a lib/$(LIBISCSI_SO) bin/iscsi-ls bin/iscsi-inq - $(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(libdir) - $(INSTALLCMD) -m 755 lib/libiscsi.a $(libdir) - $(INSTALLCMD) -m 755 bin/iscsi-ls $(bindir) - $(INSTALLCMD) -m 755 bin/iscsi-inq $(bindir) - mkdir -p $(exec_prefix)/include/iscsi - $(INSTALLCMD) -m 644 include/iscsi.h $(exec_prefix)/include/iscsi - $(INSTALLCMD) -m 644 include/scsi-lowlevel.h $(exec_prefix)/include/iscsi - -iscsi-test: lib/libiscsi.a - make -C test-tool - -distclean: clean - rm -f config.h config.log config.status configure Makefile - -clean: - rm -f lib/*.o src/*.o examples/*.o - rm -f bin/* - rm -f lib/libiscsi.so* - rm -f lib/libiscsi.a - rm -f iscsi-inq iscsi-ls - make -C test-tool clean diff --git a/autogen.sh b/autogen.sh index e976330..46a1e97 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,13 +1,13 @@ #!/bin/sh rm -rf autom4te.cache -rm -f configure config.h.in libiscsi.pc - -IPATHS="-I ./include -I ../include" - -autoheader $IPATHS || exit 1 -autoconf $IPATHS || exit 1 +rm -f depcomp aclocal.m4 missing config.guess config.sub install-sh +rm -f configure config.h.in config.h.in~ m4/libtool.m4 m4/lt*.m4 Makefile.in +autoreconf -fvi +(cd m4 && for i in libtool.m4 lt*.m4; do + echo /$i +done) > m4/.gitignore rm -rf autom4te.cache echo "Now run ./configure and then make." diff --git a/configure.ac b/configure.ac index 31cf510..e6b079a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,11 @@ AC_PREREQ(2.50) AC_INIT(libiscsi, m4_esyscmd([grep 'Version:' ./packaging/RPM/libiscsi.spec.in 2>/dev/null | head -1 | sed -e 's/[ \t]*Version:[ \t]*\([^ \t]*\)[ \t]*.*/\1/' | tr -d '\n'])) AC_CONFIG_SRCDIR([lib/init.c]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE +AM_SILENT_RULES +LT_INIT if test "${libdir}" = '${exec_prefix}/lib'; then case `uname -m` in x86_64|ppc64|powerpc64) @@ -13,33 +17,14 @@ if test "${libdir}" = '${exec_prefix}/lib'; then esac fi -is_solaris="no" -install="/usr/bin/install" -ldconfig="ldconfig" -ld_iscsi="" - -case `uname` in - Linux*) - ld_iscsi="bin/ld_iscsi.so" - ;; - AIX*) - ;; - SunOS) - is_solaris="yes" - install="ginstall" - ldconfig="echo no ldconfig on solaris" - LIBS="$LIBS -lsocket -lnsl" - ;; - CYGWIN*) - ldconfig="echo no ldconfig on cygwin" - ;; - *) - ;; -esac +AC_CANONICAL_HOST +AM_CONDITIONAL(LD_ISCSI, + [case $host_os in linux*) ;; *) AS_SET_STATUS(1);; esac ]) if test "$ac_cv_prog_gcc" = yes; then - CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings" + WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings" fi +AC_SUBST(WARN_CFLAGS) LOGDIR='${localstatedir}/log' AC_ARG_WITH([logdir], @@ -54,11 +39,6 @@ AC_SUBST(LOGDIR) AC_CONFIG_HEADER(config.h) -EXTRA_OBJ="" - -#AC_CHECK_HEADERS(sched.h) -#AC_CHECK_FUNCS(mlockall) - AC_CACHE_CHECK([for sin_len in sock],libiscsi_cv_HAVE_SOCK_SIN_LEN,[ AC_TRY_COMPILE([#include #include @@ -121,10 +101,5 @@ else exit fi -AC_SUBST(libdir) -AC_SUBST(install) -AC_SUBST(ldconfig) -AC_SUBST(ld_iscsi) -#AC_SUBST(LIBISCSI_LDFLAGS) - -AC_OUTPUT(Makefile) +AC_CONFIG_FILES(Makefile) +AC_OUTPUT diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..764b428 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +/libtool.m4 +/lt~obsolete.m4 +/ltoptions.m4 +/ltsugar.m4 +/ltversion.m4 diff --git a/packaging/RPM/.gitignore b/packaging/RPM/.gitignore new file mode 100644 index 0000000..e940435 --- /dev/null +++ b/packaging/RPM/.gitignore @@ -0,0 +1 @@ +/*.spec diff --git a/packaging/RPM/libiscsi.spec.in b/packaging/RPM/libiscsi.spec.in index 99a89f9..448c1d3 100644 --- a/packaging/RPM/libiscsi.spec.in +++ b/packaging/RPM/libiscsi.spec.in @@ -40,25 +40,13 @@ export CC ## always run autogen.sh ./autogen.sh - -CFLAGS="$RPM_OPT_FLAGS $EXTRA -O0" ./configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir} \ - --localstatedir="/var" +%configure +make %install # Clean up in case there is trash left from a previous build rm -rf $RPM_BUILD_ROOT - -# Create the target build directory hierarchy -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir} -mkdir -p $RPM_BUILD_ROOT%{_includedir} -mkdir -p $RPM_BUILD_ROOT%{_includedir}/iscsi - -# -make DESTDIR=$RPM_BUILD_ROOT%{_prefix} LIBDIR=$RPM_BUILD_ROOT%{_libdir} install +make DESTDIR=$RPM_BUILD_ROOT install # Remove "*.old" files find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; @@ -73,10 +61,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) - +%{_bindir}/ld_iscsi.so %{_bindir}/iscsi-ls %{_bindir}/iscsi-inq -%{_libdir}/libiscsi.so.1.0.0 +%{_libdir}/libiscsi.so.* %package devel Summary: iSCSI client development libraries @@ -90,6 +78,8 @@ development libraries for iSCSI %{_includedir}/iscsi/iscsi.h %{_includedir}/iscsi/scsi-lowlevel.h %{_libdir}/libiscsi.a +%{_libdir}/libiscsi.la +%{_libdir}/libiscsi.so %changelog * Sat Dec 4 2010 : Version 1.0.0 diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh index 2f1a879..368decd 100755 --- a/packaging/RPM/makerpms.sh +++ b/packaging/RPM/makerpms.sh @@ -58,14 +58,15 @@ VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//') RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//') if echo | gzip -c --rsyncable - > /dev/null 2>&1 ; then - GZIP="gzip -9 --rsyncable" + GZIP_ENV="-9 --rsyncable" else - GZIP="gzip -9" + GZIP_ENV="-9" fi pushd ${TOPDIR} echo -n "Creating libiscsi-${VERSION}.tar.gz ... " -git archive --prefix=libiscsi-${VERSION}/ HEAD | ${GZIP} > ${SRCDIR}/libiscsi-${VERSION}.tar.gz +sh autogen.sh +make dist GZIP_ENV="\"$GZIP_ENV\"" RC=$? popd echo "Done." @@ -79,6 +80,7 @@ fi ## ## copy additional source files ## +cp -p ${TOPDIR}/libiscsi-${VERSION}.tar.gz ${SRCDIR} cp -p ${DIRNAME}/${SPECFILE} ${SPECDIR} ## diff --git a/test-tool/Makefile b/test-tool/Makefile deleted file mode 100644 index 110c03c..0000000 --- a/test-tool/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -LIBS=-lpopt -CC=gcc -CFLAGS=-g -O0 -fPIC -Wall -W -I. -I./include -I../include "-D_U_=__attribute__((unused))" -TESTS=0100_read10_simple.o 0101_read10_beyond_eol.o 0102_read10_0blocks.o \ -0103_read10_rdprotect.o 0104_read10_flags.o 0105_read10_invalid.o \ -0110_readcapacity10_simple.o 0111_readcapacity10_pmi.o \ -0120_read6_simple.o 0121_read6_beyond_eol.o 0122_read6_invalid.o - -all: iscsi-test - -iscsi-test: iscsi-test.c $(TESTS) - $(CC) $(CFLAGS) iscsi-test.c -o iscsi-test $(TESTS) ../lib/libiscsi.a $(LIBS) - -clean: - rm -f *.o - rm -f iscsi-test \ No newline at end of file From a235a20fdae9c3c8098b2d9b646a2b7625cc098b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 16:57:29 +0200 Subject: [PATCH 5/7] remove LOGDIR It looks unused --- configure.ac | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure.ac b/configure.ac index e6b079a..aa8a9d5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,6 @@ if test "$ac_cv_prog_gcc" = yes; then fi AC_SUBST(WARN_CFLAGS) -LOGDIR='${localstatedir}/log' -AC_ARG_WITH([logdir], - [ --with-logdir=DIR path to log directory [[LOCALSTATEDIR/log]]], - LOGDIR=$withval) -if test ! -z "$LOGDIR"; then - if test "$LOGDIR" = "yes" -o "$LOGDIR" = "no"; then - AC_MSG_ERROR([--with-logdir must specify a path]) - fi -fi -AC_SUBST(LOGDIR) - AC_CONFIG_HEADER(config.h) AC_CACHE_CHECK([for sin_len in sock],libiscsi_cv_HAVE_SOCK_SIN_LEN,[ From b4bddce2c682f89f6de3b3d754179226355c4e9c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 16:54:44 +0200 Subject: [PATCH 6/7] compile the library if popt is not available --- Makefile.am | 14 +++++++++++--- configure.ac | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6d91f4f..bb3a7ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,12 @@ LDADD = lib/libiscsi.la -lpopt EXTRA_DIST = autogen.sh COPYING.LESSER \ packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh +# Simplify conditions below by declaring variables as empty + +bin_PROGRAMS = +noinst_PROGRAMS = +EXTRA_PROGRAMS = + # libiscsi shared library iscsi_includedir = $(includedir)/iscsi @@ -28,16 +34,17 @@ lib_libiscsi_la_LDFLAGS = \ # libiscsi utilities -bin_PROGRAMS = bin/iscsi-inq bin/iscsi-ls +if PROGRAMS +bin_PROGRAMS += bin/iscsi-inq bin/iscsi-ls bin_iscsi_inq_SOURCES = src/iscsi-inq.c bin_iscsi_ls_SOURCES = src/iscsi-ls.c # Other examples -noinst_PROGRAMS = bin/iscsiclient +noinst_PROGRAMS += bin/iscsiclient bin_iscsiclient_SOURCES = examples/iscsiclient.c -EXTRA_PROGRAMS = bin/iscsi-dd +EXTRA_PROGRAMS += bin/iscsi-dd bin_iscsi_dd_SOURCES = examples/iscsi-dd.c # libiscsi test tool @@ -52,6 +59,7 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \ test-tool/0110_readcapacity10_simple.c \ test-tool/0111_readcapacity10_pmi.c test-tool/0120_read6_simple.c \ test-tool/0121_read6_beyond_eol.c test-tool/0122_read6_invalid.c +endif # LD_PRELOAD library. diff --git a/configure.ac b/configure.ac index aa8a9d5..c1ad547 100644 --- a/configure.ac +++ b/configure.ac @@ -86,9 +86,10 @@ if test "$ac_cv_have_popt" = yes ; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - AC_MSG_NOTICE(You need libpopt to compile libiscsi. Install the libpopt-dev package.) - exit + AC_MSG_NOTICE(You need libpopt to compile the sample libiscsi clients.) + AC_MSG_NOTICE(Only the library will be compiled and installed.) fi +AM_CONDITIONAL(PROGRAMS, [test "$ac_cv_have_popt" = yes]) AC_CONFIG_FILES(Makefile) AC_OUTPUT From ebaecfa928ccac8d3082f2a6d54b0098599a8dbf Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Oct 2011 15:33:35 +0200 Subject: [PATCH 7/7] fix rpmlint problems This fixes all rpmlint problems except for missing manpages and the invalid URL for the tarball. --- packaging/RPM/libiscsi.spec.in | 62 ++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/packaging/RPM/libiscsi.spec.in b/packaging/RPM/libiscsi.spec.in index 448c1d3..170253f 100644 --- a/packaging/RPM/libiscsi.spec.in +++ b/packaging/RPM/libiscsi.spec.in @@ -1,26 +1,22 @@ Name: libiscsi Summary: iSCSI client library -Vendor: Ronnie Sahlberg -Packager: Ronnie Sahlberg Version: 1.0.0 -Release: 1GITHASH -Epoch: 0 -License: GNU LGPL version 3 -Group: Libraries +Release: 2GITHASH%{?dist} +License: LGPLv2+ +Group: System Environment/Libraries URL: https://github.com/sahlberg/libiscsi Source: libiscsi-%{version}.tar.gz -Prereq: fileutils - -Provides: libiscsi = %{version} - -Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: popt-devel %description -libiscsi is a client library for attaching to iscsi resources across -a network and a set of assorted useful utilities +libiscsi is a library for attaching to iSCSI resources across +a network. ####################################################################### @@ -41,12 +37,14 @@ export CC ## always run autogen.sh ./autogen.sh %configure -make +make %{?_smp_mflags} %install # Clean up in case there is trash left from a previous build rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags} +rm $RPM_BUILD_ROOT/%{_libdir}/libiscsi.a +rm $RPM_BUILD_ROOT/%{_libdir}/libiscsi.la # Remove "*.old" files find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; @@ -54,33 +52,47 @@ find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig -####################################################################### -## Files section ## -####################################################################### +%postun -p /sbin/ldconfig %files %defattr(-,root,root) +%doc COPYING.LESSER README TODO +%{_libdir}/libiscsi.so.* + +%package utils +Summary: iSCSI Client Utilities +Group: Applications/System + +%description utils +The libiscsi-utils package provides a set of assorted utilities to connect +to iSCSI servers without having to set up the Linux iSCSI initiator. + +%files utils +%doc COPYING README TODO %{_bindir}/ld_iscsi.so %{_bindir}/iscsi-ls %{_bindir}/iscsi-inq -%{_libdir}/libiscsi.so.* %package devel Summary: iSCSI client development libraries -Group: Development +Group: Development/Libraries +Requires: libiscsi = %{version}-%{release} %description devel -development libraries for iSCSI +The libiscsi-devel package includes the header files for libiscsi. %files devel %defattr(-,root,root) +%doc COPYING.LESSER README TODO %{_includedir}/iscsi/iscsi.h %{_includedir}/iscsi/scsi-lowlevel.h -%{_libdir}/libiscsi.a -%{_libdir}/libiscsi.la %{_libdir}/libiscsi.so %changelog -* Sat Dec 4 2010 : Version 1.0.0 - - Initial version +* Fri Oct 28 2011 Paolo Bonzini - 1.0.0-2 +- Fixed rpmlint problems + +* Sat Dec 4 2010 Ronnie Sahlberg - 1.0.0-1 +- Initial version