prepare for fix 0.0.5

binsec · Feb 24, 2023 · e1ebcb0 · e1ebcb0
1 parent f8bc5dc
commit e1ebcb0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## 0.0.5 (2023-02-24)
+
+- enable macOS Homebrew distribution
+
 ## 0.0.4 (2023-02-15)
 
 - better handling of x86 flags

diff --git a/dune b/dune
@@ -1,7 +1,7 @@
 (env
  (_
-  (c_flags :standard -g0)
-  (cxx_flags :standard -g0)))
+  (c_flags :standard -std=gnu11 -g0)
+  (cxx_flags :standard -std=gnu++11 -g0)))
 
 (subdir
  unisim/util
@@ -343,6 +343,7 @@
 
 (test
  (name unittest)
- (modes (best exe))
+ (modes
+  (best exe))
  (modules unittest)
  (libraries arm32dba aarch64dba amd64dba))
diff --git a/dune-project b/dune-project
@@ -2,7 +2,7 @@
 (generate_opam_files true)
 
 (name unisim_archisec)
-(version "0.0.4")
+(version "0.0.5")
 (maintainers "BINSEC <binsec@saxifrage.saclay.cea.fr>")
 (authors
   "Yves Lhuillier"

diff --git a/unisim/util/hypapp/hypapp.cc b/unisim/util/hypapp/hypapp.cc
@@ -266,9 +266,8 @@ HttpRequest::HttpRequest(const Request& _req, std::ostream& _log, std::ostream&
   , log(_log)
   , warn_log(_warn_log)
   , err_log(_err_log)
+  , std::istream(&content_stream_buffer)
 {
-  rdbuf(&content_stream_buffer);
-
   unsigned int part_count = req.GetPartCount();
   parts.reserve(part_count);
   for(unsigned int part_num = 0; part_num < part_count; part_num++)
@@ -343,9 +342,8 @@ HttpRequest::HttpRequest(const std::string& _server_root, const std::string& _pa
   , log(http_request.log)
   , warn_log(http_request.warn_log)
   , err_log(http_request.err_log)
+  , std::istream(&content_stream_buffer)
 {
-  rdbuf(&content_stream_buffer);
-
   unsigned int part_count = req.GetPartCount();
   for(unsigned int part_num = 0; part_num < part_count; part_num++)
   {

diff --git a/unisim/util/hypapp/hypapp.hh b/unisim/util/hypapp/hypapp.hh
@@ -252,8 +252,8 @@ public:
   HttpRequestPart(const RequestPart& _part)
     : part(_part)
     , content_stream_buffer(part.GetContent(), part.GetContentLength(), 0)
+    , std::istream(&content_stream_buffer)
   {
-    rdbuf(&content_stream_buffer);
   }
 
   unsigned int GetContentLength() const { return part.GetContentLength(); }

diff --git a/unisim_archisec.opam b/unisim_archisec.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.0.4"
+version: "0.0.5"
 synopsis: "UNISIM-VP DBA decoder"
 description: """
 
@@ -36,4 +36,4 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/binsec/unisim_archisec.git"
-available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) ]
+available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) | os = "macos" & os-distribution = "homebrew" ]
diff --git a/unisim_archisec.opam.template b/unisim_archisec.opam.template
@@ -1 +1 @@
-available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) ]
+available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" | os-version >= 8) | os = "macos" & os-distribution = "homebrew" ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" \| os-version >= 8) ]
		available: [ os = "linux" & (os-distribution != "ol" & os-distribution != "centos" \| os-version >= 8) \| os = "macos" & os-distribution = "homebrew" ]