diff --git a/0001-make-log-file-permissions-more-restrictive.patch b/0001-make-log-file-permissions-more-restrictive.patch deleted file mode 100644 index 30d3c930c0b44bd23767f41ea9d88cdaf0d3f062..0000000000000000000000000000000000000000 --- a/0001-make-log-file-permissions-more-restrictive.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/go.mod b/go.mod -index 04df1f8..7c494a4 100644 ---- a/go.mod -+++ b/go.mod -@@ -32,7 +32,7 @@ require ( - google.golang.org/grpc v1.29.0 - google.golang.org/protobuf v1.21.0 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect -- gopkg.in/natefinch/lumberjack.v2 v2.0.0 -+ gopkg.in/natefinch/lumberjack.v2 v2.0.1-0.20190411184413-94d9e492cc53 - gotest.tools v2.2.0+incompatible // indirect - ) - -diff --git a/go.sum b/go.sum -index 84d09f2..c22c194 100644 ---- a/go.sum -+++ b/go.sum -@@ -161,6 +161,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= - gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -+gopkg.in/natefinch/lumberjack.v2 v2.0.1-0.20190411184413-94d9e492cc53 h1:3sU6EgF8Xi+t59u4g5ALV5dHlPMujDJ1EtnRtGJ7W4E= -+gopkg.in/natefinch/lumberjack.v2 v2.0.1-0.20190411184413-94d9e492cc53/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= - gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= - gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go b/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go -index 46d97c5..a47b7f0 100644 ---- a/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go -+++ b/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack.go -@@ -206,13 +206,13 @@ func (l *Logger) rotate() error { - // openNew opens a new log file for writing, moving any old log file out of the - // way. This methods assumes the file has already been closed. - func (l *Logger) openNew() error { -- err := os.MkdirAll(l.dir(), 0744) -+ err := os.MkdirAll(l.dir(), 0755) - if err != nil { - return fmt.Errorf("can't make directories for new logfile: %s", err) - } - - name := l.filename() -- mode := os.FileMode(0644) -+ mode := os.FileMode(0600) - info, err := os_Stat(name) - if err == nil { - // Copy the mode off the old logfile. -@@ -288,7 +288,7 @@ func (l *Logger) openExistingOrNew(writeLen int) error { - return nil - } - --// genFilename generates the name of the logfile from the current time. -+// filename generates the name of the logfile from the current time. - func (l *Logger) filename() string { - if l.Filename != "" { - return l.Filename -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 8ec97c8..1d8f5e8 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -170,5 +170,5 @@ google.golang.org/protobuf/runtime/protoimpl - google.golang.org/protobuf/types/known/anypb - google.golang.org/protobuf/types/known/durationpb - google.golang.org/protobuf/types/known/timestamppb --# gopkg.in/natefinch/lumberjack.v2 v2.0.0 -+# gopkg.in/natefinch/lumberjack.v2 v2.0.1-0.20190411184413-94d9e492cc53 - gopkg.in/natefinch/lumberjack.v2 diff --git a/isula-transform-0.9.0.tar.gz b/isula-transform-0.9.0.tar.gz deleted file mode 100644 index 7ad32fc3afd90034be730866004be2fe7989aae5..0000000000000000000000000000000000000000 Binary files a/isula-transform-0.9.0.tar.gz and /dev/null differ diff --git a/isula-transform-0.9.1.tar.gz b/isula-transform-0.9.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c2b099b1c7b8301dd06386e82a6b75901f54d13e Binary files /dev/null and b/isula-transform-0.9.1.tar.gz differ diff --git a/isula-transform.spec b/isula-transform.spec index 8ae91a2dc728ec7969400206c913f6e4bb4f2464..4eb85b06f25f76f526aea19fe11659b82af2afc0 100644 --- a/isula-transform.spec +++ b/isula-transform.spec @@ -1,15 +1,15 @@ # Basic Infomation Name: isula-transform -Version: 0.9.0 -Release: 2 +Version: 0.9.1 +Release: 1 Summary: transform docker container to islua container License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-transform Source0: %{name}-%{version}.tar.gz -Patch9000: 0001-make-log-file-permissions-more-restrictive.patch # Dependency -BuildRequires: lcr-devel lxc-devel +BuildRequires: lcr-devel lxc-devel yajl-devel +BuildRequires: iSulad >= 2.0.5 BuildRequires: golang >= 1.13 Requires: iSulad docker @@ -19,7 +19,7 @@ container to a type that isulad can recognize as being loaded. # Build Sections %prep -%autosetup -n %{name} -p1 +%autosetup -n %{name} %build make @@ -36,6 +36,9 @@ rm -rf %{buildroot} %attr(550,root,root) %{_bindir}/isula-transform %changelog +* Fri Nov 13 2020 wangkang101<873229877@qq.com> - 0.9.1-1 +- adapt to iSulad 2.0.5 + * Wed Sep 2 2020 wangkang101<873229877@qq.com> - 0.9.0-2 - make log file permissions more restrictive