diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..d87f5613ec4234f82f8eaeebc563711f587fdf88 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..2558a3763968a7da60f4a9c538feb827c23807b5 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/firebird diff --git a/Firebird-4.0.5.3140-0.tar.xz b/Firebird-4.0.5.3140-0.tar.xz index 9c3c712b209d133eeed5b3f6e145a876e94598e6..6acdc81fa54145d2c44181976ad3d95814de704d 100644 Binary files a/Firebird-4.0.5.3140-0.tar.xz and b/Firebird-4.0.5.3140-0.tar.xz differ diff --git a/firebird.spec b/firebird.spec index b19b9592b08c2237f25b88acc7c3458999ac6f85..fea698101c3ed7f7e08ea4f83eddf6569224014d 100644 --- a/firebird.spec +++ b/firebird.spec @@ -8,7 +8,7 @@ Name: firebird Version: %{ver}.%{rev} -Release: 1 +Release: 2 Summary: SQL relational database management system License: Interbase-1.0 @@ -18,6 +18,7 @@ Source0: https://github.com/FirebirdSQL/firebird/releases/download/v%{ver Source1: firebird-logrotate Source2: firebird.service Source3: fb_config +Source4: firebird.sysusers.conf Patch0000: add-pkgconfig-files.patch Patch0001: no-copy-from-icu.patch @@ -46,10 +47,7 @@ BuildRequires: libtomcrypt-devel BuildRequires: unzip BuildRequires: sed -Requires(postun): /usr/sbin/userdel -Requires(postun): /usr/sbin/groupdel -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd +%{?sysusers_requires_compat} %{?systemd_requires} Recommends: logrotate Requires: libfbclient2 = %{version}-%{release} @@ -192,6 +190,7 @@ chmod u+rw,a+rx gen/buildroot/%{_includedir}/firebird/impl cp -r gen/buildroot/* ${RPM_BUILD_ROOT}/ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/ +install -m0644 -D %{S:4} %{buildroot}%{_sysusersdir}/firebird.conf cd ${RPM_BUILD_ROOT} rm -vf .%{_sbindir}/*.sh @@ -219,10 +218,9 @@ mkdir -p .%{_unitdir} cp -f %{SOURCE2} .%{_unitdir}/%{name}.service -%pre +%pre # Create the firebird group if it doesn't exist -getent group %{name} > /dev/null || /usr/sbin/groupadd -r %{name} -getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /sbin/nologin -r %{name} +%sysusers_create_compat %{S:4} # Add gds_db to /etc/services if needed FileName=/etc/services @@ -279,6 +277,7 @@ fi %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %attr(0644,root,root) %{_unitdir}/%{name}.service +%{_sysusersdir}/firebird.conf %files devel @@ -321,6 +320,9 @@ fi %{_bindir}/gsplit %changelog +* Sat Apr 26 2025 Funda Wang - 4.0.5.3140-2 +- change user and group creation to systemd style (recognized by rpm 4.20) + * Thu Oct 10 2024 Funda Wang - 4.0.5.3140-1 - Update to 4.0.5 diff --git a/firebird.sysusers.conf b/firebird.sysusers.conf new file mode 100644 index 0000000000000000000000000000000000000000..ba49b514cb34b2140ebb37f7701ea470072f7d23 --- /dev/null +++ b/firebird.sysusers.conf @@ -0,0 +1 @@ +u firebird - - - -