diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ca55b29..0000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -/zipfile-0.3.4.tgz -/zipfile-0.4.0.tgz -/zipfile-0.4.1.tgz -/zipfile-0.4.2.tgz -/zipfile-0.4.3.tgz -/zipfile-0.5.0.tgz -/node-zipfile-66c2e58bf1c65c77564f571cc405badadba45a6d.tar.gz -/node-zipfile-d7576233c3c2b75bfda2c32bad7c5bd67f6c03e1.tar.gz -/node-zipfile-ef2d837d48670e5f0bc424473aa65f286bb9a189.tar.gz -/node-zipfile-2b5dbb0cffdcdf7d135f67cf848f42f59d6f168d.tar.gz -/node-zipfile-e90fa4da1dc8ff349a4ca4e013dc948c3e74d639.tar.gz -/node-zipfile-0.5.9.tar.gz -/node-zipfile-0.5.10.tar.gz -/node-zipfile-0.5.11.tar.gz -/node-zipfile-0.5.12.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/nodejs-zipfile-node12.patch b/nodejs-zipfile-node12.patch deleted file mode 100644 index 23e4d0d..0000000 --- a/nodejs-zipfile-node12.patch +++ /dev/null @@ -1,169 +0,0 @@ -commit 8f7954e1d5215e3780596ca488ab59e30f4b3af1 -Author: Tom Hughes -Date: Sat Jun 15 17:50:24 2019 +0100 - - Update for Node.js 12.x support - -diff --git a/.travis.yml b/.travis.yml -index 51700f5..d4f1391 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -15,6 +15,9 @@ matrix: - #compiler: clang - #env: NODE_VERSION="4" COVERAGE=true # node abi 46 - # Linux -+ - os: linux -+ compiler: clang -+ env: NODE_VERSION="12" # node abi 72 - - os: linux - compiler: clang - env: NODE_VERSION="10" # node abi 64 -@@ -34,6 +37,9 @@ matrix: - compiler: clang - env: NODE_VERSION="4" # node abi 46 - # OS X -+ - os: osx -+ compiler: clang -+ env: NODE_VERSION="12" # node abi 72 - - os: osx - compiler: clang - env: NODE_VERSION="10" # node abi 64 -diff --git a/package.json b/package.json -index 0890071..29ba0fb 100644 ---- a/package.json -+++ b/package.json -@@ -20,7 +20,7 @@ - "BSD" - ], - "dependencies": { -- "nan": "~2.10.0" -+ "nan": "~2.14.0" - }, - "devDependencies": { - "@mapbox/cloudfriend": "^1.9.1", -diff --git a/src/node_zipfile.cpp b/src/node_zipfile.cpp -index f5f6297..8e0a214 100644 ---- a/src/node_zipfile.cpp -+++ b/src/node_zipfile.cpp -@@ -20,7 +20,7 @@ extern "C" { - #include - #include - --#define TOSTR(obj) (*String::Utf8Value((obj)->ToString())) -+#define TOSTR(obj) (*Nan::Utf8String(Nan::To(obj).ToLocalChecked())) - - using namespace v8; - -@@ -42,7 +42,7 @@ void ZipFile::Initialize(Local target) { - Nan::SetAccessor(lcons->InstanceTemplate(), Nan::New("count").ToLocalChecked(), get_prop); - Nan::SetAccessor(lcons->InstanceTemplate(), Nan::New("names").ToLocalChecked(), get_prop); - -- target->Set(Nan::New("ZipFile").ToLocalChecked(),lcons->GetFunction()); -+ Nan::Set(target, Nan::New("ZipFile").ToLocalChecked(), Nan::GetFunction(lcons).ToLocalChecked()); - constructor.Reset(lcons); - } - -@@ -109,7 +109,7 @@ void ZipFile::get_prop(v8::Local property, const Nan::PropertyCallba - unsigned num = zf->names_.size(); - Local a = Nan::New(num); - for (unsigned i = 0; i < num; ++i) { -- a->Set(i, Nan::New(zf->names_[i].c_str()).ToLocalChecked()); -+ Nan::Set(a, i, Nan::New(zf->names_[i].c_str()).ToLocalChecked()); - } - args.GetReturnValue().Set(a); - } else { -@@ -264,15 +264,17 @@ void ZipFile::Work_CopyFile(uv_work_t* req) { - } - } - --void ZipFile::Work_AfterCopyFile(uv_work_t* req) { -+void ZipFile::Work_AfterCopyFile(uv_work_t* req, int status) { - Nan::HandleScope scope; - copy_file_baton *closure = static_cast(req->data); - if (!closure->error_name.empty()) { -+ Nan::AsyncResource ar("ZipFile::Work_AfterCopyFile"); - Local argv[1] = { Nan::Error(closure->error_name.c_str()) }; -- Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 1, argv); -+ ar.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 1, argv); - } else { -+ Nan::AsyncResource ar("ZipFile::Work_AfterCopyFile"); - Local argv[1] = { Nan::Null() }; -- Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 1, argv); -+ ar.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 1, argv); - } - closure->zf->Unref(); - closure->cb.Reset(); -@@ -462,18 +464,20 @@ void ZipFile::Work_ReadFile(uv_work_t* req) { - } - } - --void ZipFile::Work_AfterReadFile(uv_work_t* req) { -+void ZipFile::Work_AfterReadFile(uv_work_t* req, int status) { - Nan::HandleScope scope; - - closure_t *closure = static_cast(req->data); - - if (closure->error) { -+ Nan::AsyncResource ar("ZipFile::Work_AfterReadFile"); - Local argv[1] = { Nan::Error(closure->error_name.c_str()) }; -- Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 1, argv); -+ ar.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 1, argv); - } else { -+ Nan::AsyncResource ar("ZipFile::Work_AfterReadFile"); - Local retbuf = Nan::CopyBuffer(reinterpret_cast(&closure->data[0]), closure->data.size()).ToLocalChecked(); - Local argv[2] = { Nan::Null(), retbuf }; -- Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv); -+ ar.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv); - } - - if (closure->za) zip_close(closure->za); -@@ -482,19 +486,17 @@ void ZipFile::Work_AfterReadFile(uv_work_t* req) { - delete closure; - } - --extern "C" { -- static void init(Local target) { -- ZipFile::Initialize(target); -+NAN_MODULE_INIT(init) { -+ ZipFile::Initialize(target); - -- // node-zipfile version -- target->Set(Nan::New("version").ToLocalChecked(), Nan::New("0.5.8").ToLocalChecked()); -+ // node-zipfile version -+ Nan::Set(target, Nan::New("version").ToLocalChecked(), Nan::New("0.5.8").ToLocalChecked()); - -- // versions of deps -- Local versions = Nan::New(); -- versions->Set(Nan::New("node").ToLocalChecked(), Nan::New(NODE_VERSION+1).ToLocalChecked()); -- versions->Set(Nan::New("v8").ToLocalChecked(), Nan::New(V8::GetVersion()).ToLocalChecked()); -- target->Set(Nan::New("versions").ToLocalChecked(), versions); -- } -- #define MAKE_MODULE(_modname) NODE_MODULE( _modname, init) -- MAKE_MODULE(MODULE_NAME) -+ // versions of deps -+ Local versions = Nan::New(); -+ Nan::Set(versions, Nan::New("node").ToLocalChecked(), Nan::New(NODE_VERSION+1).ToLocalChecked()); -+ Nan::Set(versions, Nan::New("v8").ToLocalChecked(), Nan::New(V8::GetVersion()).ToLocalChecked()); -+ Nan::Set(target, Nan::New("versions").ToLocalChecked(), versions); - } -+ -+NAN_MODULE_WORKER_ENABLED(zipfile, init); -diff --git a/src/node_zipfile.hpp b/src/node_zipfile.hpp -index 020a282..afd8da8 100644 ---- a/src/node_zipfile.hpp -+++ b/src/node_zipfile.hpp -@@ -21,12 +21,12 @@ class ZipFile: public node::ObjectWrap { - static void get_prop(v8::Local property, const Nan::PropertyCallbackInfo& args); - static void copyFile(const Nan::FunctionCallbackInfo& args); - static void Work_CopyFile(uv_work_t* req); -- static void Work_AfterCopyFile(uv_work_t* req); -+ static void Work_AfterCopyFile(uv_work_t* req, int status); - static void copyFileSync(const Nan::FunctionCallbackInfo& args); - static void readFileSync(const Nan::FunctionCallbackInfo& args); - static void readFile(const Nan::FunctionCallbackInfo& args); - static void Work_ReadFile(uv_work_t* req); -- static void Work_AfterReadFile(uv_work_t* req); -+ static void Work_AfterReadFile(uv_work_t* req, int status); - ZipFile(std::string const& file_name); - std::vector const& names() const { return names_; } - std::string const& file_name() const { return file_name_; } diff --git a/nodejs-zipfile-pregyp.patch b/nodejs-zipfile-pregyp.patch deleted file mode 100644 index e2cf7a3..0000000 --- a/nodejs-zipfile-pregyp.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 68a95440b329cf689c8fe217f9a7ba74b584049a -Author: Tom Hughes -Date: Fri Mar 14 19:26:20 2014 +0000 - - Patch out use of node-pre-gyp - -diff --git a/lib/index.js b/lib/index.js -index c7748be..1bb4894 100644 ---- a/lib/index.js -+++ b/lib/index.js -@@ -1,6 +1,5 @@ --var binary = require('node-pre-gyp'); - var path = require('path'); --var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json'))); -+var binding_path = path.resolve(path.join(__dirname, 'binding/zipfile.node')); - var zipfile = require(binding_path); - - exports = module.exports = zipfile; -diff --git a/package.json b/package.json -index 2e3a0f6..0890071 100644 ---- a/package.json -+++ b/package.json -@@ -20,8 +20,7 @@ - "BSD" - ], - "dependencies": { -- "nan": "~2.10.0", -- "node-pre-gyp": "~0.10.2" -+ "nan": "~2.10.0" - }, - "devDependencies": { - "@mapbox/cloudfriend": "^1.9.1", diff --git a/nodejs-zipfile.spec b/nodejs-zipfile.spec deleted file mode 100644 index 8001e83..0000000 --- a/nodejs-zipfile.spec +++ /dev/null @@ -1,229 +0,0 @@ -Name: nodejs-zipfile -Version: 0.5.12 -Release: 9%{?dist} -Summary: C++ library for handling zipfiles in Node.js - -License: BSD -URL: https://github.com/mapbox/node-zipfile -Source0: https://github.com/mapbox/node-zipfile/archive/v%{version}/node-zipfile-%{version}.tar.gz -Patch0: nodejs-zipfile-pregyp.patch -# https://github.com/mapbox/node-zipfile/pull/82 -Patch1: nodejs-zipfile-node12.patch -ExclusiveArch: %{nodejs_arches} - -BuildRequires: nodejs-devel -BuildRequires: node-gyp -BuildRequires: libzip-devel >= 0.11.2 -BuildRequires: zlib-devel - -BuildRequires: npm(nan) >= 2.14.0 -BuildRequires: npm(mocha) -BuildRequires: npm(mkdirp) - -%{?nodejs_default_filter} - -%description -Bindings to libzip for handling zipfile archives in Node.js. - - -%prep -%autosetup -p 1 -n node-zipfile-%{version} -%nodejs_fixdep -r nan -%nodejs_fixdep --dev nan "^2.4.0" -rm -rf deps/* node_modules -echo "{}" > deps/common-libzip.gypi - - -%build -%nodejs_symlink_deps --build -export CXXFLAGS="%{optflags}" -export LDFLAGS="%{?__global_ldflags} -Wl,-z,undefs" -node-gyp configure -- -Dshared_libzip=true -Dmodule_name=zipfile -Dmodule_path=lib/binding -node-gyp build - - -%install -mkdir -p %{buildroot}/%{nodejs_sitearch}/zipfile -cp -pr package.json lib %{buildroot}/%{nodejs_sitearch}/zipfile -%nodejs_symlink_deps - - -%check -%nodejs_symlink_deps --check -%{nodejs_sitelib}/mocha/bin/mocha -R spec - - -%files -%doc README.md -%license LICENSE.txt -%{nodejs_sitearch}/zipfile - - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 0.5.12-9 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.5.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 29 2020 Tom Hughes - 0.5.12-7 -- Rebuild for Node.js 14.4.0 - -* Wed Jan 29 2020 Fedora Release Engineering - 0.5.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.5.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 14 2019 Tom Hughes - 0.5.12-4 -- Rebuild for Node.js 12.4.0 - -* Fri Feb 01 2019 Fedora Release Engineering - 0.5.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.5.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 5 2018 Tom Hughes - 0.5.12-1 -- Update to 0.5.12 upstream release - -* Fri Jun 22 2018 Tom Hughes - 0.5.11-10 -- Rebuild for Node.js 10.5.0 - -* Thu Feb 08 2018 Fedora Release Engineering - 0.5.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Tom Hughes - 0.5.11-7 -- Allow undefined symbols in the shared object - -* Thu Aug 10 2017 Tom Hughes - 0.5.11-6.1 -- Rebuild for Node.js 8.3.0 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.5.11-5.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.5.11-4.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 28 2017 Tom Hughes - 0.5.11-3.1 -- Rebuild for Node.js 8.1.2 - -* Tue Feb 28 2017 Remi Collet - 0.5.11-3 -- rebuild for new libzip - -* Sat Feb 11 2017 Fedora Release Engineering - 0.5.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Dec 16 2016 Tom Hughes - 0.5.11-1 -- Update to 0.5.11 upstream release - -* Wed Dec 14 2016 Tom Hughes - 0.5.10-1.1 -- Update to 0.5.10 upstream release - -* Mon Aug 29 2016 Tom Hughes - 0.5.9-8.1 -- Rebuild for Node.js 6.5.0 - -* Mon May 09 2016 Stephen Gallagher - 0.5.9-7.1 -- Rebuild for Node.js 6.1.0 upgrade - -* Tue Mar 29 2016 Tom Hughes - 0.5.9-7 -- Rebuild for Node.js 5.x - -* Wed Mar 23 2016 Tom Hughes - 0.5.9-6 -- Rebuild for Node.js 4.4.x - -* Wed Feb 10 2016 Tom Hughes - 0.5.9-5 -- Rebuild for Node.js 4.3.x - -* Thu Feb 04 2016 Fedora Release Engineering - 0.5.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Dec 4 2015 Tom Hughes - 0.5.9-3 -- Rebuild for nodejs 4.2.3 - -* Wed Dec 2 2015 Tom Hughes - 0.5.9-2 -- Rebuild for nodejs 4.2 - -* Wed Dec 2 2015 Tom Hughes - 0.5.9-1 -- Update to 0.5.9 upstream release - -* Wed Nov 25 2015 Tom Hughes - 0.5.7-6 -- Export LDFLAGS for hardened build support - -* Mon Nov 23 2015 Tom Hughes - 0.5.7-5 -- Update npm(nan) dependency - -* Wed Jun 17 2015 Fedora Release Engineering - 0.5.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 06 2015 Remi Collet - 0.5.7-3 -- rebuild for new libzip - -* Sat May 02 2015 Kalev Lember - 0.5.7-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 19 2015 Tom Hughes - 0.5.7-1 -- Update to 0.5.7 upstream release - -* Wed Jan 14 2015 Tom Hughes - 0.5.5-1 -- Update to 0.5.5 upstream release - -* Thu Nov 20 2014 Tom Hughes - 0.5.4-1 -- Update to 0.5.4 upstream release - -* Sun Aug 17 2014 Fedora Release Engineering - 0.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Aug 1 2014 Tom Hughes - 0.5.3-1 -- Update to 0.5.3 upstream release - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 14 2014 Tom Hughes - 0.5.2-1 -- Update to 0.5.2 upstream release -- Switch to source from github as npm no longer includes tests - -* Fri Mar 14 2014 Tom Hughes - 0.5.0-1 -- Update to 0.5.0 upstream release - -* Fri Feb 14 2014 T.C. Hollingsworth - 0.4.3-2 -- rebuild for icu-53 (via v8) - -* Fri Dec 20 2013 Tom Hughes - 0.4.3-1 -- Update to 0.4.3 upstream release - -* Wed Oct 30 2013 Tom Hughes - 0.4.2-1 -- Update to 0.4.2 upstream release - -* Tue Oct 1 2013 Tom Hughes - 0.4.1-1 -- Update to 0.4.1 upstream release - -* Wed Aug 21 2013 Remi Collet - 0.4.0-2 -- rebuild for new libzip - -* Sun Aug 11 2013 Tom Hughes - 0.4.0-1 -- Update to 0.4.0 upstream release -- Update to latest nodejs packaging standards - -* Sat Aug 03 2013 Fedora Release Engineering - 0.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Apr 3 2013 Tom Hughes - 0.3.4-4 -- Filter out provide for Node.js native extension -- Enable tests - -* Wed Mar 13 2013 Tom Hughes - 0.3.4-3 -- Restrict supported architectures using ExclusiveArch -- Rebuild against node 0.10 - -* Sat Mar 2 2013 Tom Hughes - 0.3.4-2 -- Fix permissions on _zipfile.node -- BuildRequire zlib-devel -- BuildRequire mkdirp for tests -- Link node_modules for tests -- Set NODE_PATH when running tests - -* Sun Feb 10 2013 Tom Hughes - 0.3.4-1 -- Initial build of 0.3.4 diff --git a/sources b/sources deleted file mode 100644 index 07b2355..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (node-zipfile-0.5.12.tar.gz) = e5010972a7c8bce2372027c49cb826e882c00e0c9422d18276a8a4bf465e488092c0e532ffbe75e80bba4d6ac6ddd4a8c094af1c759627ef663adee8a201ed8c