react-native-update 7.4.0-beta.0 → 7.4.2

package/android/src/main/java/cn/reactnative/modules/update/SafeZipFile.java

@@ -16,6 +16,40 @@ public class SafeZipFile extends ZipFile {
         super(file);
     }
 
+    @Override
+    public Enumeration<? extends ZipEntry> entries() {
+        return new SafeZipEntryIterator(super.entries());
+    }
+
+    private static class SafeZipEntryIterator implements Enumeration<ZipEntry> {
+
+        final private Enumeration<? extends ZipEntry> delegate;
+
+        private SafeZipEntryIterator(Enumeration<? extends ZipEntry> delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public boolean hasMoreElements() {
+            return delegate.hasMoreElements();
+        }
+
+        @Override
+        public ZipEntry nextElement() {
+            ZipEntry entry = delegate.nextElement();
+            if (null != entry) {
+                String name = entry.getName();
+                /**
+                 * avoid ZipperDown
+                 */
+                if (null != name && (name.contains("../") || name.contains("..\\"))) {
+                    throw new SecurityException("illegal entry: " + entry.getName());
+                }
+            }
+            return entry;
+        }
+    }
+
     public void unzipToFile(ZipEntry entry, File output) throws IOException {
         InputStream inputStream = null;
         try {
@@ -29,11 +63,6 @@ public class SafeZipFile extends ZipFile {
     }
 
     private void writeOutInputStream(File file, InputStream inputStream) throws IOException {
-        // https://support.google.com/faqs/answer/9294009
-        String canonicalPath = file.getCanonicalPath();
-        if (!canonicalPath.startsWith(UpdateContext.getRootDir())) {
-            throw new SecurityException("illegal entry: " + file.getName());
-        }
         BufferedOutputStream output = null;
         try {
             output = new BufferedOutputStream(

package/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -19,14 +19,13 @@ import java.io.File;
 
 public class UpdateContext {
     private Context context;
-    private static File rootDir;
+    private File rootDir;
     private Executor executor;
 
     public static boolean DEBUG = false;
     private static ReactInstanceManager mReactInstanceManager;
     private static boolean isUsingBundleUrl = false;
 
-
     public UpdateContext(Context context) {
         this.context = context;
         this.executor = Executors.newSingleThreadExecutor();
@@ -50,7 +49,7 @@ public class UpdateContext {
         }
     }
 
-    public static String getRootDir() {
+    public String getRootDir() {
         return rootDir.toString();
     }
 

package/android/src/main/java/cn/reactnative/modules/update/UpdateModule.java

@@ -70,7 +70,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void downloadUpdate(ReadableMap options, final Promise promise) {
+    public void downloadFullUpdate(ReadableMap options, final Promise promise) {
         String url = options.getString("updateUrl");
         String hash = options.getString("hash");
         updateContext.downloadFullUpdate(url, hash, new UpdateContext.DownloadFileListener() {

package/ios/RCTPushy/RCTPushy.m

@@ -224,7 +224,7 @@ RCT_EXPORT_METHOD(getLocalHashInfo:(NSString *)hash
     resolve([defaults stringForKey:[keyHashInfo stringByAppendingString:hash]]);
 }
 
-RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary *)options
+RCT_EXPORT_METHOD(downloadFullUpdate:(NSDictionary *)options
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {

package/lib/main.js

@@ -95,7 +95,7 @@ export const cInfo = {
 
 function assertRelease() {
   if (__DEV__) {
-    throw new Error('react-native-update can only run on RELEASE version.');
+    throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
   }
 }
 
@@ -181,11 +181,7 @@ export async function downloadUpdate(options, eventListeners) {
   }
   if (downloadedHash === options.hash) {
     logger(`duplicated downloaded hash ${downloadedHash}, ignored`);
-    return;
-  }
-  if (readyHash) {
-    logger(`hash ${readyHash} applied. reboot first`);
-    return;
+    return downloadedHash;
   }
   if (downloadingThrottling) {
     logger('repeated downloading, ignored');
@@ -209,6 +205,7 @@ export async function downloadUpdate(options, eventListeners) {
       );
     }
   }
+  let succeeded = false;
   if (options.diffUrl) {
     logger('downloading diff');
     try {
@@ -217,43 +214,49 @@ export async function downloadUpdate(options, eventListeners) {
         hash: options.hash,
         originHash: currentVersion,
       });
+      succeeded = true;
     } catch (e) {
       logger(`diff error: ${e.message}, try pdiff`);
-      try {
-        await Pushy.downloadPatchFromPackage({
-          updateUrl: options.pdiffUrl,
-          hash: options.hash,
-        });
-      } catch (e) {
-        progressHandler && progressHandler.remove();
-        report(options.hash, 'error');
-        throw e;
-      }
     }
-  } else if (options.pdiffUrl) {
+  }
+  if (!succeeded && options.pdiffUrl) {
     logger('downloading pdiff');
     try {
       await Pushy.downloadPatchFromPackage({
         updateUrl: options.pdiffUrl,
         hash: options.hash,
       });
+      succeeded = true;
+    } catch (e) {
+      logger(`pdiff error: ${e.message}, try full patch`);
+    }
+  }
+  if (!succeeded && options.updateUrl) {
+    logger('downloading full patch');
+    try {
+      await Pushy.downloadFullUpdate({
+        updateUrl: options.updateUrl,
+        hash: options.hash,
+      });
+      succeeded = true;
     } catch (e) {
-      progressHandler && progressHandler.remove();
-      report(options.hash, 'error');
-      throw e;
+      logger(`full patch error: ${e.message}`);
     }
   }
+  progressHandler && progressHandler.remove();
+  if (!succeeded) {
+    report(options.hash, 'error');
+    throw new Error('all update attempts failed');
+  }
   setLocalHashInfo(options.hash, {
     name: options.name,
     description: options.description,
     metaInfo: options.metaInfo,
   });
-  progressHandler && progressHandler.remove();
   downloadedHash = options.hash;
   return options.hash;
 }
 
-let readyHash;
 function assertHash(hash) {
   if (!downloadedHash) {
     logger(`no downloaded hash`);
@@ -263,11 +266,6 @@ function assertHash(hash) {
     logger(`use downloaded hash ${downloadedHash} first`);
     return;
   }
-  if (readyHash === hash) {
-    logger(`hash ${readyHash} already applied. reboot first.`);
-    return;
-  }
-  readyHash = hash;
   return true;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "7.4.0-beta.0",
+  "version": "7.4.2",
   "description": "react-native hot update",
   "main": "lib/index.js",
   "scripts": {
@@ -28,6 +28,6 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {
-    "nanoid": "^3.1.30"
+    "nanoid": "^3.3.3"
   }
 }

package/android/jni/HDiffPatch/CHANGELOG.md

@@ -1,153 +0,0 @@
-# HDiffPatch Change Log
-
-full changelog at: https://github.com/sisong/HDiffPatch/commits   
-
-## [v3.1.0](https://github.com/sisong/HDiffPatch/tree/v3.1.0) - 2020-12-16
-### Added
-* add a memory cache for patch to newStream, can reduce write I/O times;
-* add create_single_compressed_diff()&patch_single_compressed_diff() , preview, still under development! diffData saved as single compressed stream, for optimize decompress memory when patch;
-### Removed
-*  cmdline remove option "-o", no Original diff, you can continue to call patch()|patch_stream() yourself;  
-*  remove patch_decompress_repeat_out(), you need use patch_decompress*() to replace it;
-
-## [v3.0.8](https://github.com/sisong/HDiffPatch/tree/v3.0.8) - 2020-01-01
-### Added
-* patch demo for Android, out lib file libhpatchz.so;
-
-## [v3.0.7](https://github.com/sisong/HDiffPatch/tree/v3.0.7) - 2019-12-19
-### Fixed
-* Fix a bug when create dir's manifest file without checksum (hdiffz -C-no -M...);
-* Fix a bug when create dir's manifest file on windows operating system;
-
-## [v3.0.6](https://github.com/sisong/HDiffPatch/tree/v3.0.6) - 2019-09-18
-### Fixed
-* Fix a patch bug when old file size >=4GB and patch with large cache memory and run as 32bit app;
-
-## [v3.0.5](https://github.com/sisong/HDiffPatch/tree/v3.0.5) - 2019-09-18
-### Fixed
-* Fix a directory patch bug when changed file's sumSize >=4GB and run as 32bit app;
-
-## [v3.0.4](https://github.com/sisong/HDiffPatch/tree/v3.0.4) - 2019-09-06
-### Fixed
-* Fix dir_patch can't remove some files bug when patch to same dir on Windows operating system;
-
-## [v3.0.0](https://github.com/sisong/HDiffPatch/tree/v3.0.0) - 2019-03-01
-### Added
-* hdiffz,hpatchz command line support diff&patch between directories(folder);
-* support checksum plugin: crc32ChecksumPlugin,adler32ChecksumPlugin,adler64ChecksumPlugin,fadler32ChecksumPlugin,fadler64ChecksumPlugin,fadler128ChecksumPlugin,md5ChecksumPlugin ;
-* lzmaCompressPlugin support parallel compress;
-* add parallel compress plugin: pzlibCompressPlugin,pbz2CompressPlugin,lzma2CompressPlugin
-* command line support SFX(self extract archive);
-
-## [v2.5.3](https://github.com/sisong/HDiffPatch/tree/v2.5.3) - 2018-12-25
-### Fixed
-* Fix a bug when cancel LzmaEnc_Encode in lzmaCompressPlugin when diff;
-
-## [v2.5.0](https://github.com/sisong/HDiffPatch/tree/v2.5.0) - 2018-12-01
-### Added
-* resave_compressed_diff(...) support resave diffFile with new compress type;
-
-## [v2.4.2](https://github.com/sisong/HDiffPatch/tree/v2.4.2) - 2018-11-06
-### Added
-* Add CI(ci.appveyor.com) for this repository;
-
-## [v2.4.1](https://github.com/sisong/HDiffPatch/tree/v2.4.1) - 2018-08-14
-### Fixed
-* Fix a memroy bug in zlibCompressPlugin when diff;
-### Added
-* Add CI(travis-ci.org) for this repository;
-
-## [v2.4](https://github.com/sisong/HDiffPatch/tree/v2.4) - 2018-04-26
-### Changed
-* Improve hdiffz,hpatchz command line;
-
-## [v2.3](https://github.com/sisong/HDiffPatch/tree/v2.3) - 2018-03-21
-### Added
-* hpatch_coverList_open_serializedDiff(...),hpatch_coverList_open_compressedDiff(...) support open diffFile read coverList;
-
-## [v2.2.2](https://github.com/sisong/HDiffPatch/tree/v2.2.2) - 2017-09-10
-### Changed
-* Optimize patch_stream_with_cache(...) speed when patch with large cache memory;
-
-## [v2.2.1](https://github.com/sisong/HDiffPatch/tree/v2.2.1) - 2017-09-06
-### Added
-* add compress&decompress plugin lz4hcCompressPlugin,zstdCompressPlugin,zstdDecompressPlugin;
-
-## [v2.2.0](https://github.com/sisong/HDiffPatch/tree/v2.2.0) - 2017-09-02
-### Added
-* Optimize patch_decompress_with_cache(...) speed when patch with large cache memory;
-
-## [v2.1.1](https://github.com/sisong/HDiffPatch/tree/v2.1.1) - 2017-08-23
-### Added
-* add compress&decompress plugin lz4CompressPlugin,lz4DecompressPlugin;
-
-## [v2.1.0](https://github.com/sisong/HDiffPatch/tree/v2.1.0) - 2017-08-22
-### Added
-* create_compressed_diff_stream(...), same as create_compressed_diff(...), but can control memory requires and run speed by different kMatchBlockSize value;
-* add performance test, compare with xdelta3.1;
-
-## [v2.0.3](https://github.com/sisong/HDiffPatch/tree/v2.0.3) - 2017-08-05
-### Added
-* patch_decompress_with_cache(...), same as patch_decompress(...), but support set cache memory size for optimize patch speed;
-* patch_stream_with_cache(...), same as patch_stream(...), but support set cache memory size for optimize patch speed;
-
-
-## [v2.0.0](https://github.com/sisong/HDiffPatch/tree/v2.0.0) - 2017-07-29
-### Added
-* create_compressed_diff(...) support create compressed differential;
-* add compress plugin zlibCompressPlugin, bz2CompressPlugin, lzmaCompressPlugin;
-* patch_decompress(...) support patch apply compressed differential;
-* add decompress plugin zlibDecompressPlugin, bz2DecompressPlugin, lzmaDecompressPlugin;
-
-## [v1.2.2](https://github.com/sisong/HDiffPatch/tree/v1.2.2) - 2017-07-17
-### Fixed
-* Fix a memroy bug when diff (never encountered, maybe happen);
-
-## [v1.2.0](https://github.com/sisong/HDiffPatch/tree/v1.2.0) - 2017-07-02
-### Changed
-* Optimize diff speed;
-
-## [v1.1.4](https://github.com/sisong/HDiffPatch/tree/v1.1.4) - 2017-06-10
-### Added
-* Add MakeFile for support make; by author [JayXon](https://github.com/JayXon);
-### Changed
-* Slightly optimize diff required memory size;
-
-## [v1.1.3](https://github.com/sisong/HDiffPatch/tree/v1.1.3) - 2017-01-01
-### Changed
-* used divsufsort (still can select sais or std::sort) for suffix string sort;
-
-## [v1.1.2](https://github.com/sisong/HDiffPatch/tree/v1.1.2) - 2016-09-01
-### Fixed
-* Fix a bug when write out diffFile on Windows operating system; by author [Wenhai Lin](https://github.com/WenhaiLin);
-
-## [v1.1.1](https://github.com/sisong/HDiffPatch/tree/v1.1.1) - 2015-04-20
-### Fixed
-* Fix a code bug when diff (never encountered, maybe happen);
-
-## [v1.1.0](https://github.com/sisong/HDiffPatch/tree/v1.1.0) - 2014-09-13
-### Added
-* patch_stream(...), same as patch(...) but used O(1) bytes of memory;
-
-## [v1.0.6](https://github.com/sisong/HDiffPatch/tree/v1.0.6) - 2014-09-07
-### Added
-* Diff&Patch support big datas(>2GB, int32 to int64) on 64bit operating system;
-
-## [v1.0.2](https://github.com/sisong/HDiffPatch/tree/v1.0.2) - 2013-08-03
-### Changed
-* Optimize diff speed with two unrelated data;
-
-## [v1.0.1](https://github.com/sisong/HDiffPatch/tree/v1.0.1) - 2013-08-02
-### Fixed
-* Fix diff fail between two equal datas;
-
-## [v1.0.0](https://github.com/sisong/HDiffPatch/tree/v1.0.0) - 2013-06-06
-### Added
-* Add Readme file; 
-* Performance test, compare with BSDiff4.3;
-
-## [Init Release](https://github.com/sisong/HDiffPatch/commit/6d71005c65e1713a8f0c02f9fd2eced32940b4c2) - 2013-05-30
-### Init Release, MIT copyright;
-* create_diff(...) support create differential between two memory datas(src->dst bytes);
-* patch(...) support apply differential for update src bytes to dst bytes;
-* demo app for diff&patch between two files;

package/android/jni/HDiffPatch/LICENSE

@@ -1,48 +0,0 @@
-MIT License
-
-for HDiffPatch
-Copyright (c) 2012-2021 housisong
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------------------------------------------------------------------------------------------------------------------------------
-
-for libdivsufsort
-Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

package/android/jni/HDiffPatch/Makefile

@@ -1,157 +0,0 @@
-# args
-DIR_DIFF := 1
-MT       := 1
-LZMA     := 1
-MD5      := 0
-
-
-HPATCH_OBJ := \
-    libHDiffPatch/HPatch/patch.o \
-    file_for_patch.o
-
-ifeq ($(DIR_DIFF),0)
-else
-  HPATCH_OBJ += \
-    dirDiffPatch/dir_patch/dir_patch.o \
-    dirDiffPatch/dir_patch/res_handle_limit.o \
-    dirDiffPatch/dir_patch/ref_stream.o \
-    dirDiffPatch/dir_patch/new_stream.o \
-    dirDiffPatch/dir_patch/dir_patch_tools.o \
-    dirDiffPatch/dir_patch/new_dir_output.o \
-    libHDiffPatch/HDiff/private_diff/limit_mem_diff/adler_roll.o
-endif
-
-
-HDIFF_OBJ := \
-    libHDiffPatch/HDiff/diff.o \
-    libHDiffPatch/HDiff/private_diff/bytes_rle.o \
-    libHDiffPatch/HDiff/private_diff/suffix_string.o \
-    libHDiffPatch/HDiff/private_diff/compress_detect.o \
-    libHDiffPatch/HDiff/private_diff/limit_mem_diff/digest_matcher.o \
-    libHDiffPatch/HDiff/private_diff/limit_mem_diff/stream_serialize.o \
-    libHDiffPatch/HDiff/private_diff/libdivsufsort/divsufsort64.o \
-    libHDiffPatch/HDiff/private_diff/libdivsufsort/divsufsort.o \
-    libHDiffPatch/HDiff/private_diff/limit_mem_diff/adler_roll.o \
-    $(HPATCH_OBJ)
-ifeq ($(DIR_DIFF),0)
-else
-  HDIFF_OBJ += \
-    dirDiffPatch/dir_diff/dir_diff.o \
-    dirDiffPatch/dir_diff/dir_diff_tools.o \
-    dirDiffPatch/dir_diff/dir_manifest.o
-endif
-ifeq ($(MT),0)
-else
-  HDIFF_OBJ += \
-    libParallel/parallel_import.o \
-    libParallel/parallel_channel.o \
-    compress_parallel.o
-endif
-
-
-DEF_FLAGS := \
-    -Os -DNDEBUG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-    -D_IS_NEED_ALL_CompressPlugin=0 \
-    -D_IS_NEED_DEFAULT_CompressPlugin=0 \
-    -D_CompressPlugin_zlib  \
-    -D_CompressPlugin_bz2  \
-    -D_IS_NEED_ALL_ChecksumPlugin=0 \
-    -D_IS_NEED_DEFAULT_ChecksumPlugin=0 
-ifeq ($(DIR_DIFF),0)
-  DEF_FLAGS += -D_IS_NEED_DIR_DIFF_PATCH=0
-else
-  DEF_FLAGS += \
-    -D_IS_NEED_DIR_DIFF_PATCH=1 \
-    -D_ChecksumPlugin_crc32 \
-    -D_ChecksumPlugin_fadler64
-  ifeq ($(MD5),0)
-  else
-    DEF_FLAGS += -D_ChecksumPlugin_md5 -I'../libmd5'
-  endif
-endif
-ifeq ($(LZMA),0)
-else
-  DEF_FLAGS += \
-    -D_CompressPlugin_lzma -I'../lzma/C' \
-    -D_CompressPlugin_lzma2 -I'../lzma/C'
-endif
-ifeq ($(MT),0)
-  DEF_FLAGS += \
-    -D_7ZIP_ST \
-    -D_IS_USED_MULTITHREAD=0 
-else
-  DEF_FLAGS += \
-    -D_IS_USED_MULTITHREAD=1 \
-    -D_IS_USED_PTHREAD=1
-endif
-
-
-PATCH_LINK := -lz -lbz2
-DIFF_LINK  := $(PATCH_LINK)
-ifeq ($(MT),0)
-else
-  DIFF_LINK += -lpthread
-endif
-
-
-CFLAGS   += $(DEF_FLAGS) 
-CXXFLAGS += $(DEF_FLAGS)
-
-.PHONY: all install clean
-
-all: md5Lib lzmaLib libhdiffpatch.a hdiffz hpatchz
-
-ifeq ($(DIR_DIFF),0)
-  MD5_OBJ     :=
-  md5Lib      :
-else
-  ifeq ($(MD5),0)
-    MD5_OBJ     :=
-    md5Lib      :
-  else
-    MD5_OBJ     := 'md5.o'
-    md5Lib      : # https://sourceforge.net/projects/libmd5-rfc  https://github.com/sisong/libmd5
-	$(CC) -c $(CFLAGS) '../libmd5/md5.c'
-  endif
-endif
-
-ifeq ($(LZMA),0)
-  LZMA_DEC_OBJ :=
-  LZMA_OBJ     :=
-  lzmaLib      :
-else  
-  LZMA_DEC_OBJ := 'LzmaDec.o' 'Lzma2Dec.o' 
-  LZMA_OBJ     := 'LzFind.o' 'LzmaEnc.o' 'Lzma2Enc.o' $(LZMA_DEC_OBJ)
-  LZMA_SRC     := '../lzma/C/LzFind.c' '../lzma/C/LzmaDec.c' '../lzma/C/LzmaEnc.c' \
-		     '../lzma/C/Lzma2Dec.c' '../lzma/C/Lzma2Enc.c'
-  ifeq ($(MT),0)  
-  else  
-    LZMA_OBJ += 'LzFindMt.o' 'MtCoder.o' 'MtDec.o' 'ThreadsP.o'
-    LZMA_SRC += '../lzma/C/LzFindMt.c' '../lzma/C/MtCoder.c' \
-		   '../lzma/C/MtDec.c' '../lzma/C/ThreadsP.c' 
-  endif
-  lzmaLib: # https://github.com/sisong/lzma
-	$(CC) -c $(CFLAGS) $(LZMA_SRC)
-endif
-
-libhdiffpatch.a: $(HDIFF_OBJ)
-	$(AR) rcs $@ $^
-
-hdiffz: 
-	$(CXX) hdiffz.cpp libhdiffpatch.a $(MD5_OBJ) $(LZMA_OBJ) $(CXXFLAGS) $(DIFF_LINK) -o hdiffz
-hpatchz: 
-	$(CC) hpatchz.c $(HPATCH_OBJ) $(MD5_OBJ) $(LZMA_DEC_OBJ) $(CFLAGS) $(PATCH_LINK) -o hpatchz
-
-RM := rm -f
-INSTALL_X := install -m 0755
-INSTALL_BIN := $(DESTDIR)/usr/local/bin
-
-clean:
-	$(RM) libhdiffpatch.a hdiffz hpatchz $(HDIFF_OBJ) $(MD5_OBJ) $(LZMA_OBJ)
-
-install: all
-	$(INSTALL_X) hdiffz $(INSTALL_BIN)/hdiffz
-	$(INSTALL_X) hpatchz $(INSTALL_BIN)/hpatchz
-
-uninstall:
-	$(RM)  $(INSTALL_BIN)/hdiffz  $(INSTALL_BIN)/hpatchz