Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

.gitignore

@@ -1 +1,2 @@
 sqlgrey-1.7.6.tar.bz2
+/sqlgrey-1.8.0.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: sqlgrey
-# $Id$
-NAME := sqlgrey
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-1e7e5e3ed5f02b29f71ef4e26edc1c36  sqlgrey-1.7.6.tar.bz2
+de9c6d0740fd2589d4e353e76c40e2c7  sqlgrey-1.8.0.tar.gz

sqlgrey-1.7.4-sqlite.patch

@@ -6,7 +6,7 @@
  # db_type = Pg
 +db_type = SQLite
  # db_name = sqlgrey
-+db_name = sqlgrey.db
++db_name = /var/lib/sqlgrey/sqlgrey.db
  # Note: the following are not used with SQLite
  # db_host = localhost
  # db_port = default

sqlgrey.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=SQLgrey Postfix Grey-listing Policy service
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/sqlgrey.pid
+ExecStart=/usr/sbin/sqlgrey -d
+
+[Install]
+WantedBy=multi-user.target

sqlgrey.spec

@@ -1,24 +1,26 @@
 Name:           sqlgrey
-Version:        1.7.6
-Release:        3%{?dist}
+Version:        1.8.0
+Release:        33%{?dist}
 Summary:        Postfix grey-listing policy service
-Group:          System Environment/Daemons
-License:        GPLv2+
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:        GPL-2.0-or-later
 URL:            http://sqlgrey.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sqlgrey/sqlgrey-%{version}.tar.bz2
-Source1:        sqlgrey.init
+Source0:        http://dl.sourceforge.net/sqlgrey/sqlgrey-%{version}.tar.gz
+Source1:        sqlgrey.service
 Patch0:         sqlgrey-1.7.4-sqlite.patch
 Patch1:         sqlgrey-1.7.4-warnings.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Requires:               postfix
 Requires:               perl(DBD::SQLite)
-Requires(post):         /sbin/chkconfig
-Requires(post):         /sbin/service
-Requires(preun):        /sbin/chkconfig
-Requires(preun):        /sbin/service
-Requires(postun):       /sbin/service
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: make
+BuildRequires: systemd
+BuildRequires: perl-generators
+BuildRequires: perl-Pod-Perldoc
+BuildRequires: perl-podlators
 
 %description
 SQLgrey is a Postfix grey-listing policy service with auto-white-listing
@@ -28,29 +30,33 @@ to 90% of junk mails (spam and virus) before they reach your Postfix server
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+
+# Create a sysusers.d config file
+cat >sqlgrey.sysusers.conf <<EOF
+u sqlgrey - 'SQLgrey server' /var/lib/sqlgrey -
+EOF
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make rh-install ROOTDIR=$RPM_BUILD_ROOT
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/sqlgrey
+make rh-install ROOTDIR=$RPM_BUILD_ROOT SBINDIR=$RPM_BUILD_ROOT/usr/bin
+install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/sqlgrey.service
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_var}/lib
 mkdir -m 750 $RPM_BUILD_ROOT%{_var}/lib/sqlgrey
 touch $RPM_BUILD_ROOT%{_var}/lib/sqlgrey/sqlgrey.db
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m0644 -D sqlgrey.sysusers.conf %{buildroot}%{_sysusersdir}/sqlgrey.conf
 
 %files
-%defattr(-,root,root,-)
 %doc Changelog CONTRIB COPYING FAQ HOWTO README* TODO
-%{_sysconfdir}/init.d/sqlgrey
-%{_sbindir}/sqlgrey
-%{_sbindir}/update_sqlgrey_config
+%{_unitdir}/sqlgrey.service
+%{_bindir}/sqlgrey
+%{_bindir}/update_sqlgrey_config
 %{_bindir}/sqlgrey-logstats.pl
 %{_mandir}/man1/sqlgrey.1*
 %attr(-,sqlgrey,sqlgrey) %dir %{_var}/lib/sqlgrey
@@ -63,25 +69,127 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/sqlgrey/*.regexp
 # Warning admins to not touch the above files
 %attr(644,root,root) %config %{_sysconfdir}/sqlgrey/README
+%{_sysusersdir}/sqlgrey.conf
 
-%pre
-if ! id sqlgrey &>/dev/null ; then
-    /usr/sbin/groupadd -r sqlgrey || :
-    /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/sqlgrey -M \
-        -c 'SQLgrey Server' -g sqlgrey sqlgrey || :
-fi
 
 %post
-/sbin/chkconfig --add sqlgrey || :
-/sbin/service sqlgrey condrestart || :
+%systemd_post sqlgrey.service
 
 %preun
-if [ "$1" -eq 0 ]; then
-    /sbin/service sqlgrey stop || :
-    /sbin/chkconfig --del sqlgrey || :
-fi
+%systemd_preun sqlgrey.service
+
+%postun
+%systemd_postun_with_restart sqlgrey.service
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.8.0-32
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Sat Feb 08 2025 Kevin Fenzi <kevin@scrye.com> - 1.8.0-31
+- Adjust to sbin/bin consolidation. Fixes FTBFS rhbz#2341376
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.8.0-29
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.8.0-21
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun Feb 07 2016 Kevin Fenzi <kevin@scrye.com> - 1.8.0-11
+- Add BuildRequires for perldoc and pod2man. Fixes FTBFS.
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Nov 18 2014 Kevin Fenzi <kevin@scrye.com> 1.8.0-8
+- Moderize spec file. Fixes bug #850325
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.8.0-5
+- Perl 5.18 rebuild
+- Build-require systemd-units
+
+* Mon Feb 25 2013 Tom Callaway <spot@fedoraproject.org> - 1.8.0-4
+- Specify SQLite database by absolute path (Bojan Smojver)
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Apr 17 2012 Jon Ciesla <limburgher@gmail.com> - 1.8.0-1
+- Latest upstream.
+- Migrate to ssytemd, BZ 722356.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -175,7 +283,7 @@ fi
 - IPv6 support
 - Optin/optout support
 
-* Tue Apr 25 2005 Lionel Bouton <lionel-dev@bouton.name>
+* Mon Apr 25 2005 Lionel Bouton <lionel-dev@bouton.name>
 - 1.5.5 release
 - small fix for SRS (again!)
 - small fix for deverp code