Hello community,

here is the log from the commit of package transactional-update for 
openSUSE:Factory checked in at 2020-11-12 22:37:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
 and      /work/SRC/openSUSE:Factory/.transactional-update.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "transactional-update"

Thu Nov 12 22:37:20 2020 rev:65 rq:847069 version:2.28.3

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes    
    2020-11-02 09:40:57.469642423 +0100
+++ 
/work/SRC/openSUSE:Factory/.transactional-update.new.24930/transactional-update.changes
     2020-11-12 22:37:42.994036870 +0100
@@ -1,0 +2,8 @@
+Mon Nov  9 08:30:54 UTC 2020 - Ignaz Forster <[email protected]>
+
+- Version 2.38.3
+  - SELinux: Make synchronisation work for both pre-SELinux
+    snapshots and later snapshots; SELinux support should be ready
+    for most tasks now.
+
+-------------------------------------------------------------------

Old:
----
  transactional-update-2.28.2.tar.gz

New:
----
  transactional-update-2.28.3.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.T21K03/_old  2020-11-12 22:37:43.594037497 +0100
+++ /var/tmp/diff_new_pack.T21K03/_new  2020-11-12 22:37:43.598037501 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           transactional-update
-Version:        2.28.2
+Version:        2.28.3
 Release:        0
 Summary:        Transactional Updates with btrfs and snapshots
 License:        GPL-2.0-or-later

++++++ transactional-update-2.28.2.tar.gz -> transactional-update-2.28.3.tar.gz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/transactional-update-2.28.2/NEWS 
new/transactional-update-2.28.3/NEWS
--- old/transactional-update-2.28.2/NEWS        2020-10-30 09:44:34.000000000 
+0100
+++ new/transactional-update-2.28.3/NEWS        2020-11-09 09:29:18.000000000 
+0100
@@ -2,6 +2,10 @@
 
 Copyright (C) 2016-2020 Thorsten Kukuk, Ignaz Forster et al.
 
+Version 2.28.3
+* SELinux: Make synchronisation work for both pre-SELinux snapshots and later
+  snapshots; SELinux support should be ready for most tasks now.
+
 Version 2.28.2
 * SELinux: Exclude security.selinux attribute from rsyncing (again)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/transactional-update-2.28.2/configure.ac 
new/transactional-update-2.28.3/configure.ac
--- old/transactional-update-2.28.2/configure.ac        2020-10-30 
09:44:34.000000000 +0100
+++ new/transactional-update-2.28.3/configure.ac        2020-11-09 
09:29:18.000000000 +0100
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 2.28.2)
+AC_INIT(transactional-update, 2.28.3)
 AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/transactional-update-2.28.2/sbin/transactional-update.in 
new/transactional-update-2.28.3/sbin/transactional-update.in
--- old/transactional-update-2.28.2/sbin/transactional-update.in        
2020-10-30 09:44:34.000000000 +0100
+++ new/transactional-update-2.28.3/sbin/transactional-update.in        
2020-11-09 09:29:18.000000000 +0100
@@ -301,7 +301,7 @@
        # /etc may do so. Changes in /etc may be applied immediately,
        # so merge them back into the running system.
        log_info "Merging overlay directory ${SNAPSHOT_DIR}/etc into /etc..."
-       rsync --archive --inplace --xattrs --filter='-x security.selinux' 
--acls --exclude 'fstab' --delete --quiet "${SNAPSHOT_DIR}/etc/" /etc
+       rsync --archive --inplace --xattrs --acls --exclude 'fstab' --delete 
--quiet "${SNAPSHOT_DIR}/etc/" /etc
 
        quit 0
     fi
@@ -495,7 +495,7 @@
 
 # Sync /etc mount contents to target directory
 sync_etc() {
-    local mount_opts overlay_id
+    local mount_opts overlay_id rsync_extra_args
 
     get_etc_overlay_from "$1"
 
@@ -511,7 +511,14 @@
        quit 1
     fi
 
-    rsync --archive --inplace --xattrs --filter='-x security.selinux' --acls 
--delete --quiet "${ETC_OVERLAY_DIR}" "$2"
+    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled ; then
+       # Ignore the SELinux attributes when synchronizing pre-SELinux files,
+       # rsync will fail otherwise
+       if [ "$(ls --directory --context "${ETC_OVERLAY_DIR}" | cut -d ' ' -f 1 
| cut -d ':' -f 3)" == "unlabeled_t" ]; then
+           rsync_extra_args=("--filter=-x security.selinux")
+       fi
+    fi
+    rsync --archive --inplace --xattrs "${rsync_extra_args[@]}" --acls 
--delete --quiet "${ETC_OVERLAY_DIR}" "$2"
     if [ $? -ne 0 ]; then
        log_error "ERROR: syncing $1 into snapshot $2 failed!"
        quit 1
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/[email protected]

Reply via email to