p4ruby 2022.1.2405581-x86-mingw32 → 2023.1.2544327-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c43575b216686503b2da19ce246f943dca82f8af58d32879064cb1a45ae1b22
-  data.tar.gz: 312ae5b82cb369748460ce3dd7382c8d9d7fbf21f567396e9988891f41952af8
+  metadata.gz: d9692959f01cb1b2e0a465d073657db1b4134292404924986c9de9900afba675
+  data.tar.gz: b4d07c834544ea5b7c1accf6ef04cbd4180d2264aa0bf6b214bd1877061b66c6
 SHA512:
-  metadata.gz: 1a8c2756d9f8f65ddbb68349238b444bc70248ede3d46bb24271ff908794da0a11832a93bc3a4170e3f66bf851adbe9b531bb43015c721dc0b06c06154b15002
-  data.tar.gz: de5deca3a9420c9536928ff3d9bb44f69a691600c8f9fbe3ce8e22c5ffd829d07f40aa42a41d9d681cb64d45ec40491eff47e2cf8b5c446e86b09015e9276e1b
+  metadata.gz: e2d56e737c7ffb6d7f2c750c59a6a0090dce90f561227a8f3f194dd773acac7bb1cf0c2933ce30f3b7b9eed649426e4f5c1bf364c4c23084316290bb8cd5e2f1
+  data.tar.gz: 9a5848437df9c4fc8ba1d9324ac37c2ba2c759c993d375e250f16c770357f3811321fd7790cb532887bc34b03e36d027dda7cc6468a910128851d9d6f37354d2

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2023, Perforce Software, Inc. All rights reserved.
+Copyright (c) 2024, Perforce Software, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
@@ -32,7 +32,7 @@ this program.
 
 P4/P4API License
 -----------------------
-Copyright (c) 1995-2022, Perforce Software, Inc.
+Copyright (c) 1995-2023, Perforce Software, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -60,128 +60,189 @@ POSSIBILITY OF SUCH DAMAGE.
 
 OpenSSL:
 -----------------------
-	This product includes cryptographic software written by Eric Young
-	(eay@cryptsoft.com).
-	This product includes software written by Tim Hudson
-	(tjh@cryptsoft.com).
+Copyright (c) 1998-2022 The OpenSSL Project
+Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
+All rights reserved.
 
 OpenSSL License
 -----------------------
 
- * ====================================================================
- * Copyright (c) 1998-2011 The OpenSSL Project.  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. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be
- *    used to endorse or promote products derived from this software
- *    without prior written permission. For written permission, please
- *    contact openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS CONTRIBUTORS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- *
-
-Original SSLeay License
------------------------
-
- * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are adhered to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given
- * attribution as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the routines from the
- *    library being used are not cryptographic related  :-) .
- * 4. If you include any Windows specific code (or a derivative thereof)
- *    from the apps directory (application code) you must include an
- *    acknowledgement: "This product includes software written by Tim
- *    Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 OR CONTRIBUTORS
- * 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.
- *
- * The licence and distribution terms for any publicly available version
- * or derivative of this code cannot be changed.  i.e. this code cannot
- * simply be copied and put under another distribution licence
- * [including the GNU Public Licence.]
- *
+                             Apache License
+                       Version 2.0, January 2004
+                    https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
 
 
 sol2 License

data/ext/P4/extconf.rb

@@ -3,10 +3,10 @@
 $:.push File.expand_path("../../../lib", __FILE__)
 
 require 'mkmf'
-require 'net/ftp'
 require 'P4/version'
 require 'rbconfig'
 require 'openssl'
+require 'net/http'
 
 # Set this to the main version directory we look up in ftp.perforce.com for the P4API
 # This is ignored if you specify the version on the command line.
@@ -266,9 +266,9 @@ class P4ApiVersion
     # subdirectory. Look there if we can't find it in the API root
     #
     ver_file = dir + "/Version"
-    unless File.exists?(ver_file)
+    unless File.exist?(ver_file)
       ver_file = dir + "/sample/Version"
-      return nil unless File.exists?(ver_file)
+      return nil unless File.exist?(ver_file)
     end
 
     re = Regexp.new('^RELEASE = (\d+)\s+(\d+)\s+(\w*\S*)\s*;')
@@ -390,7 +390,7 @@ def resolve_p4api_dir
   end
 
   if !p4api_dir && !with_config('p4api-dir') && enable_config('p4api-download', true)
-    download_api_via_ftp
+    download_api_via_https
     unzip_file
     p4api_dir = downloaded_p4api_dir
     dir_config('p4api', "#{p4api_dir}/include", "#{p4api_dir}/lib")
@@ -468,7 +468,7 @@ def platform_dir_name
   "bin.#{p4_platform_label}"
 end
 
-def ftp_download_dir(version)
+def download_dir(version)
   "perforce/#{version}/#{platform_dir_name}"
 end
 
@@ -484,7 +484,9 @@ def filename
                 filename = 'p4api-openssl1.1.1.zip'
             when /1.0/
                 filename = 'p4api-openssl1.0.2.zip'
