PR#2: Drop all xinetd support, as xinetd is removed from Fedora - rpms/uw-imap

rpms / uw-imap

#2 Drop all xinetd support, as xinetd is removed from Fedora

Closed 2 years ago by churchyard. Opened 2 years ago by churchyard.

rpms/ churchyard/uw-imap no_xinetd into rawhide

Drop all xinetd support, as xinetd is removed from Fedora

Miro Hrončok • 2 years ago

1106fb9

imap-xinetd

file removed

-14

		`@@ -1,14 +0,0 @@`
		`- # default: off`
		`- # description: The IMAP service allows remote users to access their mail using \`
		`- # an IMAP client such as Mutt, Pine, fetchmail, or Netscape \`
		`- # Communicator.`
		`- service imap`
		`- {`
		`- socket_type = stream`
		`- wait = no`
		`- user = root`
		`- server = /usr/sbin/imapd`
		`- log_on_success += HOST DURATION`
		`- log_on_failure += HOST`
		`- disable = yes`
		`- }`

imaps-xinetd

file removed

-14

		`@@ -1,14 +0,0 @@`
		`- # default: off`
		`- # description: The IMAPS service allows remote users to access their mail \`
		`- # using an IMAP client with SSL support such as Netscape \`
		`- # Communicator or fetchmail.`
		`- service imaps`
		`- {`
		`- socket_type = stream`
		`- wait = no`
		`- user = root`
		`- server = /usr/sbin/imapd`
		`- log_on_success += HOST DURATION`
		`- log_on_failure += HOST`
		`- disable = yes`
		`- }`

ipop2-xinetd

file removed

-15

		`@@ -1,15 +0,0 @@`
		`- # default: off`
		`- # description: The POP2 service allows remote users to access their mail \`
		`- # using an POP2 client such as fetchmail. In most cases, clients \`
		`- # support POP3 instead of POP2, so enabling this service is rarely \`
		`- # necessary.`
		`- service pop2`
		`- {`
		`- socket_type = stream`
		`- wait = no`
		`- user = root`
		`- server = /usr/sbin/ipop2d`
		`- log_on_success += HOST DURATION`
		`- log_on_failure += HOST`
		`- disable = yes`
		`- }`

ipop3-xinetd

file removed

-14

		`@@ -1,14 +0,0 @@`
		`- # default: off`
		`- # description: The POP3 service allows remote users to access their mail \`
		`- # using an POP3 client such as Netscape Communicator, mutt, \`
		`- # or fetchmail.`
		`- service pop3`
		`- {`
		`- socket_type = stream`
		`- wait = no`
		`- user = root`
		`- server = /usr/sbin/ipop3d`
		`- log_on_success += HOST DURATION`
		`- log_on_failure += HOST`
		`- disable = yes`
		`- }`

pop3s-xinetd

file removed

-13

		`@@ -1,13 +0,0 @@`
		`- # default: off`
		`- # description: The POP3S service allows remote users to access their mail \`
		`- # using an POP3 client with SSL support such as fetchmail.`
		`- service pop3s`
		`- {`
		`- socket_type = stream`
		`- wait = no`
		`- user = root`
		`- server = /usr/sbin/ipop3d`
		`- log_on_success += HOST DURATION`
		`- log_on_failure += HOST`
		`- disable = yes`
		`- }`

uw-imap.spec

file modified

+5 -24

		`@@ -22,7 +22,7 @@`
		`Summary: UW Server daemons for IMAP and POP network mail protocols`
		`Name: uw-imap`
		`Version: 2007f`
		`- Release: 27%{?dist}`
		`+ Release: 28%{?dist}`

		`# See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0`
		`License: ASL 2.0`
		`@@ -55,12 +55,6 @@`
		`# legacy/old pam setup, using pam_stack.so`
		`Source22: imap-legacy.pam`

		`- Source31: imap-xinetd`
		`- Source32: imaps-xinetd`
		`- Source33: ipop2-xinetd`
		`- Source34: ipop3-xinetd`
		`- Source35: pop3s-xinetd`
		`-`
		`Patch1: imap-2007-paths.patch`
		`# See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271`
		`Patch2: imap-2004a-doc.patch`
		`@@ -80,7 +74,6 @@`
		`BuildRequires: krb5-devel`
		`BuildRequires: pam-devel`

		`- Requires: xinetd`
		`Requires(post): openssl`

		`BuildRequires: openssl-devel`
		`@@ -263,12 +256,6 @@`
		`install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/imap`
		`install -p -m644 -D imap.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pop`

		`- install -p -m644 -D %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imap`
		`- install -p -m644 -D %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/imaps`
		`- install -p -m644 -D %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop2`
		`- install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3`
		`- install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s`
		`-`
		`# %ghost'd *.pem files`
		`mkdir -p $RPM_BUILD_ROOT%{ssldir}/certs`
		`touch $RPM_BUILD_ROOT%{ssldir}/certs/{imapd,ipop3d}.pem`
		`@@ -296,22 +283,12 @@`
		`fi`
		`done`
		`} \|\| :`
		`- /sbin/service xinetd reload > /dev/null 2>&1 \|\| :`

		`- %postun`
		`- /sbin/service xinetd reload > /dev/null 2>&1 \|\| :`

		`%files`
		`%doc docs/SSLBUILD`
		`%config(noreplace) %{_sysconfdir}/pam.d/imap`
		`%config(noreplace) %{_sysconfdir}/pam.d/pop`
		`- %config(noreplace) %{_sysconfdir}/xinetd.d/imap`
		`- %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2`
		`- %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3`
		`- # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade`
		`- # do this in a %trigger or something not here... -- Rex`
		`- %config(noreplace) %{_sysconfdir}/xinetd.d/imaps`
		`- %config(noreplace) %{_sysconfdir}/xinetd.d/pop3s`
		`%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/imapd.pem`
		`%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/ipop3d.pem`
		`%{_mandir}/man8/*`
		`@@ -348,6 +325,10 @@`


		`%changelog`
		`+ * Mon Feb 15 2021 Miro Hrončok <mhroncok@redhat.com> - 2007f-28`
		`+ - Drop all xinetd support, as xinetd is removed from Fedora`
		`+ - Fixes: rhbz#1907175`
		`+`
		`* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2007f-27`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`