Hello community, here is the log from the commit of package geoipupdate for openSUSE:Factory checked in at 2015-11-10 10:03:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geoipupdate (Old) and /work/SRC/openSUSE:Factory/.geoipupdate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geoipupdate" Changes: -------- --- /work/SRC/openSUSE:Factory/geoipupdate/geoipupdate.changes 2015-02-24 13:06:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.geoipupdate.new/geoipupdate.changes 2015-11-10 10:03:25.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Nov 8 13:56:31 UTC 2015 - [email protected] + +- Update to version 2.2.1 + * Version bump to fix PPA issue +- Changes from version 2.2.0 + * geoipupdate now verifies the MD5 of the new database before + deploying it. If the database MD5 does not match the expected MD5, + geoipupdate will exit with an error. + * The copy of base64.c and base64.h was switched to a version under + GPL 2+ to prevent a license conflict. + * The LICENSE file was added to the distribution. + * Several issues in the documentation were fixed. +- Remove gpl-2.0.txt; now included in the tarball +- Perform a spec-cleaner + +------------------------------------------------------------------- Old: ---- geoipupdate-2.1.0.tar.gz gpl-2.0.txt New: ---- geoipupdate-2.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geoipupdate.spec ++++++ --- /var/tmp/diff_new_pack.CSeW2v/_old 2015-11-10 10:03:26.000000000 +0100 +++ /var/tmp/diff_new_pack.CSeW2v/_new 2015-11-10 10:03:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package geoipupdate +# spec file for package spec # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -15,18 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: geoipupdate -Version: 2.1.0 +Version: 2.2.1 Release: 0 -License: GPL-2.0 Summary: GeoIP update client code -Url: https://www.maxmind.com +License: GPL-2.0 Group: System/Tools +Url: https://www.maxmind.com Source0: https://github.com/maxmind/geoipupdate/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt BuildRequires: pkg-config -BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(zlib) Conflicts: GeoIP < 1.6.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,18 +44,17 @@ make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} %{?_smp_mflags} -install -m 644 %{SOURCE1} . +%make_install install -d %{buildroot}%{_localstatedir}/lib/GeoIP %files %defattr(-,root,root) -%doc README.md ChangeLog.md gpl-2.0.txt +%doc README.md ChangeLog.md LICENSE %config(noreplace) %{_sysconfdir}/GeoIP.conf %config %{_sysconfdir}/GeoIP.conf.default %dir %{_localstatedir}/lib/GeoIP %{_bindir}/geoipupdate -%doc %{_mandir}/man1/* -%doc %{_mandir}/man5/* +%{_mandir}/man1/* +%{_mandir}/man5/* %changelog ++++++ geoipupdate-2.1.0.tar.gz -> geoipupdate-2.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/ChangeLog.md new/geoipupdate-2.2.1/ChangeLog.md --- old/geoipupdate-2.1.0/ChangeLog.md 2014-11-06 22:47:30.000000000 +0100 +++ new/geoipupdate-2.2.1/ChangeLog.md 2015-02-26 05:12:31.000000000 +0100 @@ -1,6 +1,24 @@ GeoIP Update Change Log ======================= +2.2.1 (2015-02-25) +------------------ + +* Bump version number to correct PPA release issue. No other changes to the + source distribution. + + +2.2.0 (2015-02-25) +------------------ + +* `geoipupdate` now verifies the MD5 of the new database before deploying it. + If the database MD5 does not match the expected MD5, `geoipupdate` will + exit with an error. +* The copy of `base64.c` and `base64.h` was switched to a version under GPL 2+ + to prevent a license conflict. +* The `LICENSE` file was added to the distribution. +* Several issues in the documentation were fixed. + 2.1.0 (2014-11-06) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/LICENSE new/geoipupdate-2.2.1/LICENSE --- old/geoipupdate-2.1.0/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/geoipupdate-2.2.1/LICENSE 2014-02-07 16:09:10.000000000 +0100 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 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. + + 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 Lesser 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 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. + +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. + + <signature of Ty Coon>, 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 Lesser General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/Makefile.am new/geoipupdate-2.2.1/Makefile.am --- old/geoipupdate-2.1.0/Makefile.am 2014-05-02 17:13:27.000000000 +0200 +++ new/geoipupdate-2.2.1/Makefile.am 2015-02-26 00:06:59.000000000 +0100 @@ -7,4 +7,4 @@ conf \ man -EXTRA_DIST = ChangeLog.md README.md bootstrap +EXTRA_DIST = ChangeLog.md LICENSE README.md bootstrap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/Makefile.in new/geoipupdate-2.2.1/Makefile.in --- old/geoipupdate-2.1.0/Makefile.in 2014-11-06 22:49:23.000000000 +0100 +++ new/geoipupdate-2.2.1/Makefile.in 2015-02-26 05:12:46.000000000 +0100 @@ -80,7 +80,7 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) compile \ - config.guess config.sub depcomp install-sh missing ltmain.sh + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -310,7 +310,7 @@ conf \ man -EXTRA_DIST = ChangeLog.md README.md bootstrap +EXTRA_DIST = ChangeLog.md LICENSE README.md bootstrap all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/README.md new/geoipupdate-2.2.1/README.md --- old/geoipupdate-2.1.0/README.md 2014-05-02 17:28:50.000000000 +0200 +++ new/geoipupdate-2.2.1/README.md 2014-11-11 01:13:55.000000000 +0100 @@ -10,9 +10,27 @@ This library is licensed under the GNU General Public License version 2. +## Installing on Ubuntu + +MaxMind provides a PPA for recent version of Ubuntu. To add the PPA to your +sources, run: + + $ sudo add-apt-repository ppa:maxmind/ppa + +Then install `geoipupdate` by running: + + $ sudo aptitude update + $ sudo aptitude install geoipupdate + ## Installing From Source File -To install this code, run the following commands: +To install this from the source package, you will need a C compiler, Make, +and the curl library and headers. On Debian or Ubuntu, you can install these +dependencies by running: + + $ sudo apt-get install build-essentials libcurl4-openssl-dev + +Once you have the necessary dependencies, run the following commands: $ ./configure $ make @@ -23,16 +41,18 @@ ## Installing From GitHub +To install from Git, you will need automake, autoconf, and libtool installed. + Our public git repository is hosted on GitHub at https://github.com/maxmind/geoipupdate -You can clone this repository and build it by running: +You can clone this repository and bootstrap it by running: $ git clone https://github.com/maxmind/geoipupdate + $ cd geoipupdate $ ./bootstrap - $ ./configure - $ make - $ sudo make install + +Then follow the instructions above for "Installing From Source Files". # Configuring @@ -44,6 +64,11 @@ Please report bugs by filing an issue with our GitHub issue tracker at https://github.com/maxmind/geoipupdate/issues +# License + +This software is licensed under the GNU General Public License (GPL), version +2 or later. + # Copyright This software is Copyright (c) 2014 by MaxMind, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/bin/base64.c new/geoipupdate-2.2.1/bin/base64.c --- old/geoipupdate-2.1.0/bin/base64.c 2014-10-21 16:06:46.000000000 +0200 +++ new/geoipupdate-2.2.1/bin/base64.c 2014-11-11 00:01:11.000000000 +0100 @@ -1,10 +1,9 @@ /* base64.c -- Encode binary data using printable characters. - Copyright (C) 1999, 2000, 2001, 2004, 2005, 2006, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1999-2001, 2004-2006, 2009-2012 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) + the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -13,14 +12,13 @@ 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. */ + along with this program; if not, see <http://www.gnu.org/licenses/>. */ /* Written by Simon Josefsson. Partially adapted from GNU MailUtils * (mailbox/filter_trans.c, as of 2004-11-28). Improved by review * from Paul Eggert, Bruno Haible, and Stepan Kasal. * - * See also RFC 3548 <http://www.ietf.org/rfc/rfc3548.txt>. + * See also RFC 4648 <http://www.ietf.org/rfc/rfc4648.txt>. * * Be careful with error checking. Here is how you would typically * use these functions: @@ -41,10 +39,6 @@ * */ -/* jude nagurney: GeoIP change, for providing proxy authorization */ -/* #include <config.h> */ -#define restrict __restrict - /* Get prototype. */ #include "base64.h" @@ -57,7 +51,7 @@ #include <string.h> /* C89 compliant way to cast 'char' to 'unsigned char'. */ -static inline unsigned char +static unsigned char to_uchar(char ch) { return ch; @@ -324,7 +318,7 @@ and return CTX->buf. In either case, advance *IN to point to the byte after the last one processed, and set *N_NON_NEWLINE to the number of verified non-newline bytes accessible through the returned pointer. */ -static inline char * +static char * get_4(struct base64_decode_context *ctx, char const *restrict *in, char const *restrict in_end, size_t *n_non_newline) @@ -376,7 +370,7 @@ as many bytes as possible are written to *OUT. On return, advance *OUT to point to the byte after the last one written, and decrement *OUTLEN to reflect the number of bytes remaining in *OUT. */ -static inline bool +static bool decode_4(char const *restrict in, size_t inlen, char *restrict *outp, size_t *outleft) { @@ -557,10 +551,10 @@ { /* This may allocate a few bytes too many, depending on input, but it's not worth the extra CPU time to compute the exact size. - The exact size is 3 * inlen / 4, minus 1 if the input ends - with "=" and minus another 1 if the input ends with "==". + The exact size is 3 * (inlen + (ctx ? ctx->i : 0)) / 4, minus 1 if the + input ends with "=" and minus another 1 if the input ends with "==". Dividing before multiplying avoids the possibility of overflow. */ - size_t needlen = 3 * (inlen / 4) + 2; + size_t needlen = 3 * (inlen / 4) + 3; *out = malloc(needlen); if (!*out) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/bin/base64.h new/geoipupdate-2.2.1/bin/base64.h --- old/geoipupdate-2.1.0/bin/base64.h 2014-10-21 16:06:46.000000000 +0200 +++ new/geoipupdate-2.2.1/bin/base64.h 2014-11-11 00:01:11.000000000 +0100 @@ -1,10 +1,10 @@ /* base64.h -- Encode binary data using printable characters. - Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) + the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -13,22 +13,21 @@ 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. */ + along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef BASE64_H # define BASE64_H -/* jude nagurney: GeoIP change, for providing proxy authorization */ -/* #include <config.h> */ -#define restrict __restrict - /* Get size_t. */ # include <stddef.h> /* Get bool. */ # include <stdbool.h> +# ifdef __cplusplus +extern "C" { +# endif + /* This uses that the expression (n+(k-1))/k means the smallest integer >= n/k, i.e., the ceiling of n/k. */ # define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4) @@ -55,5 +54,14 @@ const char *in, size_t inlen, char **out, size_t *outlen); -#endif /* BASE64_H */ +#define base64_decode(in, inlen, out, outlen) \ + base64_decode_ctx(NULL, in, inlen, out, outlen) +#define base64_decode_alloc(in, inlen, out, outlen) \ + base64_decode_alloc_ctx(NULL, in, inlen, out, outlen) + +# ifdef __cplusplus +} +# endif + +#endif /* BASE64_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/bin/geoipupdate.c new/geoipupdate-2.2.1/bin/geoipupdate.c --- old/geoipupdate-2.1.0/bin/geoipupdate.c 2014-11-06 22:48:56.000000000 +0100 +++ new/geoipupdate-2.2.1/bin/geoipupdate.c 2015-02-26 00:06:59.000000000 +0100 @@ -22,12 +22,15 @@ static int parse_license_file(geoipupdate_s * up); static int update_country_database(geoipupdate_s * gu); -static void get_to_disc(geoipupdate_s * gu, const char *url, const char *fname); +static void download_to_file(geoipupdate_s * gu, const char *url, + const char *fname, + char *expected_file_md5); static int update_database_general_all(geoipupdate_s * gu); static int update_database_general(geoipupdate_s * gu, const char *product_id); static in_mem_s *get(geoipupdate_s * gu, const char *url); static int gunzip_and_replace(geoipupdate_s * gu, const char *gzipfile, - const char *geoip_filename); + const char *geoip_filename, + const char *expected_file_md5); void exit_unless(int expr, const char *fmt, ...) { @@ -163,9 +166,8 @@ curl_global_cleanup(); return err ? ERROR : OK; } -static ssize_t -my_getline(char ** linep, size_t * linecapp, - FILE * stream) + +static ssize_t my_getline(char ** linep, size_t * linecapp, FILE * stream) { #if defined HAVE_GETLINE return getline(linep, linecapp, stream); @@ -178,6 +180,7 @@ #error Your OS is not supported #endif } + static int parse_license_file(geoipupdate_s * up) { say_if(up->verbose, "%s\n", PACKAGE_STRING); @@ -322,14 +325,36 @@ } } -void get_to_disc(geoipupdate_s * gu, const char *url, const char *fname) + +size_t get_expected_file_md5(char *buffer, size_t size, size_t nitems, + char *md5) +{ + size_t total_size = size * nitems; + if (strncasecmp(buffer, "X-Database-MD5:", 15) == 0 && total_size > 48) { + char *start = buffer + 16; + char *value = start + strspn(start, " \t\r\n"); + strncpy(md5, value, 32); + md5[32] = '\0'; + } + + return size * nitems; +} + +void download_to_file(geoipupdate_s * gu, const char *url, const char *fname, + char *expected_file_md5) { FILE *f = fopen(fname, "wb"); exit_unless(f != NULL, "Can't open %s\n", fname); say_if(gu->verbose, "url: %s\n", url); CURL *curl = gu->curl; + + expected_file_md5[0] = '\0'; + curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, get_expected_file_md5); + curl_easy_setopt(curl, CURLOPT_HEADERDATA, expected_file_md5); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)f); + curl_easy_setopt(curl, CURLOPT_URL, url); common_req(curl, gu); CURLcode res = curl_easy_perform(curl); @@ -342,7 +367,7 @@ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status); exit_unless( status >= 200 && status < 300, - "Received an unexpected HTTP status code of %ld from %s", + "Received an unexpected HTTP status code of %ld from %s\n", status, url); fclose(f); @@ -458,9 +483,12 @@ gu->proto, gu->host, hex_digest, hex_digest2, gu->license.user_id, product_id); xasprintf(&geoip_gz_filename, "%s.gz", geoip_filename); - get_to_disc(gu, url, geoip_gz_filename); + + char expected_file_md5[33]; + download_to_file(gu, url, geoip_gz_filename, expected_file_md5); free(url); - int rc = gunzip_and_replace(gu, geoip_gz_filename, geoip_filename); + int rc = gunzip_and_replace(gu, geoip_gz_filename, geoip_filename, + expected_file_md5); free(geoip_gz_filename); free(geoip_filename); return rc; @@ -488,17 +516,22 @@ xasprintf(&url, "%s://%s/app/update?license_key=%s&md5=%s", gu->proto, gu->host, &gu->license.license_key[0], hex_digest); - get_to_disc(gu, url, geoip_gz_filename); + + char expected_file_md5[33]; + download_to_file(gu, url, geoip_gz_filename, expected_file_md5); free(url); - int rc = gunzip_and_replace(gu, geoip_gz_filename, geoip_filename); + int rc = gunzip_and_replace(gu, geoip_gz_filename, geoip_filename, + expected_file_md5); + free(geoip_gz_filename); free(geoip_filename); return rc ? ERROR : OK; } static int gunzip_and_replace(geoipupdate_s * gu, const char *gzipfile, - const char *geoip_filename) + const char *geoip_filename, + const char *expected_file_md5) { gzFile gz_fh; FILE *fh = fopen(gzipfile, "rb"); @@ -526,6 +559,12 @@ fputs(buffer, stderr); return ERROR; } + + // We do this here as we have to check that there is an update before + // we check for the header. + exit_unless( 32 == strnlen(expected_file_md5, 33), + "Did not receive a valid expected database MD5 from server\n"); + char *file_path_test; xasprintf(&file_path_test, "%s.test", geoip_filename); say_if(gu->verbose, "Uncompress file %s to %s\n", gzipfile, file_path_test); @@ -547,6 +586,13 @@ exit_if(gzclose(gz_fh) != Z_OK, "Gzip read error while closing from %s\n", gzipfile); free(buffer); + + char actual_md5[33]; + md5hex(file_path_test, actual_md5); + exit_if(strncasecmp(actual_md5, expected_file_md5, 32), + "MD5 of new database (%s) does not match expected MD5 (%s)", + actual_md5, expected_file_md5); + say_if(gu->verbose, "Rename %s to %s\n", file_path_test, geoip_filename); int err = rename(file_path_test, geoip_filename); exit_if(err, "Rename %s to %s failed\n", file_path_test, geoip_filename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/conf/GeoIP.conf.default new/geoipupdate-2.2.1/conf/GeoIP.conf.default --- old/geoipupdate-2.1.0/conf/GeoIP.conf.default 2014-02-07 16:09:10.000000000 +0100 +++ new/geoipupdate-2.2.1/conf/GeoIP.conf.default 2015-02-26 00:06:59.000000000 +0100 @@ -13,10 +13,13 @@ # The remaining settings are OPTIONAL. +# The directory to store the database files. Defaults to /usr/local/share/GeoIP +# DatabaseDirectory /usr/local/share/GeoIP + # The server to use. Defaults to "updates.maxmind.com". # Host updates.maxmind.com -# The desired protocol either "https" (default) or "https". +# The desired protocol either "https" (default) or "http". # Protocol https # The proxy host name or IP address. You may optionally specify a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/configure new/geoipupdate-2.2.1/configure --- old/geoipupdate-2.1.0/configure 2014-11-06 22:49:23.000000000 +0100 +++ new/geoipupdate-2.2.1/configure 2015-02-26 05:12:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for geoipupdate 2.1.0. +# Generated by GNU Autoconf 2.69 for geoipupdate 2.2.1. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='geoipupdate' PACKAGE_TARNAME='geoipupdate' -PACKAGE_VERSION='2.1.0' -PACKAGE_STRING='geoipupdate 2.1.0' +PACKAGE_VERSION='2.2.1' +PACKAGE_STRING='geoipupdate 2.2.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1311,7 +1311,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures geoipupdate 2.1.0 to adapt to many kinds of systems. +\`configure' configures geoipupdate 2.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1381,7 +1381,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of geoipupdate 2.1.0:";; + short | recursive ) echo "Configuration of geoipupdate 2.2.1:";; esac cat <<\_ACEOF @@ -1486,7 +1486,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -geoipupdate configure 2.1.0 +geoipupdate configure 2.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1963,7 +1963,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by geoipupdate $as_me 2.1.0, which was +It was created by geoipupdate $as_me 2.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4197,7 +4197,7 @@ # Define the identity of the package. PACKAGE='geoipupdate' - VERSION='2.1.0' + VERSION='2.2.1' cat >>confdefs.h <<_ACEOF @@ -12992,7 +12992,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by geoipupdate $as_me 2.1.0, which was +This file was extended by geoipupdate $as_me 2.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13049,7 +13049,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -geoipupdate config.status 2.1.0 +geoipupdate config.status 2.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-2.1.0/configure.ac new/geoipupdate-2.2.1/configure.ac --- old/geoipupdate-2.1.0/configure.ac 2014-11-06 22:48:02.000000000 +0100 +++ new/geoipupdate-2.2.1/configure.ac 2015-02-26 05:11:29.000000000 +0100 @@ -1,6 +1,6 @@ dnl AM_CONFIG_HEADER(config.h) -AC_INIT([geoipupdate], [2.1.0],[[email protected]],[geoipupdate]) +AC_INIT([geoipupdate], [2.2.1],[[email protected]],[geoipupdate]) AC_GNU_SOURCE AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([bin/geoipupdate.c])
