Merge pull request openSUSE#981 from aschnell/master

- avoid build dependency e2fsprogs-devel

.github/workflows/ci-debian.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: apt-get update && apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl e2fslibs-dev g++ gettext libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev locales-all make ncurses-dev xsltproc xz-utils
+      run: apt-get update && apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl g++ gettext libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev locales-all make ncurses-dev xsltproc xz-utils
 
     - name: List installed packages
       run: apt list --installed | sort

.github/workflows/ci-fedora.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: dnf -y install acl autoconf automake boost-devel btrfs-progs-devel dbus-devel diffutils docbook-style-xsl e2fsprogs-devel gcc-c++ gettext glibc-langpack-de glibc-langpack-fr glibc-langpack-en json-c-devel libacl-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz
+      run: dnf -y install acl autoconf automake boost-devel btrfs-progs-devel dbus-devel diffutils docbook-style-xsl gcc-c++ gettext glibc-langpack-de glibc-langpack-fr glibc-langpack-en json-c-devel libacl-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz
 
     - name: List installed packages
       run: rpm -qa | sort

.github/workflows/ci-leap.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets e2fsprogs-devel gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
+      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
 
     - name: List installed packages
       run: rpm -qa | sort

.github/workflows/ci-tumbleweed.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets e2fsprogs-devel gcc-c++ gettext-runtime glibc-locale libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
+      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
 
     - name: List installed packages
       run: rpm -qa | sort

.github/workflows/ci-ubuntu.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl e2fslibs-dev g++ gettext language-pack-de language-pack-fr language-pack-en libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev make ncurses-dev xsltproc xz-utils
+      run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl g++ gettext language-pack-de language-pack-fr language-pack-en libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev make ncurses-dev xsltproc xz-utils
 
     - name: List installed packages
       run: apt list --installed | sort

client/mksubvolume/mksubvolume.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2015-2020] SUSE LLC
+ * Copyright (c) [2015-2025] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ext2fs/ext2_fs.h>
+#include <linux/fs.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
@@ -285,16 +285,16 @@ do_set_cow_flag()
 
     unsigned long flags = 0;
 
-    if (ioctl(fd, EXT2_IOC_GETFLAGS, &flags) == -1)
-	throw runtime_error_with_errno("ioctl(EXT2_IOC_GETFLAGS) failed", errno);
+    if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
+	throw runtime_error_with_errno("ioctl(FS_IOC_GETFLAGS) failed", errno);
 
     if (set_nocow)
 	flags |= FS_NOCOW_FL;
     else
 	flags &= ~FS_NOCOW_FL;
 
-    if (ioctl(fd, EXT2_IOC_SETFLAGS, &flags) == -1)
-	throw runtime_error_with_errno("ioctl(EXT2_IOC_SETFLAGS) failed", errno);
+    if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == -1)
+	throw runtime_error_with_errno("ioctl(FS_IOC_SETFLAGS) failed", errno);
 }
 
 

package/snapper.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 17 07:07:43 CET 2025 - [email protected]
+
+- avoid build dependency e2fsprogs-devel
+
 -------------------------------------------------------------------
 Tue Dec 17 09:14:46 CET 2024 - [email protected]
 

snapper.spec.in

@@ -53,7 +53,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  libacl-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
-BuildRequires:  e2fsprogs-devel
 BuildRequires:  ncurses-devel
 %if 0%{?suse_version}
 BuildRequires:  libbtrfs-devel