-             end
+            when /3.0/
+                filename = 'p4api-openssl3.zip'
+        end
     end
   elsif RbConfig::CONFIG['target_os'].downcase =~ /darwin19|darwin[2-9][0-9]/
     filename = 'p4api-openssl1.1.1.tgz'
@@ -496,69 +498,30 @@ def filename
                 filename = 'p4api-glibc2.3-openssl1.1.1.tgz'
             when /1.0/
                 filename = 'p4api-glibc2.3-openssl1.0.2.tgz'
+            when /3.0/
+                filename = 'p4api-glibc2.3-openssl3.tgz'
         end
     end
   end
   return filename
 end
 
-
-def remote_files_matching(ftp, dir, regex)
-  ftp.ls(dir.to_s).map { |entry|
-    if match = entry.match(regex)
-      yield match
-    else
-      nil
-    end
-  }.reject { |entry|
-    entry.nil?
-  }
-end
-
-def find_latest_with_p4api(ftp, versions)
-  versions.reverse_each { |v|
-    begin
-      remote_files_matching(ftp, "r#{v}/#{platform_dir_name}/", /p4api/) do
-        return v
-      end
-    rescue
-      next
-    end
-  }
-end
-
-def find_latest_version_dir(ftp)
-  ftp.chdir('perforce')
-
-  # Capture all versions
-  versions = remote_files_matching(ftp, '.', /r(1\d\.\d)/) { |m| m.captures.first }.sort
-
-  version = find_latest_with_p4api(ftp, versions)
-
-  ftp.chdir('..')
-
-  "r#{version}"
-end
-
-# Downloads the C++ P4API via FTP to the local directory, then 'initializes' it
+#############################################
+# Downloads the C++ P4API via HTTPS to the local directory, then 'initializes' it
 # by unpacking it.
-def download_api_via_ftp
-  ftp = Net::FTP.new('ftp.perforce.com')
-  ftp.passive=true
-  ftp.login
-
-  # At one point, we allowed the gem build to just find the most recent p4api build.
-  # P4Ruby probably shouldn't do that by default.
-  #version_dir = find_latest_version_dir(ftp)
+def download_api_via_https
 
-  dir = ftp_download_dir(p4api_version_dir)
-  ftp.chdir(dir)
+  uri=URI('https://ftp.perforce.com:443')
+  dir = download_dir(p4api_version_dir)
 
-  puts "downloading #{filename} from #{dir} on ftp.perforce.com"
-  ftp.getbinaryfile(filename)
+  puts "Downloading #{filename} from #{dir} on https://ftp.perforce.com"
 
-ensure
-  ftp.close if ftp and !ftp.closed?
+  Net::HTTP.start(uri.host, uri.port, :use_ssl =>true) do |http|
+      resp = http.get("/" + dir + "/" + filename)
+      open(filename, "wb") do |file|
+          file.write(resp.body)
+      end
+  end
 end
 
 def unzip_file

data/ext/P4/p4.cpp

@@ -1502,6 +1502,11 @@ void	Init_P4()
 
     //	P4::Progress class.
     cP4Prog = rb_define_class_under( cP4, "Progress", rb_cObject );
+    
+    rb_undef_alloc_func(cP4);
+    rb_undef_alloc_func(cP4MD);
+    rb_undef_alloc_func(cP4Map);
+    rb_undef_alloc_func(cP4Msg);
 
 };
 

data/ext/P4/specmgr.cpp

@@ -92,7 +92,8 @@ struct defaultspec {
         "AltRoots;code:308;type:llist;len:64;;"
         "Options;code:309;type:line;len:64;val:"
             "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
+            "unlocked/locked,nomodtime/modtime,normdir/rmdir,"
+            "noaltsync/altsync;;"
         "SubmitOptions;code:313;type:select;fmt:L;len:25;val:"
             "submitunchanged/submitunchanged+reopen/revertunchanged/"
             "revertunchanged+reopen/leaveunchanged/leaveunchanged+reopen;;"
@@ -128,6 +129,7 @@ struct defaultspec {
         "MaxScanRows;code:403;type:word;len:12;;"
         "MaxLockTime;code:407;type:word;len:12;;"
         "MaxOpenFiles;code:413;type:word;len:12;;"
+        "MaxMemory;code:NNN;type:word;len:12;;"
         "Timeout;code:406;type:word;len:12;;"
         "PasswordTimeout;code:409;type:word;len:12;;"
         "LdapConfig;code:410;type:line;len:128;;"

data/lib/P4/version.rb

@@ -1,3 +1,3 @@
 class P4
-    Version = VERSION = '2022.1.2405581'
+    Version = VERSION = '2023.1.2544327'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4ruby
 version: !ruby/object:Gem::Version
-  version: 2022.1.2405581
+  version: 2023.1.2544327
 platform: x86-mingw32
 authors:
 - Perforce Software, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies: []
 description: Ruby extensions to the C++ Perforce API.
 email: support@perforce.com
@@ -46,6 +46,7 @@ files:
 - lib/2.7/P4.so
 - lib/3.0/P4.so
 - lib/3.1/P4.so
+- lib/3.2/P4.so
 - lib/P4.rb
 - lib/P4.so
 - lib/P4/version.rb
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby extensions to the C++ Perforce API