Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package compat-usrmerge for openSUSE:Factory
checked in at 2026-11-08 19:21:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compat-usrmerge (Old)
and /work/SRC/openSUSE:Factory/.compat-usrmerge.new.3759290 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compat-usrmerge"
Sun Nov 8 19:21:31 2026 rev:6 rq:1395820 version:84.87
Changes:
--------
--- /work/SRC/openSUSE:Factory/compat-usrmerge/compat-usrmerge.changes
2021-10-18 21:58:13.737921551 +0200
+++
/work/SRC/openSUSE:Factory/.compat-usrmerge.new.3759290/compat-usrmerge.changes
2026-11-08 19:21:58.954873056 +0100
@@ -1,0 +2,12 @@
+Wed Nov 4 15:49:11 UTC 2026 - Tomáš Chvátal <[email protected]>
+
+- Install usrmerge.attr non-executable, it is a fileattr definition
+ and not a script
+- Fix typo in the main package description
+- Build the build subpackage as noarch, its fileattr script and
+ bin/sbin dependency data are architecture-independent
+- Replace unbounded strcpy/stpcpy calls in usrmergecheck with
+ snprintf
+- Run spec-cleaner in full mode
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compat-usrmerge.spec ++++++
--- /var/tmp/diff_new_pack.Duee3e/_old 2026-11-08 19:21:59.688903421 +0100
+++ /var/tmp/diff_new_pack.Duee3e/_new 2026-11-08 19:21:59.689903462 +0100
@@ -17,7 +17,6 @@
%define nvr %{name}-%{version}-%{release}
-
Name: compat-usrmerge
Version: 84.87
Release: 0
@@ -36,11 +35,12 @@
Source7: usrmergefiles.py
BuildRequires: gcc
BuildRequires: glibc-static
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(rpm)
%description
Scripts and data files related to UsrMerge
-(https://en.opensuse.org/openSUSE:Usr_merge). Normally not needd.
+(https://en.opensuse.org/openSUSE:Usr_merge). Normally not needed.
%package tools
Summary: UsrMerge tools
@@ -59,6 +59,7 @@
%package build
Summary: UsrMerge build tools
Requires: lua
+BuildArch: noarch
%description build
Build tools related to UsrMerge. This is required for rpmbuild to
@@ -66,11 +67,11 @@
binaries in /(s)bin.
%prep
-%setup -qcT
+%setup -q -cT
%build
-gcc -Wall %optflags -o usrmergecheck %{SOURCE2} `pkg-config --libs rpm`
-gcc -Wall %optflags -static -o xmv %{SOURCE4}
+gcc -Wall %{optflags} -o usrmergecheck %{SOURCE2} `pkg-config --libs rpm`
+gcc -Wall %{optflags} -static -o xmv %{SOURCE4}
%install
install -D -m755 usrmergecheck %{buildroot}%{_bindir}/usrmergecheck
@@ -79,7 +80,7 @@
install -m644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/lua
install -D -m755 %{SOURCE3} %{buildroot}%{_libexecdir}/convertfs
install -m755 xmv %{buildroot}%{_libexecdir}/xmv
-install -D -m755 %{SOURCE5} %{buildroot}%{_fileattrsdir}/usrmerge.attr
+install -D -m644 %{SOURCE5} %{buildroot}%{_fileattrsdir}/usrmerge.attr
install -m644 %{SOURCE6} %{buildroot}%{_rpmconfigdir}/lua
###
mkdir -p %{buildroot}/lib
@@ -89,7 +90,7 @@
done <<EOF
/%{_lib}/libc-`rpm -q --qf "%%{version}" glibc`.so
/%{_lib}/libc.so.6
-%ifarch %arm
+%ifarch %{arm}
%ifarch armv6hl armv7hl
/%{_lib}/ld-linux-armhf.so.3
/%{_lib}/ld-linux.so.3
@@ -116,7 +117,7 @@
%ifarch x86_64
/%{_lib}/ld-linux-x86-64.so.2
%endif
-%ifarch %ix86 %sparc
+%ifarch %{ix86} %{sparc}
/%{_lib}/ld-linux.so.2
%endif
%ifarch aarch64
++++++ usrmergecheck.c ++++++
--- /var/tmp/diff_new_pack.Duee3e/_old 2026-11-08 19:21:59.807908344 +0100
+++ /var/tmp/diff_new_pack.Duee3e/_new 2026-11-08 19:21:59.812908551 +0100
@@ -165,7 +165,7 @@
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
- stpcpy(stpcpy(stpcpy(p, dir), "/"), d->d_name);
+ snprintf(p, sizeof(p), "%s/%s", dir, d->d_name);
failed += check_entry(p);
}
@@ -213,7 +213,7 @@
int rpm_findusrfile(rpmts ts, Header hdr, rpmfi orig_fi)
{
char fn[PATH_MAX] = "/usr";
- strcpy(fn+strlen(fn), rpmfiFN(orig_fi));
+ snprintf(fn, sizeof(fn), "/usr%s", rpmfiFN(orig_fi));
rpmdbMatchIterator mi = rpmtsInitIterator(ts, RPMDBI_INSTFILENAMES, fn,
0);
if (mi) {
@@ -296,7 +296,7 @@
// an optimization so we don't
have to check hundreds
// of kernel modules. If the
file at hand is a directory
// and does not exist in /usr
we can just skip the rest.
- strcpy(skipdir, rpmfiFN(fi));
+ snprintf(skipdir,
sizeof(skipdir), "%s", rpmfiFN(fi));
}
break;
}
