bsdiff 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2e4bd82a40a80b04620395aac43ee8f6063dbd919df4e0c2d3c13671466c8e
-  data.tar.gz: c1eec7c1064f60facd9e6d2a84c1eb87d5eade071a8a6cf83ef410381b8680d4
+  metadata.gz: 68ba4e8da41bd5ecf1655841197a83fffce23bf35ef4a35ec53ec6a4fbc8bbbb
+  data.tar.gz: c187cde84ba2ff4defe871024d2f4d22d02ad066e08e80dec968f69d086f8129
 SHA512:
-  metadata.gz: 658a9f34fa980874ef116d928b79b0fd770dee72a86bd2706bcdee1f2a40d47c08406c28fb9d9b95078cf3919d2af7d960c7a64bb53c15f28bc08f84abff8e28
-  data.tar.gz: 9582e14b3c45262d9f97f08642c7bec1333cffc4397d277f03431b977dd6a96ce81ba40d474d326a01edd931b5758b60fcef32803a4483bfcd34f64aac9901b7
+  metadata.gz: 29f6169cd4f3d8afa28a865ab2feff5a7b5ee8a8ebe289272d40a54812a02ccdd96e788f40ad6942aaaf28027c91b30f6951ca739ae482df1cffb51f10166f0c
+  data.tar.gz: 7fe979aaf2c3f7e0e06e1ee201a30fbf7a474f185c789e1e4618d4e74d36fa4cc475a0f7a41f6b5e8295b72c1353a374584a86bd44a9bcdee370c11f7c85c45c

data/.rubocop.yml

@@ -16,4 +16,3 @@ Minitest/AssertTruthy:
 
 Style/HashSyntax:
   Enabled: false  # yuk Ruby 3.1
-

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.1.0] - 2024-10-13
+
+* Bundle bzip2 lib dependencies
+
 ## [0.0.2] - 2024-10-09
 
 ### Bug fixes

data/LICENSE.txt

@@ -1,3 +1,4 @@
+bsdiff:
 Copyright 2003-2005 Colin Percival
  * All rights reserved
  *
@@ -21,3 +22,44 @@ Copyright 2003-2005 Colin Percival
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+
+ --------------------------------------------------------------------------
+
+bzip2:
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2019 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@acm.org
+bzip2/libbzip2 version 1.0.8 of 13 July 2019

data/README.md

@@ -1,14 +1,12 @@
 [![Gem Version](https://badge.fury.io/rb/bsdiff.svg)](https://badge.fury.io/rb/bsdiff)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 
-# Bsdiff - the binary diff/patch tool
+# Bsdiff - a binary diff/patch tool for Ruby
 
 Ruby bindings for Colin Percival's excellent [bsdiff/bspatch](https://www.daemonology.net/bsdiff) binary patching tool.
 
 ## Installation
 
-Bsdiff requires the bzip2 library. If you don't already have it, install `libbz2-dev` via your package manager.
-
 Install the gem and add it to the application's Gemfile by executing:
 
 ```bash
@@ -20,7 +18,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ```bash
 gem install bsdiff
 ```
-The original source archive is located in dir `src` and diffs to show changes made in creating the bindings are in dir `diffs`. Both are verified in the [tests](https://gitlab.com/matzfan/bsdiff/-/blob/master/test/test_bsdiff.rb).
+The original source archive is located in dir `src` and diffs to show changes made in creating the Ruby bindings are in dir `diffs`. The integrity of both are verified in the [tests](https://gitlab.com/matzfan/bsdiff/-/blob/master/test/test_bsdiff.rb). The tests also verify the integrity of the (unmodified) bzip2 source files in the `bzip2` dir.
 
 ## Usage
 ```ruby
@@ -41,8 +39,10 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://gitlab.com/matzfan/bsdiff.
+Bug reports and pull requests are welcome at https://gitlab.com/matzfan/bsdiff.
 
 ## License
 
 The gem is available as open source under the terms of the [FreeBSD License](https://opensource.org/license/bsd-2-clause).
+
+Bsdiff includes selected source files from the [bzip2](https://sourceware.org/bzip2) library and its license is included.

data/Rakefile

@@ -4,12 +4,14 @@ require 'bundler/gem_tasks'
 require 'minitest/test_task'
 require 'rake/extensiontask'
 
+Gem::PackageTask.new(Bundler.load_gemspec('bsdiff.gemspec')).define
+
 Minitest::TestTask.create
 
 require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new
 Rake::ExtensionTask.new('bsdiff') { |ext| ext.lib_dir = 'lib' } # std rubygems install location
+RuboCop::RakeTask.new
 
 task default: %i[clobber compile test rubocop]
 

data/ext/bsdiff/bsdiff.h

@@ -3,4 +3,4 @@
 
 int diff(const char *oldfile, const char *newfile, const char *patchfile);
 
-#endif /* BSDIFF_H */
+#endif /* BSDIFF_H */

data/ext/bsdiff/bspatch.h

@@ -3,4 +3,4 @@
 
 int patch(const char *oldfile, const char *newfile, const char *patchfile);
 
-#endif /* BSPATCH_H */
+#endif /* BSPATCH_H */

data/ext/bsdiff/extconf.rb

@@ -4,8 +4,14 @@ require 'mkmf'
 
 dir_config 'bsdiff'
 
-# bzip2 dependency
-abort 'could not find library bz2 - is libbz2-dev installed?' unless have_library 'bz2' # -lbz2 cflag
+# rubocop:disable Style/GlobalVars
+$VPATH << '$(srcdir)/../bzip2'
+$srcs = Dir["#{$srcdir}/*.c"]
+$srcs += Dir["#{$srcdir}/../bzip2/*.c"]
+# rubocop:enable Style/GlobalVars
+
+append_cppflags '-I$(srcdir)/../bzip2'
 
 create_header # default name is extconf.h
+CONFIG['warnflags'].clear # suppress warns from bzip2 headers
 create_makefile('bsdiff') # target bsdiff.so