diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 32ab297..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/libcontainer-c964368.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..adeb9b1 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unused/deprecated diff --git a/golang-github-docker-libcontainer.spec b/golang-github-docker-libcontainer.spec deleted file mode 100644 index be96f7e..0000000 --- a/golang-github-docker-libcontainer.spec +++ /dev/null @@ -1,218 +0,0 @@ -# http://github.com/docker/libcontainer -%global provider_prefix github.com/docker/libcontainer -%global goipath %{provider_prefix} -%global commit c9643688cb73c2588a9c9b14357bda6c3a9df67f -%global commitdate 20150609 - -%gometa - -Name: %{goname} -Version: 2.1.1 -Release: 0.18.%{commitdate}git%{shortcommit}%{?dist} -Summary: Configuration options for containers -License: ASL 2.0 -URL: %{gourl} -Source0: %{gosource} -Patch0: update-to-newer-signature-of-systemd.Conn-methods.patch -Patch1: libcontainer-fixDup3syscall.patch - -BuildRequires: golang(github.com/Sirupsen/logrus) -BuildRequires: golang(github.com/codegangsta/cli) >= 1.1.0-1 -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/docker/go-units) -BuildRequires: golang(github.com/docker/docker/pkg/mount) -BuildRequires: golang(github.com/docker/docker/pkg/symlink) -BuildRequires: golang(github.com/docker/docker/pkg/term) -BuildRequires: golang(github.com/godbus/dbus) -BuildRequires: golang(github.com/golang/protobuf/proto) -BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.9 - -%description -libcontainer specifies configuration options for what a container is. It -provides a native Go implementation for using Linux namespaces with no -external dependencies. libcontainer provides many convenience functions for -working with namespaces, networking, and management. - -This package provides the nsinit binary as well, but it is currently for -debugging purposes only and not officially supported. - -%package devel -Summary: Configuration options for containers -BuildArch: noarch - -BuildRequires: golang(github.com/Sirupsen/logrus) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/docker/docker/pkg/mount) -BuildRequires: golang(github.com/docker/docker/pkg/symlink) -BuildRequires: golang(github.com/godbus/dbus) -BuildRequires: golang(github.com/golang/protobuf/proto) -BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.9 - -%description devel -libcontainer specifies configuration options for what a container is. It -provides a native Go implementation for using Linux namespaces with no -external dependencies. libcontainer provides many convenience functions for -working with namespaces, networking, and management. - -This package contains library source intended for building other packages -which use libcontainer. - -%prep -%forgesetup -%patch0 -p1 -%patch1 -p1 -b .dup3 - -%build -%gobuildroot -%gobuild -o _bin/nsinit %{gobaseipath}/nsinit - -%install -# Install nsinit -install -d %{buildroot}%{_bindir} -install -p -m 755 _bin/nsinit %{buildroot}%{_bindir}/nsinit - -%goinstall sample_configs - -%check -%gochecks %{gobaseipath} %{gobaseipath}/{integration,devices,netlink,nsenter} - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%license LICENSE -%doc MAINTAINERS MAINTAINERS_GUIDE.md NOTICE -%doc PRINCIPLES.md README.md ROADMAP.md -%{_bindir}/nsinit - -%files devel -f devel.file-list -%license LICENSE -%doc ROADMAP.md PRINCIPLES.md MAINTAINERS_GUIDE.md CONTRIBUTING.md README.md SPEC.md - -%changelog -* Thu Jan 31 2019 Fedora Release Engineering - 2.1.1-0.18.20150609git%{shortcommit}.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 23 2018 Nicolas Mailhot -- 2.1.1-0.17.20150609git%{shortcommit} -- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias -- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/ - -* Fri Jul 13 2018 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 28 2018 Jan Chaloupka - 2.1.1-0.15.20150609gitc964368 -- Autogenerate some parts using the new macros - -* Wed Feb 07 2018 Fedora Release Engineering - 2.1.1-0.14.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2.1.1-0.13.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.1.1-0.12.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 03 2017 Jan Chaloupka - 2.1.1-0.11.gitc964368 -- Exclude ppc64le (the package needs to be pdated to newer version) - related: #1164989 - -* Tue Jun 27 2017 Jan Chaloupka - 2.1.1-0.10.gitc964368 -- Exclude ppc64 arch (missing docker) - related: #1164989 - -* Fri Feb 10 2017 Fedora Release Engineering - 2.1.1-0.9.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jul 21 2016 Fedora Release Engineering - 2.1.1-0.8.gitc964368 -- https://fedoraproject.org/wiki/Changes/golang1.7 - -* Sat Apr 9 2016 Peter Robinson 2.1.1-0.7.gitc964368 -- Fix builds on aarch64 - -* Thu Mar 17 2016 jchaloup - 2.1.1-0.6.gitc964368 -- Polish spec file -- Patch systemd.Conn methods - resolves: #1230658 - -* Mon Feb 22 2016 Fedora Release Engineering - 2.1.1-0.5.gitc964368 -- https://fedoraproject.org/wiki/Changes/golang1.6 - -* Wed Feb 03 2016 Fedora Release Engineering - 2.1.1-0.4.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.1.1-0.3.gitc964368 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 14 2015 jchaloup - 2.1.1-0.2.gitc964368 -- Don't remove _build directory, it is used during debuginfo extracting - At the same time don't include _build directory in devel subpackage. - resolves: #1231486 - -* Thu Jun 11 2015 jchaloup - 2.1.1-0.1.gitc964368 -- Update to 2.1.1 - Ppolish spec file - Use license macro for LICENSE - Remove runtime dependency on golang - resolves: #1230658 - -* Mon Apr 20 2015 jchaloup - 1.4.0-3.gitbada39c -- Bump to upstream bada39cf31c3305810c2575e036f594a7dc3c98f - related: #1164989 - -* Tue Mar 31 2015 jchaloup - 1.4.0-2.gitd7dea0e -- Add [B]R to devel subpackage - related: #1164989 - -* Mon Mar 09 2015 jchaloup - 1.4.0-1.git83663f8 -- Bump to upstream 83663f82e3d76f57ea57faf80b8fd7eb96933b9b - related: #1164989 - -* Tue Nov 18 2014 Lokesh Mandvekar - 1.2.0-3.git28cb5f9 -- Resolves: rhbz#1164989 - update to atleast b9c834b7 - -* Mon Oct 20 2014 Lokesh Mandvekar - 1.2.0-2.gitc907e40 -- install namespaces/nsenter - -* Mon Oct 20 2014 Lokesh Mandvekar - 1.2.0-1.gitc907e40 -- bump to v1.2.0 commit c907e406fe81320d87b58edf74953ceb08facc13 - -* Sat Aug 23 2014 Lokesh Mandvekar - 1.1.0-10.git -- Include syncpipe, system and user dirs missed in previous build - -* Fri Aug 22 2014 Lokesh Mandvekar - 1.1.0-9.git -- Update to db65c35051d05f3fb218a0e84a11267e0894fe0a for docker 1.2.0 - -* Sat Aug 16 2014 Fedora Release Engineering - 1.1.0-8.git29363e2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Aug 15 2014 Lokesh Mandvekar - 1.1.0-7.git -- Resolves: rhbz#1130500 -- update to upstream commit 29363e2d2d7b8f62a5f353be333758f83df540a9 - -* Thu Jul 31 2014 Lokesh Mandvekar - 1.1.0-6 -- Resolves: rhbz#1111916 - package review request -- remove attr for fedora -- correct NVR for codegangsta/cli 1.1.0-1 - -* Wed Jul 30 2014 Lokesh Mandvekar - 1.1.0-5 -- LICENSE file installed in main package -- defattr gotten rid of - -* Wed Jul 30 2014 Lokesh Mandvekar - 1.1.0-4 -- Update BRs for main package - -* Mon Jul 28 2014 Lokesh Mandvekar - 1.1.0-3 -- nsinit needs docker-io-pkg-devel to build - -* Fri Jul 25 2014 Lokesh Mandvekar - 1.1.0-2 -- nsinit description: debugging only and no official support - -* Fri Jul 25 2014 Lokesh Mandvekar 1.1.0-1 -- use v1.1.0 -- do not own dirs owned by golang -- do not redefine macros defined in golang -- main package provides nsinit - -* Sat Jun 21 2014 Lokesh Mandvekar 1.0.1-1 -- Initial fedora package diff --git a/libcontainer-fixDup3syscall.patch b/libcontainer-fixDup3syscall.patch deleted file mode 100644 index 1625f0e..0000000 --- a/libcontainer-fixDup3syscall.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libcontainer-c9643688cb73c2588a9c9b14357bda6c3a9df67f/console_linux.go.orig 2016-04-09 15:05:54.985912166 +0100 -+++ libcontainer-c9643688cb73c2588a9c9b14357bda6c3a9df67f/console_linux.go 2016-04-09 15:06:34.444017814 +0100 -@@ -101,7 +101,7 @@ - } - fd := int(slave.Fd()) - for _, i := range []int{0, 1, 2} { -- if err := syscall.Dup2(fd, i); err != nil { -+ if err := syscall.Dup3(fd, i, 0); err != nil { - return err - } - } ---- libcontainer-c9643688cb73c2588a9c9b14357bda6c3a9df67f/rootfs_linux.go.orig 2016-04-09 15:05:59.981925543 +0100 -+++ libcontainer-c9643688cb73c2588a9c9b14357bda6c3a9df67f/rootfs_linux.go 2016-04-09 15:06:58.662082656 +0100 -@@ -272,7 +272,7 @@ - } - if stat.Rdev == devNullStat.Rdev { - // Close and re-open the fd. -- if err := syscall.Dup2(int(file.Fd()), fd); err != nil { -+ if err := syscall.Dup3(int(file.Fd()), fd, 0); err != nil { - return err - } - } diff --git a/sources b/sources deleted file mode 100644 index 55b7ed2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1777657acd9cff03ed8ba8d5e8f4fc00 libcontainer-c964368.tar.gz diff --git a/update-to-newer-signature-of-systemd.Conn-methods.patch b/update-to-newer-signature-of-systemd.Conn-methods.patch deleted file mode 100644 index 2914bc3..0000000 --- a/update-to-newer-signature-of-systemd.Conn-methods.patch +++ /dev/null @@ -1,64 +0,0 @@ -From abba4886b183eef278b861c879c1e7c70aa3cb51 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Thu, 17 Mar 2016 12:33:17 +0100 -Subject: [PATCH] update to newer signature of systemd.Conn methods - ---- - cgroups/systemd/apply_systemd.go | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/cgroups/systemd/apply_systemd.go b/cgroups/systemd/apply_systemd.go -index c278228..b7b0772 100644 ---- a/cgroups/systemd/apply_systemd.go -+++ b/cgroups/systemd/apply_systemd.go -@@ -83,7 +83,7 @@ func UseSystemd() bool { - hasStartTransientUnit = true - - // But if we get UnknownMethod error we don't -- if _, err := theConn.StartTransientUnit("test.scope", "invalid"); err != nil { -+ if _, err := theConn.StartTransientUnit("test.scope", "invalid", []systemd.Property{}, nil); err != nil { - if dbusError, ok := err.(dbus.Error); ok { - if dbusError.Name == "org.freedesktop.DBus.Error.UnknownMethod" { - hasStartTransientUnit = false -@@ -98,7 +98,7 @@ func UseSystemd() bool { - scope := fmt.Sprintf("libcontainer-%d-systemd-test-default-dependencies.scope", os.Getpid()) - testScopeExists := true - for i := 0; i <= testScopeWait; i++ { -- if _, err := theConn.StopUnit(scope, "replace"); err != nil { -+ if _, err := theConn.StopUnit(scope, "replace", nil); err != nil { - if dbusError, ok := err.(dbus.Error); ok { - if strings.Contains(dbusError.Name, "org.freedesktop.systemd1.NoSuchUnit") { - testScopeExists = false -@@ -116,8 +116,9 @@ func UseSystemd() bool { - - // Assume StartTransientUnit on a scope allows DefaultDependencies - hasTransientDefaultDependencies = true -- ddf := newProp("DefaultDependencies", false) -- if _, err := theConn.StartTransientUnit(scope, "replace", ddf); err != nil { -+ ddf := make([]systemd.Property, 0) -+ ddf = append(ddf, newProp("DefaultDependencies", false)) -+ if _, err := theConn.StartTransientUnit(scope, "replace", ddf, nil); err != nil { - if dbusError, ok := err.(dbus.Error); ok { - if strings.Contains(dbusError.Name, "org.freedesktop.DBus.Error.PropertyReadOnly") { - hasTransientDefaultDependencies = false -@@ -126,7 +127,7 @@ func UseSystemd() bool { - } - - // Not critical because of the stop unit logic above. -- theConn.StopUnit(scope, "replace") -+ theConn.StopUnit(scope, "replace", nil) - } - return hasStartTransientUnit - } -@@ -187,7 +188,7 @@ func (m *Manager) Apply(pid int) error { - newProp("BlockIOWeight", uint64(c.BlkioWeight))) - } - -- if _, err := theConn.StartTransientUnit(unitName, "replace", properties...); err != nil { -+ if _, err := theConn.StartTransientUnit(unitName, "replace", properties, nil); err != nil { - return err - } - --- -1.9.3 -