Accepting request 223977 from devel:tools

- Update to version 1.2:
  New features:
  * Performance improvements
  * Library versioning
  * RPC API got closer to CLI
  * New "post-restore" call in action scripts
  * Logrotate rules file
  * Default log file for service when starting via systemd 
  Bug fixes:
  * A lot for ARM cross-compile
  * Fsnotifies dumping didn't work on NFS
  * Images auto-deduplication only worked one level up
  * Packet socket ID was treated as file-descriptor and close()-d
  * Badly counted pages stats on restore
  * Linked remap name conflict when dump and restore on NFS
  * Sporadic failures in memory draining due to huge pipes used
  * Broken criu show of repeated fields
  * Failure to open mountpoint in foreign pid namespace
  * Unlinked bound unix socket dump error
  * Small memory leak when writing to incremental image(s)
  * Restoring fsnotify for links results in ELOOP
  * Host's PATH is not suitable when execv-ing tar/ip/iptable to restore namespace (workaround, proper fix will be in 1.3)
  * Using subdirs in log file name via RPC breaks security 
- New subpackages: libcriu1 and criu-devel
- Remove obsoleted always-define-ptrace_peeksiginfo_args.diff (forwarded request 223976 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/223977
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/criu?expand=0&rev=4

always-define-ptrace_peeksiginfo_args.diff

@@ -1,25 +0,0 @@
-struct ptrace_peeksiginfo_args is defined in linux/ptrace.h but not in sys/ptrace.h.
-
----
- include/ptrace.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/ptrace.h
-+++ b/include/ptrace.h
-@@ -19,6 +19,8 @@
- 
- #ifndef PTRACE_PEEKSIGINFO
- #define PTRACE_PEEKSIGINFO      0x4209
-+#endif
-+
- struct ptrace_peeksiginfo_args {
-         __u64 off;	/* from which siginfo to start */
-         __u32 flags;
-@@ -27,7 +29,6 @@ struct ptrace_peeksiginfo_args {
- 
- /* Read signals from a shared (process wide) queue */
- #define PTRACE_PEEKSIGINFO_SHARED       (1 << 0)
--#endif
- 
- #ifndef PTRACE_GETREGSET
- # define PTRACE_GETREGSET	0x4204

criu-1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff7700e3e55f1fca5ec559b4adee57f64f647a9920a1bd11c510cc67ed137f7d
-size 323535

criu-1.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ebdb544690f75c3e0f70d9af4d09f4f0d654ecea59e14abe3a5c9f536b6b413
+size 335531

criu.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Feb 26 17:15:26 CET 2014 - tiwai@suse.de
+
+- Update to version 1.2:
+  New features:
+  * Performance improvements
+  * Library versioning
+  * RPC API got closer to CLI
+  * New "post-restore" call in action scripts
+  * Logrotate rules file
+  * Default log file for service when starting via systemd 
+  Bug fixes:
+  * A lot for ARM cross-compile
+  * Fsnotifies dumping didn't work on NFS
+  * Images auto-deduplication only worked one level up
+  * Packet socket ID was treated as file-descriptor and close()-d
+  * Badly counted pages stats on restore
+  * Linked remap name conflict when dump and restore on NFS
+  * Sporadic failures in memory draining due to huge pipes used
+  * Broken criu show of repeated fields
+  * Failure to open mountpoint in foreign pid namespace
+  * Unlinked bound unix socket dump error
+  * Small memory leak when writing to incremental image(s)
+  * Restoring fsnotify for links results in ELOOP
+  * Host's PATH is not suitable when execv-ing tar/ip/iptable to restore namespace (workaround, proper fix will be in 1.3)
+  * Using subdirs in log file name via RPC breaks security 
+- New subpackages: libcriu1 and criu-devel
+- Remove obsoleted always-define-ptrace_peeksiginfo_args.diff
+
 -------------------------------------------------------------------
 Tue Jan 28 12:42:34 CET 2014 - tiwai@suse.de
 

criu.spec

@@ -17,18 +17,18 @@
 
 
 Name:           criu
-Version:        1.1
+Version:        1.2
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
 Group:          System/Console
 Url:            http://criu.org/
+Requires:       logrotate
 BuildRequires:  asciidoc
 BuildRequires:  protobuf-c
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(systemd)
 Source0:        http://download.openvz.org/criu/criu-%{version}.tar.bz2
-Patch1:         always-define-ptrace_peeksiginfo_args.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 
@@ -39,18 +39,40 @@ operating system. Using this tool, you can freeze a running application
 files. You can then use the files to restore and run the application from
 the point it was frozen at.
 
+%package -n libcriu1
+Summary:        Library for CRIU
+License:        LGPL-2.1
+Group:          System/Libraries
+
+%description -n libcriu1
+This package contains the library for CRIU, Checkpoint/Restore In
+Userspace Tools.
+
+%package devel
+Summary:        Include Files and Libraries mandatory for Development
+License:        LGPL-2.1+
+Group:          Development/Libraries/C and C++
+Requires:       glibc-devel
+Requires:       libcriu1 = %{version}
+
+%description devel
+This package contains all necessary include files and libraries needed
+to develop applications with CRIU library.
+
 %prep
 %setup -q -n %{name}-%{version}
-%if 0%{suse_version} > 1310
-%patch1 -p1
-%endif
 
 %build
 export CFLAGS="%optflags"
-make V=1 %{?_smp_mflags} PREFIX=%{_prefix}
+make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=/etc/logrotate.d/
 
 %install
-make V=1 %{?_smp_mflags} PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+make V=1 %{?_smp_mflags} PREFIX=%{_prefix}  LOGROTATEDIR=/etc/logrotate.d/ \
+    DESTDIR=$RPM_BUILD_ROOT install
+# make rpmlint happy
+mv $RPM_BUILD_ROOT/etc/logrotate.d/criu-service \
+    $RPM_BUILD_ROOT/etc/logrotate.d/criu
 # for compatiblity
 ln -s criu $RPM_BUILD_ROOT%{_sbindir}/crtools
 ln -s criu.8 $RPM_BUILD_ROOT%{_mandir}/man8/crtools.8
@@ -73,11 +95,25 @@ exit 0
 %service_del_postun criu.service criu.socket
 exit 0
 
+%post -n libcriu1 -p /sbin/ldconfig
+
+%postun -n libcriu1 -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc README COPYING
 %{_sbindir}/*
 %{_mandir}/man*/*
 %{_unitdir}/criu.*
+/etc/logrotate.d/*
+
+%files -n libcriu1
+%defattr(-,root,root)
+%{_libdir}/libcriu.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/criu
+%{_libdir}/libcriu.so
 
 %changelog