Browse code
Mercurial : Disable zstd
Change-Id: I5a7102b14672150688e142522df9257b4e088ed1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4331
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
xiaolin-vmware authored on 2017/11/18 07:43:41Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,26 @@ |
| 0 |
+diff --git a/setup.py b/setup.py |
|
| 1 |
+index f3d6d7e..3e591a2 100644 |
|
| 2 |
+--- a/setup.py |
|
| 3 |
+@@ -399,7 +399,7 @@ class hgbuildext(build_ext): |
|
| 4 |
+ negative_opt = buildextnegops |
|
| 5 |
+ |
|
| 6 |
+ def initialize_options(self): |
|
| 7 |
+- self.zstd = True |
|
| 8 |
++ self.zstd = False |
|
| 9 |
+ return build_ext.initialize_options(self) |
|
| 10 |
+ |
|
| 11 |
+ def build_extensions(self): |
|
| 12 |
+@@ -776,9 +776,9 @@ extmodules = [ |
|
| 13 |
+ ['hgext/fsmonitor/pywatchman/bser.c']), |
|
| 14 |
+ ] |
|
| 15 |
+ |
|
| 16 |
+-sys.path.insert(0, 'contrib/python-zstandard') |
|
| 17 |
+-import setup_zstd |
|
| 18 |
+-extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd')) |
|
| 19 |
++#sys.path.insert(0, 'contrib/python-zstandard') |
|
| 20 |
++#import setup_zstd |
|
| 21 |
++#extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd')) |
|
| 22 |
+ |
|
| 23 |
+ try: |
|
| 24 |
+ from distutils import cygwinccompiler |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: A free, distributed source control management tool. |
| 4 | 4 |
Name: mercurial |
| 5 | 5 |
Version: 4.3.3 |
| 6 |
-Release: 1%{?dist}
|
|
| 6 |
+Release: 2%{?dist}
|
|
| 7 | 7 |
License: GPLv2+ |
| 8 | 8 |
URL: https://www.mercurial-scm.org |
| 9 | 9 |
Group: System Environment/Security |
| ... | ... |
@@ -11,6 +11,7 @@ Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Source0: https://www.mercurial-scm.org/release/%{name}-%{version}.tar.gz
|
| 13 | 13 |
%define sha1 mercurial=921c3c6302c4b1d4be6a56fcfa0a41553dd4bd44 |
| 14 |
+Patch0: mercurial-disable-zstd.patch |
|
| 14 | 15 |
BuildRequires: python2 |
| 15 | 16 |
BuildRequires: python2-libs |
| 16 | 17 |
BuildRequires: python2-devel |
| ... | ... |
@@ -22,6 +23,7 @@ Mercurial is written in Python and is used by projects such as Mozilla and Vim. |
| 22 | 22 |
|
| 23 | 23 |
%prep |
| 24 | 24 |
%setup -q |
| 25 |
+%patch0 -p1 |
|
| 25 | 26 |
|
| 26 | 27 |
%build |
| 27 | 28 |
make build |
| ... | ... |
@@ -57,6 +59,8 @@ rm -rf %{buildroot}/*
|
| 57 | 57 |
%{python2_sitelib}/*
|
| 58 | 58 |
|
| 59 | 59 |
%changelog |
| 60 |
+* Tue Nov 14 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-2 |
|
| 61 |
+- Disable zstd. |
|
| 60 | 62 |
* Tue Oct 17 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1 |
| 61 | 63 |
- Update verion to 4.3.3 for CVE-2017-1000115, CVE-2017-1000116. |
| 62 | 64 |
* Fri Aug 11 2017 Rongrong Qiu <rqiu@vmware.com> 4.1-4 |