commit btrfsmaintenance for openSUSE:Factory

26 Sep 2018

Hello community,

here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2018-09-26 14:23:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old)
 and      /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "btrfsmaintenance"

Wed Sep 26 14:23:29 2018 rev:19 rq:638213 version:0.4.2

Changes:
--------

--- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes	2018-05-16 11:44:03.146929174 +0200
+++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes	2018-09-26 14:23:31.941911238 +0200
@@ -1,0 +2,9 @@
+Tue Sep 25 00:00:00 CEST 2018 - dsterba@suse.cz
+
+- update to version 0.4.2
+  - CVE-2018-14722: expand auto mountpoints in a safe way
+  - btrfs-defrag: fix missing function to detect btrfs filesystems (#52)
+  - btrfs-trim: more verbose fstrim output (#60)
+  - dist-install: print information about timer unit installation (#58)
+
+-------------------------------------------------------------------

Old:
----
  btrfsmaintenance-0.4.1.tar.bz2

New:
----
  btrfsmaintenance-0.4.2.tar.bz2

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

Other differences:
------------------
++++++ btrfsmaintenance.spec ++++++
--- /var/tmp/diff_new_pack.QWHrmH/_old	2018-09-26 14:23:32.525910308 +0200
+++ /var/tmp/diff_new_pack.QWHrmH/_new	2018-09-26 14:23:32.529910302 +0200
@@ -22,7 +22,7 @@
 %endif
 
 Name:           btrfsmaintenance
-Version:        0.4.1
+Version:        0.4.2
 Release:        0
 Summary:        Scripts for btrfs periodic maintenance tasks
 License:        GPL-2.0-only

++++++ btrfsmaintenance-0.4.1.tar.bz2 -> btrfsmaintenance-0.4.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-balance.sh new/btrfsmaintenance-0.4.2/btrfs-balance.sh
--- old/btrfsmaintenance-0.4.1/btrfs-balance.sh	2018-03-15 18:49:36.413244400 +0100
+++ new/btrfsmaintenance-0.4.2/btrfs-balance.sh	2018-09-25 16:07:15.938261172 +0200
@@ -18,7 +18,7 @@
 . $(dirname $(realpath "$0"))/btrfsmaintenance-functions
 
 {
-evaluate_auto_mountpoint BTRFS_BALANCE_MOUNTPOINTS
+BTRFS_BALANCE_MOUNTPOINTS=$(expand_auto_mountpoint "$BTRFS_BALANCE_MOUNTPOINTS")
 OIFS="$IFS"
 IFS=:
 exec 2>&1 # redirect stderr to stdout to catch all output to log destination
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-defrag.sh new/btrfsmaintenance-0.4.2/btrfs-defrag.sh
--- old/btrfsmaintenance-0.4.1/btrfs-defrag.sh	2018-03-15 18:49:36.413244400 +0100
+++ new/btrfsmaintenance-0.4.2/btrfs-defrag.sh	2018-09-25 16:07:15.938261172 +0200
@@ -15,6 +15,7 @@
 fi
 
 LOGIDENTIFIER='btrfs-defrag'
+. $(dirname $(realpath "$0"))/btrfsmaintenance-functions
 
 {
 OIFS="$IFS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-scrub.sh new/btrfsmaintenance-0.4.2/btrfs-scrub.sh
--- old/btrfsmaintenance-0.4.1/btrfs-scrub.sh	2018-03-15 18:49:36.413244400 +0100
+++ new/btrfsmaintenance-0.4.2/btrfs-scrub.sh	2018-09-25 16:07:15.938261172 +0200
@@ -29,7 +29,7 @@
 fi
 
 {
-evaluate_auto_mountpoint BTRFS_SCRUB_MOUNTPOINTS
+BTRFS_SCRUB_MOUNTPOINTS=$(expand_auto_mountpoint "$BTRFS_SCRUB_MOUNTPOINTS")
 OIFS="$IFS"
 IFS=:
 exec 2>&1 # redirect stderr to stdout to catch all output to log destination
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-trim.sh new/btrfsmaintenance-0.4.2/btrfs-trim.sh
--- old/btrfsmaintenance-0.4.1/btrfs-trim.sh	2018-03-15 18:49:36.413244400 +0100
+++ new/btrfsmaintenance-0.4.2/btrfs-trim.sh	2018-09-25 16:07:15.942261161 +0200
@@ -18,7 +18,7 @@
 . $(dirname $(realpath "$0"))/btrfsmaintenance-functions
 
 {
-evaluate_auto_mountpoint BTRFS_TRIM_MOUNTPOINTS
+BTRFS_TRIM_MOUNTPOINTS=$(expand_auto_mountpoint "$BTRFS_TRIM_MOUNTPOINTS")
 OIFS="$IFS"
 IFS=:
 exec 2>&1 # redirect stderr to stdout to catch all output to log destination
@@ -29,7 +29,7 @@
 		continue
 	fi
 	echo "Running fstrim on $MNT"
-	fstrim "$MNT"
+	fstrim --verbose "$MNT"
 done
 
 } | \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfsmaintenance-functions new/btrfsmaintenance-0.4.2/btrfsmaintenance-functions
--- old/btrfsmaintenance-0.4.1/btrfsmaintenance-functions	2018-03-15 18:49:36.433244400 +0100
+++ new/btrfsmaintenance-0.4.2/btrfsmaintenance-functions	2018-09-25 16:07:15.982261063 +0200
@@ -3,23 +3,24 @@
 # this file contains common code for the btrfs maintenance scripts
 #
 
-# function: evaluate_auto_mountpoint
-# parameter: A variable name
+# function: expand_auto_mountpoint
+# parameter: path list from config variable or 'auto'
 #
-# this function checks whether the variable contains the special keyword "auto"
-# if yes, all currently mounted btrfs filesystems are evaluated and their mountpoints
-# are put into the parameter variable
-evaluate_auto_mountpoint() {
-	MOUNTPOINTSVAR=\$"$1"
-	if [ "$(eval expr \"$MOUNTPOINTSVAR\")" = "auto" ]; then
+# if the parameter is 'auto', this function prints path list of all btrfs
+# mountpoints, otherwise prints the parameter unchanged
+expand_auto_mountpoint() {
+	local MNTLIST="$1"
+
+	if [ "$MNTLIST" = "auto" ]; then
 		local BTRFS_DEVICES=""
 		local DEVICE=""
 		local MNT=""
-		local MNTLIST=""
+
 		# find all mounted btrfs filesystems, print their device nodes, sort them
 		# and remove identical entries
 		BTRFS_DEVICES=$(findmnt --types btrfs --output "SOURCE" --nofsroot --noheading | sort | uniq)
 		# find one (and only one) corresponding mountpoint for each btrfs device node
+		MNTLIST=""
 		for DEVICE in $BTRFS_DEVICES; do
 			MNT=$(findmnt --types btrfs --first-only --noheadings --output "TARGET" --source "$DEVICE")
 			if [ -n "$MNTLIST" ]; then
@@ -28,9 +29,8 @@
 				MNTLIST="$MNT"
 			fi
 		done
-		echo "evaluate mounted filesystems: $MNTLIST"
-		eval "$1=$MNTLIST"
 	fi
+	echo -n "$MNTLIST"
 }
 
 # function: detect_mixed_bg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/dist-install.sh new/btrfsmaintenance-0.4.2/dist-install.sh
--- old/btrfsmaintenance-0.4.1/dist-install.sh	2018-03-15 18:49:36.413244400 +0100
+++ new/btrfsmaintenance-0.4.2/dist-install.sh	2018-09-25 16:07:15.942261161 +0200
@@ -29,5 +29,10 @@
 install -oroot -groot -m644 btrfsmaintenance-functions /usr/share/btrfsmaintenance/
 
 echo "Installation path: $sysconfdir"
-echo "Now edit cron periods and mount points in $sysconfdir/btrfsmaintenance then run ./btrfsmaintenance-refresh-cron.sh to update cron symlinks
-"
+echo "For cron-based setups:"
+echo "- edit cron periods and mount points in $sysconfdir/btrfsmaintenance"
+echo "- run ./btrfsmaintenance-refresh-cron.sh to update cron symlinks"
+echo ""
+echo "For systemd.timer-based setups:"
+echo "- copy *.timer files to the systemd.unit path (eg. /usr/lib/systemd/system/ or /etc/systemd/system)"
+echo "- run './btrfsmaintenance-refresh-cron.sh timer' to enable and schedule the timers"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/sysconfig.btrfsmaintenance new/btrfsmaintenance-0.4.2/sysconfig.btrfsmaintenance
--- old/btrfsmaintenance-0.4.1/sysconfig.btrfsmaintenance	2018-03-15 18:49:36.425244400 +0100
+++ new/btrfsmaintenance-0.4.2/sysconfig.btrfsmaintenance	2018-09-25 16:07:15.974261082 +0200
@@ -38,7 +38,8 @@
 # Which mountpoints/filesystems to balance periodically. This may reclaim unused
 # portions of the filesystem and make the rest more compact.
 # (Colon separated paths)
-# The special word/mountpoint "auto" will evaluate all mounted btrfs filesystems at runtime
+# The special word/mountpoint "auto" will evaluate all mounted btrfs
+# filesystems
 BTRFS_BALANCE_MOUNTPOINTS="/"
 
 ## Path:           System/File systems/btrfs
@@ -78,7 +79,8 @@
 #
 # Which mountpoints/filesystems to scrub periodically.
 # (Colon separated paths)
-# The special word/mountpoint "auto" will evaluate all mounted btrfs filesystems at runtime
+# The special word/mountpoint "auto" will evaluate all mounted btrfs
+# filesystems
 BTRFS_SCRUB_MOUNTPOINTS="/"
 
 ## Path:        System/File systems/btrfs
@@ -122,5 +124,6 @@
 #
 # Which mountpoints/filesystems to trim periodically.
 # (Colon separated paths)
-# The special word/mountpoint "auto" will evaluate all mounted btrfs filesystems at runtime
+# The special word/mountpoint "auto" will evaluate all mounted btrfs
+# filesystems
 BTRFS_TRIM_MOUNTPOINTS="/"

    

root

tags

participants (1)