From d3216144c5ac72585e055c34ffc08e9a73084c7a Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Tue, 26 Feb 2013 12:02:53 -0800 Subject: Update to 2.8.0-3 --- opendkim.spec | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 1664367..8fcf057 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -1,31 +1,31 @@ -# Copyright (c) 2010, 2011, The OpenDKIM Project. -# -# $Id: opendkim.spec.in,v 1.2 2010/10/25 17:13:47 cm-msk Exp $ +# systemd-compatible version Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons Requires: lib%{name} = %{version}-%{release} Requires (pre): shadow-utils + +# Uncomment for systemd version Requires (post): systemd-units Requires (preun): systemd-units Requires (postun): systemd-units -# This is actually needed for the %triggerun script but Requires(triggerun) -# is not valid. We can use %post because this particular %triggerun script -# should fire just after this package is installed. Requires (post): systemd-sysv +# Uncomment for SystemV version +#Requires (post): chkconfig +#Requires (preun): chkconfig, initscripts +#Requires (postun): initscripts + BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: sendmail-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Source1: %{name}.service -#Source2: %{name}-default-keygen BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -82,9 +82,9 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} install -d %{buildroot}%{_sysconfdir} install -d %{buildroot}%{_sysconfdir}/sysconfig install -d %{buildroot}%{_initrddir} -install -d -m 0755 %{buildroot}/%{_unitdir} +install -d -m 0755 %{buildroot}%{_unitdir} +install -m 0644 contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service install -m 0755 contrib/init/redhat/%{name} %{buildroot}%{_initrddir}/%{name} -install -m 0644 contrib/systemd/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindir}/%{name}-default-keygen cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF' @@ -263,7 +263,6 @@ getent passwd %{name} >/dev/null || \ exit 0 %post -#%systemd_post %{name}.service if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable %{name}.service >/dev/null 2>&1 || : @@ -273,7 +272,6 @@ fi /sbin/chkconfig --add %{name} || : %preun -#%systemd_preun %{name}.service if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || : @@ -288,7 +286,6 @@ fi exit 0 %postun -#%systemd_postun_with_restart %{name}.service /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall @@ -341,7 +338,6 @@ rm -rf %{buildroot} %files sysvinit %defattr(-,root,root) -#%{_initrddir}/%{name} %attr(0755,root,root) %{_initrddir}/%{name} %files -n libopendkim @@ -361,7 +357,13 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog -* Thu Feb 25 2013 Steve Jenkins 2.8.0-2 +* Tue Feb 26 2013 Steve Jenkins 2.8.0-3 +- Split into two spec files: systemd (F17+) and SysV (EL5-6) +- Removed leading / from unitdir variables +- Removed commented source lines +- Created comment sections for easy switching between systemd and SysV + +* Mon Feb 25 2013 Steve Jenkins 2.8.0-2 - Added / in front of unitdir variables * Thu Feb 21 2013 Steve Jenkins 2.8.0-1 -- cgit From 79471cffb71bd2e29ebbdc99fb89f673aad78778 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 27 Feb 2013 18:11:49 -0800 Subject: Update to 2.8.0-4 --- .gitignore | 1 + opendkim.spec | 8 +++++++- sources | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 288b362..a7d4e32 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /opendkim-2.7.3.tar.gz /opendkim-2.7.4.tar.gz /opendkim-2.8.0.tar.gz +/opendkim-libdb.patch diff --git a/opendkim.spec b/opendkim.spec index 8fcf057..5ee9f11 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -3,7 +3,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -27,6 +27,8 @@ BuildRequires: sendmail-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-libdb.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -69,6 +71,7 @@ It is not required when the init system used is systemd. %prep %setup -q +%patch0 -p1 %build %configure @@ -357,6 +360,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Wed Feb 27 2013 Steve Jenkins 2.8.0-4 +- Added patch from upstream to fix libdb compatibility issues + * Tue Feb 26 2013 Steve Jenkins 2.8.0-3 - Split into two spec files: systemd (F17+) and SysV (EL5-6) - Removed leading / from unitdir variables diff --git a/sources b/sources index 582f9e8..c85d238 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 53bd811c6577235bd008f632e7f63dae opendkim-2.8.0.tar.gz +d11b1192df608e952b6d47b84908652d opendkim-libdb.patch -- cgit From 09e63fc60e7a181c5b44caeb32811e60ba9eb8c1 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Tue, 19 Mar 2013 12:02:09 -0700 Subject: Update to 2.8.1-1 --- .gitignore | 1 + opendkim.spec | 12 ++++++++---- sources | 3 +-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a7d4e32..e359a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /opendkim-2.7.4.tar.gz /opendkim-2.8.0.tar.gz /opendkim-libdb.patch +/opendkim-2.8.1.tar.gz diff --git a/opendkim.spec b/opendkim.spec index 5ee9f11..3e427ef 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -2,8 +2,8 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.8.0 -Release: 4%{?dist} +Version: 2.8.1 +Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -27,7 +27,7 @@ BuildRequires: sendmail-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-libdb.patch +#Patch0: %{name}-libdb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,7 +71,7 @@ It is not required when the init system used is systemd. %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure @@ -360,6 +360,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 19 2013 Steve Jenkins 2.8.1-1 +- Updated to use newer upstream 2.8.1 source code +- Removed patches for bugs fixed in upstream source + * Wed Feb 27 2013 Steve Jenkins 2.8.0-4 - Added patch from upstream to fix libdb compatibility issues diff --git a/sources b/sources index c85d238..d92d4eb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -53bd811c6577235bd008f632e7f63dae opendkim-2.8.0.tar.gz -d11b1192df608e952b6d47b84908652d opendkim-libdb.patch +6c9810e343414f49ad7fee313f02a0a7 opendkim-2.8.1.tar.gz -- cgit From 424055a30307e7c36e4d99ce418a3cbb5cd377e3 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Fri, 29 Mar 2013 15:40:56 -0700 Subject: Update to 2.8.2 --- .gitignore | 1 + opendkim.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e359a7b..0bc25bd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /opendkim-2.8.0.tar.gz /opendkim-libdb.patch /opendkim-2.8.1.tar.gz +/opendkim-2.8.2.tar.gz diff --git a/opendkim.spec b/opendkim.spec index 3e427ef..a435c28 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -2,7 +2,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.8.1 +Version: 2.8.2 Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ @@ -360,6 +360,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Fri Apr 29 2013 Steve Jenkins 2.8.2-1 +- Updated to use newer upstream 2.8.2 source code + * Tue Mar 19 2013 Steve Jenkins 2.8.1-1 - Updated to use newer upstream 2.8.1 source code - Removed patches for bugs fixed in upstream source diff --git a/sources b/sources index d92d4eb..26671fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c9810e343414f49ad7fee313f02a0a7 opendkim-2.8.1.tar.gz +62d7b22f3b15049e3692caa28bcc801e opendkim-2.8.2.tar.gz -- cgit From b9cca2485d7853b452ebfc6538cb0848929604d9 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Sun, 12 May 2013 10:37:24 -0700 Subject: Uupdate to 2.8.3-1 --- .gitignore | 1 + opendkim.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0bc25bd..e89b934 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /opendkim-libdb.patch /opendkim-2.8.1.tar.gz /opendkim-2.8.2.tar.gz +/opendkim-2.8.3.tar.gz diff --git a/opendkim.spec b/opendkim.spec index a435c28..46bd54f 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -2,7 +2,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ @@ -24,6 +24,9 @@ Requires (post): systemd-sysv BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: sendmail-devel +BuildRequires: unbound-devel +BuildRequires: libmemcached-devel +BuildRequires: libdb-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -74,7 +77,8 @@ It is not required when the init system used is systemd. #%patch0 -p1 %build -%configure +#%configure --with-unbound --with-libmemcached --with-db --enable-stats +%configure --with-unbound --with-libmemcached --with-db sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -360,6 +364,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 12 2013 Steve Jenkins 2.8.3-1 +- Updated to use newer upstream 2.8.3 source code +- Added unbound, memcached, and db support on configure + * Fri Apr 29 2013 Steve Jenkins 2.8.2-1 - Updated to use newer upstream 2.8.2 source code diff --git a/sources b/sources index 26671fa..454b81f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62d7b22f3b15049e3692caa28bcc801e opendkim-2.8.2.tar.gz +0ae9d37e3221a244eb34c3e0e2d665cc opendkim-2.8.3.tar.gz -- cgit From 3ae95bcd81814bdf87e985989676aedb5009bcc8 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Fri, 17 May 2013 06:45:10 -0700 Subject: Update to 2.8.3-2 --- opendkim.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 46bd54f..ca53db3 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -3,7 +3,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -15,18 +15,19 @@ Requires (post): systemd-units Requires (preun): systemd-units Requires (postun): systemd-units Requires (post): systemd-sysv +BuildRequires: libdb-devel +BuildRequires: libmemcached-devel # Uncomment for SystemV version #Requires (post): chkconfig #Requires (preun): chkconfig, initscripts #Requires (postun): initscripts +#BuildRequires: db4-devel -BuildRequires: openssl-devel BuildRequires: pkgconfig +BuildRequires: openssl-devel BuildRequires: sendmail-devel BuildRequires: unbound-devel -BuildRequires: libmemcached-devel -BuildRequires: libdb-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -77,7 +78,6 @@ It is not required when the init system used is systemd. #%patch0 -p1 %build -#%configure --with-unbound --with-libmemcached --with-db --enable-stats %configure --with-unbound --with-libmemcached --with-db sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -364,9 +364,12 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Fri May 17 2013 Steve Jenkins 2.8.3-2 +- Removed libmemcached support from SysV version (requires > v0.36) + * Sun May 12 2013 Steve Jenkins 2.8.3-1 - Updated to use newer upstream 2.8.3 source code -- Added unbound, memcached, and db support on configure +- Added unbound, libmcached, and db support on configure * Fri Apr 29 2013 Steve Jenkins 2.8.2-1 - Updated to use newer upstream 2.8.2 source code -- cgit From b8d5c7f1ee9851a2329054e89640417f2a419880 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Thu, 18 Jul 2013 04:03:07 +0200 Subject: Perl 5.18 rebuild --- opendkim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendkim.spec b/opendkim.spec index ca53db3..fa9d3c2 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -3,7 +3,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.3 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -364,6 +364,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 18 2013 Petr Pisar - 2.8.3-3 +- Perl 5.18 rebuild + * Fri May 17 2013 Steve Jenkins 2.8.3-2 - Removed libmemcached support from SysV version (requires > v0.36) -- cgit From f9bc0abb4ca1d3a15505bc74da407290eb78b05d Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Tue, 23 Jul 2013 10:46:45 -0700 Subject: Update to 2.8.4-1 --- .gitignore | 1 + opendkim.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e89b934..e9100fa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /opendkim-2.8.1.tar.gz /opendkim-2.8.2.tar.gz /opendkim-2.8.3.tar.gz +/opendkim-2.8.4.tar.gz diff --git a/opendkim.spec b/opendkim.spec index fa9d3c2..2b8558d 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -2,8 +2,8 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.8.3 -Release: 3%{?dist} +Version: 2.8.4 +Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -24,6 +24,7 @@ BuildRequires: libmemcached-devel #Requires (postun): initscripts #BuildRequires: db4-devel +BuildRequires: libbsd BuildRequires: pkgconfig BuildRequires: openssl-devel BuildRequires: sendmail-devel @@ -364,6 +365,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jul 23 2013 Steve Jenkins 2.8.4-1 +- Updated to use newer upstream 2.8.4 source code +- Added libbsd build requirement + * Thu Jul 18 2013 Petr Pisar - 2.8.3-3 - Perl 5.18 rebuild diff --git a/sources b/sources index 454b81f..102d702 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ae9d37e3221a244eb34c3e0e2d665cc opendkim-2.8.3.tar.gz +17f667d022c167c7874a993e928d4a6d opendkim-2.8.4.tar.gz -- cgit From f3383dd20788341329cdc858f08092e2a77b620f Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Sat, 3 Aug 2013 13:39:49 +0200 Subject: Perl 5.18 rebuild --- opendkim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendkim.spec b/opendkim.spec index 2b8558d..0f7951a 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -3,7 +3,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -365,6 +365,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Sat Aug 03 2013 Petr Pisar - 2.8.4-2 +- Perl 5.18 rebuild + * Mon Jul 23 2013 Steve Jenkins 2.8.4-1 - Updated to use newer upstream 2.8.4 source code - Added libbsd build requirement -- cgit From 91fd8f654c6c3419af59935211563dc6d64d24a7 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sun, 3 Nov 2013 14:13:45 +0200 Subject: Fix path to docs in sample config when doc dir is unversioned (#993997). --- opendkim.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 0f7951a..72e9ef0 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -1,9 +1,11 @@ # systemd-compatible version +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -97,7 +99,7 @@ install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindi cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF' ## BASIC OPENDKIM CONFIGURATION FILE -## See %{name}.conf(5) or %{_docdir}/%{name}-%{version}/%{name}.conf.sample for more +## See %{name}.conf(5) or %{_pkgdocdir}/%{name}.conf.sample for more ## BEFORE running OpenDKIM you must: @@ -105,7 +107,7 @@ cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF' ## - generate keys for your domain (if signing) ## - edit your DNS records to publish your public keys (if signing) -## See %{_docdir}/%{name}-%{version}/INSTALL for detailed instructions. +## See %{_pkgdocdir}/INSTALL for detailed instructions. ## CONFIGURATION OPTIONS @@ -365,6 +367,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Sun Nov 3 2013 Ville Skyttä - 2.8.4-3 +- Fix path to docs in sample config when doc dir is unversioned (#993997). + * Sat Aug 03 2013 Petr Pisar - 2.8.4-2 - Perl 5.18 rebuild -- cgit From d08bc750f681db953a711dac00e18a5b29f305ac Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Sun, 3 Nov 2013 10:07:56 -0800 Subject: Update to 2.8.4-4 --- opendkim.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 72e9ef0..fe43215 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.8.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -367,13 +367,16 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog -* Sun Nov 3 2013 Ville Skyttä - 2.8.4-3 +* Sun Nov 3 2013 Steve Jenkins - 2.8.4-4 +- Rebuild of all release packages to sync version numbers + +* Sun Nov 3 2013 Ville Skytta ville.skytta@iki.fi> - 2.8.4-3 - Fix path to docs in sample config when doc dir is unversioned (#993997). * Sat Aug 03 2013 Petr Pisar - 2.8.4-2 - Perl 5.18 rebuild -* Mon Jul 23 2013 Steve Jenkins 2.8.4-1 +* Tue Jul 23 2013 Steve Jenkins 2.8.4-1 - Updated to use newer upstream 2.8.4 source code - Added libbsd build requirement -- cgit From f885847d9a3040937f810a7d994a56331771a581 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 18 Dec 2013 08:24:05 -0800 Subject: Update to 2.9.0-1 --- .gitignore | 1 + opendkim.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e9100fa..0ba1966 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /opendkim-2.8.2.tar.gz /opendkim-2.8.3.tar.gz /opendkim-2.8.4.tar.gz +/opendkim-2.9.0.tar.gz diff --git a/opendkim.spec b/opendkim.spec index fe43215..f4c6735 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -4,8 +4,8 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.8.4 -Release: 4%{?dist} +Version: 2.9.0 +Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -27,6 +27,7 @@ BuildRequires: libmemcached-devel #BuildRequires: db4-devel BuildRequires: libbsd +BuildRequires: libbsd-devel BuildRequires: pkgconfig BuildRequires: openssl-devel BuildRequires: sendmail-devel @@ -354,9 +355,6 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc LICENSE LICENSE.Sendmail README %{_libdir}/libopendkim.so.* -%{_libdir}/libstrl.so.* -%{_includedir}/strl/strl.h - %files -n libopendkim-devel %defattr(-,root,root) @@ -367,10 +365,15 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog -* Sun Nov 3 2013 Steve Jenkins - 2.8.4-4 +* Wed Dec 18 2013 Steve Jenkins - 2.9.0-1 +- Update to use newer upstream 2.9.0 source code +- Added libbsd-devel to BuildRequires +- Removed listrl references from libopendkim files section (handled by libbsd-devel) + +* Sun Nov 3 2013 Steve Jenkins - 2.8.4-4 - Rebuild of all release packages to sync version numbers -* Sun Nov 3 2013 Ville Skytta ville.skytta@iki.fi> - 2.8.4-3 +* Sun Nov 3 2013 Ville Skytta ville.skytta@iki.fi> - 2.8.4-3 - Fix path to docs in sample config when doc dir is unversioned (#993997). * Sat Aug 03 2013 Petr Pisar - 2.8.4-2 diff --git a/sources b/sources index 102d702..d204511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17f667d022c167c7874a993e928d4a6d opendkim-2.8.4.tar.gz +af682e58877bf9153b6af4400aad6d4d opendkim-2.9.0.tar.gz -- cgit From bed926f164f87430a68b9be11f319865865b5108 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 18 Dec 2013 19:16:52 -0800 Subject: Update to 2.9.0-2 --- .gitignore | 1 + opendkim.spec | 18 ++++++++++++------ sources | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0ba1966..b8a5c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /opendkim-2.8.3.tar.gz /opendkim-2.8.4.tar.gz /opendkim-2.9.0.tar.gz +/opendkim.add-user-group.patch diff --git a/opendkim.spec b/opendkim.spec index f4c6735..e16844e 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -35,7 +35,9 @@ BuildRequires: unbound-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Patch0: %{name}-libdb.patch +# Add User/Group to systemd service file +# https://sourceforge.net/p/opendkim/bugs/184/ +Patch0: %{name}.add-user-group.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,7 +81,7 @@ It is not required when the init system used is systemd. %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %build %configure --with-unbound --with-libmemcached --with-db @@ -343,7 +345,7 @@ rm -rf %{buildroot} %dir %attr(-,%{name},%{name}) %{_localstatedir}/spool/%{name} %dir %attr(-,%{name},%{name}) %{_localstatedir}/run/%{name} %dir %attr(-,root,%{name}) %{_sysconfdir}/%{name} -%dir %attr(750,root,%{name}) %{_sysconfdir}/%{name}/keys +%dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys %attr(0644,root,root) %{_unitdir}/%{name}.service %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen @@ -365,9 +367,13 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Wed Dec 18 2013 Steve Jenkins - 2.9.0-2 +- Patch adds user and group to systemd service file (Thx jcosta@redhat.com) +- Changed default ownership of /etc/opendkim/keys directory to opendkim user + * Wed Dec 18 2013 Steve Jenkins - 2.9.0-1 -- Update to use newer upstream 2.9.0 source code -- Added libbsd-devel to BuildRequires +- Updated to use newer upstream 2.9.0 source code +- Added libbsd-devel to Build Requires - Removed listrl references from libopendkim files section (handled by libbsd-devel) * Sun Nov 3 2013 Steve Jenkins - 2.8.4-4 diff --git a/sources b/sources index d204511..a704f8f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ af682e58877bf9153b6af4400aad6d4d opendkim-2.9.0.tar.gz +1f6fa599d5a2d7615b640bffc14482c0 opendkim.add-user-group.patch -- cgit From 0f9727773b65fb9ff2b24a59b07bfb41c1952552 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 11:34:59 -0500 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- opendkim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendkim.spec b/opendkim.spec index e16844e..244e6d6 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.9.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -367,6 +367,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Dec 18 2013 Steve Jenkins - 2.9.0-2 - Patch adds user and group to systemd service file (Thx jcosta@redhat.com) - Changed default ownership of /etc/opendkim/keys directory to opendkim user -- cgit From ef0e472a0ad72483246bd64ac6587b6fec7f72c5 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 30 Jul 2014 11:33:54 -0700 Subject: Update to 2.9.2-1 --- .gitignore | 1 + opendkim.spec | 16 +++++++++------- sources | 3 +-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b8a5c2c..a025574 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /opendkim-2.8.4.tar.gz /opendkim-2.9.0.tar.gz /opendkim.add-user-group.patch +/opendkim-2.9.2.tar.gz diff --git a/opendkim.spec b/opendkim.spec index 244e6d6..c79ee4f 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -4,8 +4,8 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.9.0 -Release: 3%{?dist} +Version: 2.9.2 +Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -35,9 +35,7 @@ BuildRequires: unbound-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Add User/Group to systemd service file -# https://sourceforge.net/p/opendkim/bugs/184/ -Patch0: %{name}.add-user-group.patch +# Patch0: %{name}.patchname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,7 +79,7 @@ It is not required when the init system used is systemd. %prep %setup -q -%patch0 -p1 +# %patch0 -p1 %build %configure --with-unbound --with-libmemcached --with-db @@ -367,6 +365,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 30 2014 Steve Jenkins - 2.9.2-1 +- Updated to use newer upstream 2.9.2 source code +- Fixed invalid date in changelog + * Sat Jun 07 2014 Fedora Release Engineering - 2.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -402,7 +404,7 @@ rm -rf %{buildroot} - Updated to use newer upstream 2.8.3 source code - Added unbound, libmcached, and db support on configure -* Fri Apr 29 2013 Steve Jenkins 2.8.2-1 +* Mon Apr 29 2013 Steve Jenkins 2.8.2-1 - Updated to use newer upstream 2.8.2 source code * Tue Mar 19 2013 Steve Jenkins 2.8.1-1 diff --git a/sources b/sources index a704f8f..fc2bffa 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -af682e58877bf9153b6af4400aad6d4d opendkim-2.9.0.tar.gz -1f6fa599d5a2d7615b640bffc14482c0 opendkim.add-user-group.patch +08cc80a2aedec62b0444d8d6af24a155 opendkim-2.9.2.tar.gz -- cgit From 6c2c1eab1c7a73a03a6d8eaed439c8372fdefeb1 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Mon, 4 Aug 2014 13:48:04 -0700 Subject: Update to 2.9.2-2 --- .gitignore | 3 +++ opendkim.spec | 26 +++++++++++++++++--------- sources | 3 +++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a025574..34ae57d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ /opendkim-2.9.0.tar.gz /opendkim.add-user-group.patch /opendkim-2.9.2.tar.gz +/opendkim.autocreate-keys-no.patch +/opendkim.keygen-permissions.patch +/opendkim.systemd-no-default-genkey.patch diff --git a/opendkim.spec b/opendkim.spec index c79ee4f..855fb1d 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.9.2 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -35,7 +35,9 @@ BuildRequires: unbound-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Patch0: %{name}.patchname.patch +Patch0: %{name}.keygen-permissions.patch +Patch1: %{name}.autocreate-keys-no.patch +Patch2: %{name}.systemd-no-default-genkey.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,7 +81,9 @@ It is not required when the init system used is systemd. %prep %setup -q -# %patch0 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure --with-unbound --with-libmemcached --with-db @@ -187,8 +191,8 @@ cat > %{buildroot}%{_sysconfdir}/sysconfig/%{name} << 'EOF' # Set the necessary startup options OPTIONS="-x %{_sysconfdir}/%{name}.conf -P %{_localstatedir}/run/%{name}/%{name}.pid" -# Determine whether default DKIM keys are automatically created on start -AUTOCREATE_DKIM_KEYS=YES +# Determine whether default DKIM keys are automatically created on start (deprecated) +# AUTOCREATE_DKIM_KEYS=YES # Set the default DKIM selector DKIM_SELECTOR=default @@ -334,16 +338,16 @@ rm -rf %{buildroot} %doc contrib/stats/README.%{name}-reportstats %config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf -%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/SigningTable -%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/KeyTable -%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/TrustedHosts +%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/SigningTable +%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/KeyTable +%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/TrustedHosts %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_sbindir}/* %{_mandir}/*/* %dir %attr(-,%{name},%{name}) %{_localstatedir}/spool/%{name} %dir %attr(-,%{name},%{name}) %{_localstatedir}/run/%{name} %dir %attr(-,root,%{name}) %{_sysconfdir}/%{name} -%dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys +%dir %attr(750,root,%{name}) %{_sysconfdir}/%{name}/keys %attr(0644,root,root) %{_unitdir}/%{name}.service %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen @@ -365,6 +369,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Mon Aug 4 2014 Steve Jenkins - 2.9.2-2 +- Change file ownerships/permissions to fix https://bugzilla.redhat.com/show_bug.cgi?id=891292 +- Default keys no longer created on startup. Privileged user must run opendkim-default-keygen or create manually (after install) + * Wed Jul 30 2014 Steve Jenkins - 2.9.2-1 - Updated to use newer upstream 2.9.2 source code - Fixed invalid date in changelog diff --git a/sources b/sources index fc2bffa..6c5f0b5 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ +80043a5147ae4ff2feb7f8d32ed2ccac opendkim.autocreate-keys-no.patch +a6a9c36328a9b4c18f5fca19e3b1aabc opendkim.keygen-permissions.patch +4f9d50fcd8428c280b2a4739cf4b8492 opendkim.systemd-no-default-genkey.patch 08cc80a2aedec62b0444d8d6af24a155 opendkim-2.9.2.tar.gz -- cgit From c3cbd1d8520e5f2aeecca4141ff918056ae74d91 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 13:50:43 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- opendkim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendkim.spec b/opendkim.spec index 855fb1d..bbb58ec 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -369,6 +369,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Mon Aug 4 2014 Steve Jenkins - 2.9.2-2 - Change file ownerships/permissions to fix https://bugzilla.redhat.com/show_bug.cgi?id=891292 - Default keys no longer created on startup. Privileged user must run opendkim-default-keygen or create manually (after install) -- cgit From d66c980fc3917bca6b661ae0e6e290c9e2618e22 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Tue, 3 Mar 2015 19:47:55 -0800 Subject: Update to 2.10.1-1 --- .gitignore | 1 + opendkim.spec | 121 ++++++++++++++++++++++++++++++++++++++++++++++++---------- sources | 5 +-- 3 files changed, 103 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 34ae57d..ba25e6e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /opendkim.autocreate-keys-no.patch /opendkim.keygen-permissions.patch /opendkim.systemd-no-default-genkey.patch +/opendkim-2.10.1.tar.gz diff --git a/opendkim.spec b/opendkim.spec index bbb58ec..0e2f152 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -4,8 +4,8 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim -Version: 2.9.2 -Release: 3%{?dist} +Version: 2.10.1 +Release: 1%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -26,18 +26,16 @@ BuildRequires: libmemcached-devel #Requires (postun): initscripts #BuildRequires: db4-devel +# Required for all versions BuildRequires: libbsd BuildRequires: libbsd-devel BuildRequires: pkgconfig BuildRequires: openssl-devel BuildRequires: sendmail-devel -BuildRequires: unbound-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}.keygen-permissions.patch -Patch1: %{name}.autocreate-keys-no.patch -Patch2: %{name}.systemd-no-default-genkey.patch +# Patch0: %{name}.patchname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,12 +79,10 @@ It is not required when the init system used is systemd. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +#%patch0 -p1 %build -%configure --with-unbound --with-libmemcached --with-db +%configure --with-libmemcached --with-db sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -191,9 +187,6 @@ cat > %{buildroot}%{_sysconfdir}/sysconfig/%{name} << 'EOF' # Set the necessary startup options OPTIONS="-x %{_sysconfdir}/%{name}.conf -P %{_localstatedir}/run/%{name}/%{name}.pid" -# Determine whether default DKIM keys are automatically created on start (deprecated) -# AUTOCREATE_DKIM_KEYS=YES - # Set the default DKIM selector DKIM_SELECTOR=default @@ -250,6 +243,86 @@ cat > %{buildroot}%{_sysconfdir}/%{name}/TrustedHosts << 'EOF' #192.168.1.0/24 EOF +cat > README.fedora << 'EOF' +##################################### +#FEDORA-SPECIFIC README FOR OPENDKIM# +##################################### +Last updated: Mar 3, 2015 by Steve Jenkins (steve@stevejenkins.com) + +Generating keys for OpenDKIM +============================ +After installing the opendkim package, you MUST generate a pair of keys (public and private) before +attempting to start the opendkim service. + +A valid private key must exist in the location expected by /etc/opendkim.conf before the service will start. + +A matching public key must be included in your domain's DNS records before remote systems can validate +your outgoing mail's DKIM signature. + + +Generating Keys Automatically +============================= +To automatically create a pair of default keys for the local domain, do: + +% sudo /usr/sbin/opendkim-default-keygen + +The default keygen script will attempt to fetch the local domain name, generate a private and public key for +the domain, then save them in /etc/opendkim/keys as default.private and default.txt with the proper +ownership and permissions. + +NOTE: The default key generation script MUST be run by a privileged user (or root). Otherwise, the resulting +private key ownership and permissions will not be correct. + + +Generating Keys Manually +======================== +A privileged user (or root) can manually generate a set of keys by doing the following: + +1) Create a directory to store the new keys: + +% sudo mkdir /etc/opendkim/keys/example.com + +2) Generate keys in that directory for a specific domain name and selector: + +% sudo /usr/sbin/opendkim-genkey -D /etc/opendkim/keys/example.com/ -d example.com -s default + +3) Set the proper ownership for the directory and private key: + +% sudo chown -R root:opendkim /etc/opendkim/keys/example.com + +4) Set secure permissions for the private key: + +% sudo chmod 640 /etc/opendkim/keys/example.com/default.private + +5) Set standard permissions for the public key: + +% sudo chmod 644 /etc/opendkim/keys/example.com/default.txt + + +Updating Key Location(s) in Configuration Files +=============================================== +If you run the opendkim-default-keygen script, the default keys will be saved in /etc/opendkim/keys as +default.private and default.txt, which is the location expected by the default /etc/opendkim.conf file. + +If you manually generate your own keys, you must update the key location and name in /etc/opendkim.conf +before attempting to start the opendkim service. + + +Additional Configuration Help +============================= +For help configuring your MTA (Postfix, Sendmail, etc.) with OpenDKIM, setting up DNS records with your +public DKIM key, as well as instructions on configuring OpenDKIM to sign outgoing mail for multiple +domains, follow the how-to at: + +http://wp.me/p1iGgP-ou + +Official documentation for OpenDKIM is available at http://opendkim.org/ + +OpenDKIM mailing lists are available at http://lists.opendkim.org/ + +### +EOF + install -p -d %{buildroot}%{_sysconfdir}/tmpfiles.d cat > %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf <<'EOF' D %{_localstatedir}/run/%{name} 0700 %{name} %{name} - @@ -314,7 +387,6 @@ fi exit 0 %triggerun -- %{name} < 2.8.0-1 -/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 || : /bin/systemctl enable %{name}.service >/dev/null 2>&1 /sbin/chkconfig --del %{name} >/dev/null 2>&1 || : /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : @@ -335,19 +407,19 @@ rm -rf %{buildroot} %doc contrib/convert/convert_keylist.sh %{name}/*.sample %doc %{name}/%{name}.conf.simple-verify %{name}/%{name}.conf.simple %doc %{name}/README contrib/lua/*.lua -%doc contrib/stats/README.%{name}-reportstats +%doc README.fedora %config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf -%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/SigningTable -%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/KeyTable -%config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/TrustedHosts +%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/SigningTable +%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/KeyTable +%config(noreplace) %attr(640,%{name},%{name}) %{_sysconfdir}/%{name}/TrustedHosts %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_sbindir}/* %{_mandir}/*/* %dir %attr(-,%{name},%{name}) %{_localstatedir}/spool/%{name} %dir %attr(-,%{name},%{name}) %{_localstatedir}/run/%{name} %dir %attr(-,root,%{name}) %{_sysconfdir}/%{name} -%dir %attr(750,root,%{name}) %{_sysconfdir}/%{name}/keys +%dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys %attr(0644,root,root) %{_unitdir}/%{name}.service %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen @@ -369,10 +441,19 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 03 2015 Steve Jenkins - 2.10.1-1 +- Updated to use newer upstream 2.10.1 source code + +* Tue Dec 09 2014 Steve Jenkins - 2.10.0-1 +- Updated to use newer upstream 2.10.0 source code +- Removed unbound compile option due to orphaned upstream dependency +- Removed AUTOCREATE_DKIM_KEYS option +- Added README.fedora with basic key generation and config instructions + * Sun Aug 17 2014 Fedora Release Engineering - 2.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Mon Aug 4 2014 Steve Jenkins - 2.9.2-2 +* Mon Aug 04 2014 Steve Jenkins - 2.9.2-2 - Change file ownerships/permissions to fix https://bugzilla.redhat.com/show_bug.cgi?id=891292 - Default keys no longer created on startup. Privileged user must run opendkim-default-keygen or create manually (after install) diff --git a/sources b/sources index 6c5f0b5..5c703a9 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -80043a5147ae4ff2feb7f8d32ed2ccac opendkim.autocreate-keys-no.patch -a6a9c36328a9b4c18f5fca19e3b1aabc opendkim.keygen-permissions.patch -4f9d50fcd8428c280b2a4739cf4b8492 opendkim.systemd-no-default-genkey.patch -08cc80a2aedec62b0444d8d6af24a155 opendkim-2.9.2.tar.gz +e75c2944634f875a301d85ab30c2d094 opendkim-2.10.1.tar.gz -- cgit From 8dbc469ae021fedcd66e70dfe27099d99a57a900 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Tue, 3 Mar 2015 20:30:01 -0800 Subject: Update to 2.10.1-2 --- opendkim.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opendkim.spec b/opendkim.spec index 0e2f152..50aecfd 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.10.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -239,6 +239,7 @@ cat > %{buildroot}%{_sysconfdir}/%{name}/TrustedHosts << 'EOF' # may be added on separate lines (IP addresses, hostnames, or CIDR ranges). # The localhost IP (127.0.0.1) should always be the first entry in this file. 127.0.0.1 +::1 #host.example.com #192.168.1.0/24 EOF @@ -441,6 +442,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 03 2015 Steve Jenkins - 2.10.1-2 +- Added IPv6 ::1 support to TrustedHosts (RH Bugzilla #1049204) + * Tue Mar 03 2015 Steve Jenkins - 2.10.1-1 - Updated to use newer upstream 2.10.1 source code -- cgit From 50bd122ede5be7b89e10195ba538fb57b544bd7d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 Mar 2015 15:56:01 -0500 Subject: Drop sysvinit subpackage from F23+ --- opendkim.spec | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 50aecfd..d1d3012 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.10.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -62,6 +62,7 @@ Requires: libopendkim = %{version}-%{release} This package contains the static libraries, headers, and other support files required for developing applications against libopendkim. +%if 0%{?fedora} < 23 %package sysvinit Summary: The SysV init script to manage the OpenDKIM milter. Group: System Environmnt/Daemons @@ -76,6 +77,7 @@ contains the SysV init script to manage the OpenDKIM milter when running a legacy SysV-compatible init system. It is not required when the init system used is systemd. +%endif %prep %setup -q @@ -92,11 +94,13 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install %{?_smp_mflags} install -d %{buildroot}%{_sysconfdir} install -d %{buildroot}%{_sysconfdir}/sysconfig -install -d %{buildroot}%{_initrddir} install -d -m 0755 %{buildroot}%{_unitdir} install -m 0644 contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -m 0755 contrib/init/redhat/%{name} %{buildroot}%{_initrddir}/%{name} install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindir}/%{name}-default-keygen +%if 0%{?fedora} < 23 +install -d %{buildroot}%{_initrddir} +install -m 0755 contrib/init/redhat/%{name} %{buildroot}%{_initrddir}/%{name} +%endif cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF' ## BASIC OPENDKIM CONFIGURATION FILE @@ -357,9 +361,6 @@ if [ $1 -eq 1 ] ; then /bin/systemctl enable %{name}.service >/dev/null 2>&1 || : fi -%post sysvinit -/sbin/chkconfig --add %{name} || : - %preun if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -367,13 +368,6 @@ if [ $1 -eq 0 ] ; then /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : fi -%preun sysvinit -if [ $1 -eq 0 ]; then - service %{name} stop >/dev/null || : - /sbin/chkconfig --del %{name} || : -fi -exit 0 - %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -381,19 +375,31 @@ if [ $1 -ge 1 ] ; then /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : fi +%triggerun -- %{name} < 2.8.0-1 +/bin/systemctl enable %{name}.service >/dev/null 2>&1 +/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : +/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : + +%if 0%{?fedora} < 23 +%post sysvinit +/sbin/chkconfig --add %{name} || : + +%preun sysvinit +if [ $1 -eq 0 ]; then + service %{name} stop >/dev/null || : + /sbin/chkconfig --del %{name} || : +fi +exit 0 + %postun sysvinit if [ "$1" -ge "1" ] ; then /sbin/service %{name} condrestart >/dev/null 2>&1 || : fi exit 0 -%triggerun -- %{name} < 2.8.0-1 -/bin/systemctl enable %{name}.service >/dev/null 2>&1 -/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : -/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : - %triggerpostun -n opendkim-sysvinit -- %{name} < 2.8.0-1 /sbin/chkconfig --add %{name} >/dev/null 2>&1 || : +%endif %post -n libopendkim -p /sbin/ldconfig @@ -424,9 +430,11 @@ rm -rf %{buildroot} %attr(0644,root,root) %{_unitdir}/%{name}.service %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen +%if 0%{?fedora} < 23 %files sysvinit %defattr(-,root,root) %attr(0755,root,root) %{_initrddir}/%{name} +%endif %files -n libopendkim %defattr(-,root,root) @@ -442,6 +450,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 05 2015 Adam Jackson 2.10.1-3 +- Drop sysvinit subpackage from F23+ + * Tue Mar 03 2015 Steve Jenkins - 2.10.1-2 - Added IPv6 ::1 support to TrustedHosts (RH Bugzilla #1049204) -- cgit From fa36bbc033f40cce57153086d6d8673cf4d161fc Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Tue, 24 Mar 2015 17:40:24 -0700 Subject: Update to 2.10.1-4 --- opendkim.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index d1d3012..410dbbb 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.10.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons @@ -65,7 +65,7 @@ required for developing applications against libopendkim. %if 0%{?fedora} < 23 %package sysvinit Summary: The SysV init script to manage the OpenDKIM milter. -Group: System Environmnt/Daemons +Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description sysvinit @@ -84,7 +84,13 @@ It is not required when the init system used is systemd. #%patch0 -p1 %build +# Always use system libtool instead of opendkim provided one to +# properly handle 32 versus 64 bit detection and settings +%define LIBTOOL LIBTOOL=`which libtool` + %configure --with-libmemcached --with-db + +# Remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -450,6 +456,12 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog +* Fri Mar 24 2015 Steve Jenkins - 2.10.1-4 +- Fixed typo in Group name +- Added updated libtool definition +- Additional comments in spec file +- Patch SysV initscript to stop default key generation on startup + * Thu Mar 05 2015 Adam Jackson 2.10.1-3 - Drop sysvinit subpackage from F23+ -- cgit From ef75b73c8d35c6e9b94fdf0d2cf90ee266c82e4c Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 25 Mar 2015 09:10:33 -0700 Subject: Trying comsolidated spec file --- opendkim.spec | 110 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 410dbbb..70c248f 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -1,4 +1,4 @@ -# systemd-compatible version +%global is_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7) %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -12,21 +12,21 @@ Group: System Environment/Daemons Requires: lib%{name} = %{version}-%{release} Requires (pre): shadow-utils -# Uncomment for systemd version +%if is_systemd Requires (post): systemd-units Requires (preun): systemd-units Requires (postun): systemd-units Requires (post): systemd-sysv BuildRequires: libdb-devel BuildRequires: libmemcached-devel +%else +Requires (post): chkconfig +Requires (preun): chkconfig, initscripts +Requires (postun): initscripts +BuildRequires: db4-devel +%endif -# Uncomment for SystemV version -#Requires (post): chkconfig -#Requires (preun): chkconfig, initscripts -#Requires (postun): initscripts -#BuildRequires: db4-devel - -# Required for all versions +# Required for all systems BuildRequires: libbsd BuildRequires: libbsd-devel BuildRequires: pkgconfig @@ -35,7 +35,7 @@ BuildRequires: sendmail-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Patch0: %{name}.patchname.patch +Patch0: %{name}.init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,33 +62,26 @@ Requires: libopendkim = %{version}-%{release} This package contains the static libraries, headers, and other support files required for developing applications against libopendkim. -%if 0%{?fedora} < 23 -%package sysvinit -Summary: The SysV init script to manage the OpenDKIM milter. -Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} - -%description sysvinit -OpenDKIM allows signing and/or verification of email through an open source -library that implements the DKIM service, plus a milter-based filter -application that can plug in to any milter-aware MTA, including sendmail, -Postfix, or any other MTA that supports the milter protocol. This package -contains the SysV init script to manage the OpenDKIM milter when running a -legacy SysV-compatible init system. - -It is not required when the init system used is systemd. -%endif - %prep %setup -q -#%patch0 -p1 +%patch0 -p1 + +%if is_systemd +echo "systemd YES!" +%else +echo "systemd NO!" +%endif %build # Always use system libtool instead of opendkim provided one to # properly handle 32 versus 64 bit detection and settings %define LIBTOOL LIBTOOL=`which libtool` +%if is_systemd %configure --with-libmemcached --with-db +%else +%configure --with-db +%endif # Remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -100,10 +93,12 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install %{?_smp_mflags} install -d %{buildroot}%{_sysconfdir} install -d %{buildroot}%{_sysconfdir}/sysconfig +install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindir}/%{name}-default-keygen + +%if is_systemd install -d -m 0755 %{buildroot}%{_unitdir} install -m 0644 contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindir}/%{name}-default-keygen -%if 0%{?fedora} < 23 +%else install -d %{buildroot}%{_initrddir} install -m 0755 contrib/init/redhat/%{name} %{buildroot}%{_initrddir}/%{name} %endif @@ -362,49 +357,55 @@ getent passwd %{name} >/dev/null || \ exit 0 %post +%if is_systemd if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable %{name}.service >/dev/null 2>&1 || : fi +%else + +/sbin/chkconfig --add %{name} || : +%endif + %preun +%if is_systemd if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || : /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : fi +%else + +if [ $1 -eq 0 ]; then + service %{name} stop >/dev/null || : + /sbin/chkconfig --del %{name} || : +fi +exit 0 +%endif + %postun +%if is_systemd /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : fi -%triggerun -- %{name} < 2.8.0-1 -/bin/systemctl enable %{name}.service >/dev/null 2>&1 -/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : -/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : - -%if 0%{?fedora} < 23 -%post sysvinit -/sbin/chkconfig --add %{name} || : - -%preun sysvinit -if [ $1 -eq 0 ]; then - service %{name} stop >/dev/null || : - /sbin/chkconfig --del %{name} || : -fi -exit 0 +%else -%postun sysvinit if [ "$1" -ge "1" ] ; then /sbin/service %{name} condrestart >/dev/null 2>&1 || : fi exit 0 +%endif -%triggerpostun -n opendkim-sysvinit -- %{name} < 2.8.0-1 -/sbin/chkconfig --add %{name} >/dev/null 2>&1 || : +%if is_systemd +%triggerun -- %{name} < 2.8.0-1 +/bin/systemctl enable %{name}.service >/dev/null 2>&1 +/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : +/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : %endif %post -n libopendkim -p /sbin/ldconfig @@ -433,12 +434,11 @@ rm -rf %{buildroot} %dir %attr(-,%{name},%{name}) %{_localstatedir}/run/%{name} %dir %attr(-,root,%{name}) %{_sysconfdir}/%{name} %dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys -%attr(0644,root,root) %{_unitdir}/%{name}.service %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen -%if 0%{?fedora} < 23 -%files sysvinit -%defattr(-,root,root) +%if is_systemd +%attr(0644,root,root) %{_unitdir}/%{name}.service +%else %attr(0755,root,root) %{_initrddir}/%{name} %endif @@ -456,7 +456,11 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/*.pc %changelog -* Fri Mar 24 2015 Steve Jenkins - 2.10.1-4 +* Wed Mar 25 2015 Steve Jenkins - 2.10.1-5 +- Combined systemd and SysV spec files using conditionals +- Drop sysvinit subpackage completely + +* Tue Mar 24 2015 Steve Jenkins - 2.10.1-4 - Fixed typo in Group name - Added updated libtool definition - Additional comments in spec file -- cgit From f10bbf46850a0219b65992e26573f6db12f920fc Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 25 Mar 2015 10:26:16 -0700 Subject: Fixing global variable issue --- opendkim.spec | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 70c248f..364f8de 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -12,7 +12,8 @@ Group: System Environment/Daemons Requires: lib%{name} = %{version}-%{release} Requires (pre): shadow-utils -%if is_systemd +%if %is_systemd +# Required for systemd Requires (post): systemd-units Requires (preun): systemd-units Requires (postun): systemd-units @@ -35,7 +36,13 @@ BuildRequires: sendmail-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +%if %is_systemd +# Define systemd patches +#Patch0: %{name}.patchname.patch +%else +# Define SysV patches Patch0: %{name}.init.patch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,12 +71,12 @@ required for developing applications against libopendkim. %prep %setup -q -%patch0 -p1 - -%if is_systemd -echo "systemd YES!" +%if %is_systemd +# Apply systemd patches +#%patch0 -p1 %else -echo "systemd NO!" +# Apply SysV patches +%patch0 -p1 %endif %build @@ -77,7 +84,7 @@ echo "systemd NO!" # properly handle 32 versus 64 bit detection and settings %define LIBTOOL LIBTOOL=`which libtool` -%if is_systemd +%if %is_systemd %configure --with-libmemcached --with-db %else %configure --with-db @@ -95,7 +102,7 @@ install -d %{buildroot}%{_sysconfdir} install -d %{buildroot}%{_sysconfdir}/sysconfig install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindir}/%{name}-default-keygen -%if is_systemd +%if %is_systemd install -d -m 0755 %{buildroot}%{_unitdir} install -m 0644 contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service %else @@ -357,7 +364,7 @@ getent passwd %{name} >/dev/null || \ exit 0 %post -%if is_systemd +%if %is_systemd if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable %{name}.service >/dev/null 2>&1 || : @@ -369,7 +376,7 @@ fi %endif %preun -%if is_systemd +%if %is_systemd if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || : @@ -386,7 +393,7 @@ exit 0 %endif %postun -%if is_systemd +%if %is_systemd /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall @@ -401,7 +408,7 @@ fi exit 0 %endif -%if is_systemd +%if %is_systemd %triggerun -- %{name} < 2.8.0-1 /bin/systemctl enable %{name}.service >/dev/null 2>&1 /sbin/chkconfig --del %{name} >/dev/null 2>&1 || : -- cgit From cb53118f0c1c4d40314f2fe1e80320fcabc84a4e Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 25 Mar 2015 10:49:15 -0700 Subject: Still fixing global variables issues --- opendkim.spec | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/opendkim.spec b/opendkim.spec index 364f8de..df5ced1 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -1,4 +1,4 @@ -%global is_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7) +%global systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7) %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -12,7 +12,7 @@ Group: System Environment/Daemons Requires: lib%{name} = %{version}-%{release} Requires (pre): shadow-utils -%if %is_systemd +%if %systemd # Required for systemd Requires (post): systemd-units Requires (preun): systemd-units @@ -36,13 +36,7 @@ BuildRequires: sendmail-devel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -%if %is_systemd -# Define systemd patches -#Patch0: %{name}.patchname.patch -%else -# Define SysV patches Patch0: %{name}.init.patch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,7 +65,7 @@ required for developing applications against libopendkim. %prep %setup -q -%if %is_systemd +%if %systemd # Apply systemd patches #%patch0 -p1 %else @@ -84,7 +78,7 @@ required for developing applications against libopendkim. # properly handle 32 versus 64 bit detection and settings %define LIBTOOL LIBTOOL=`which libtool` -%if %is_systemd +%if %systemd %configure --with-libmemcached --with-db %else %configure --with-db @@ -102,7 +96,7 @@ install -d %{buildroot}%{_sysconfdir} install -d %{buildroot}%{_sysconfdir}/sysconfig install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindir}/%{name}-default-keygen -%if %is_systemd +%if %systemd install -d -m 0755 %{buildroot}%{_unitdir} install -m 0644 contrib/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service %else @@ -364,7 +358,7 @@ getent passwd %{name} >/dev/null || \ exit 0 %post -%if %is_systemd +%if %systemd if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable %{name}.service >/dev/null 2>&1 || : @@ -376,7 +370,7 @@ fi %endif %preun -%if %is_systemd +%if %systemd if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || : @@ -393,7 +387,7 @@ exit 0 %endif %postun -%if %is_systemd +%if %systemd /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall @@ -408,7 +402,7 @@ fi exit 0 %endif -%if %is_systemd +%if %systemd %triggerun -- %{name} < 2.8.0-1 /bin/systemctl enable %{name}.service >/dev/null 2>&1 /sbin/chkconfig --del %{name} >/dev/null 2>&1 || : @@ -443,7 +437,7 @@ rm -rf %{buildroot} %dir %attr(750,%name,%{name}) %{_sysconfdir}/%{name}/keys %attr(0755,root,root) %{_sbindir}/%{name}-default-keygen -%if is_systemd +%if %systemd %attr(0644,root,root) %{_unitdir}/%{name}.service %else %attr(0755,root,root) %{_initrddir}/%{name} -- cgit From 6e8a15a70fab557301d2b1c4e17cbf9ea58ea2ba Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 25 Mar 2015 11:04:48 -0700 Subject: Update to 2.10.1-4 --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ba25e6e..ec5b5db 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /opendkim.keygen-permissions.patch /opendkim.systemd-no-default-genkey.patch /opendkim-2.10.1.tar.gz +/opendkim.init.patch diff --git a/sources b/sources index 5c703a9..e629a4e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +d5cc6208c52eb939b538290470c88fdb opendkim.init.patch e75c2944634f875a301d85ab30c2d094 opendkim-2.10.1.tar.gz -- cgit From 9fbad3f10bd2dd4140fe9b16391208238dce5430 Mon Sep 17 00:00:00 2001 From: stevejenkins Date: Wed, 25 Mar 2015 11:07:54 -0700 Subject: Update to 2.10.1-5 --- opendkim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendkim.spec b/opendkim.spec index df5ced1..38b625a 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -5,7 +5,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.10.1 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD and Sendmail URL: http://opendkim.org/ Group: System Environment/Daemons -- cgit