diff options
| -rw-r--r-- | clog | 5 | ||||
| -rw-r--r-- | imap-legacy.pam | 5 | ||||
| -rw-r--r-- | imap.pam | 5 | ||||
| -rw-r--r-- | uw-imap.spec | 102 |
4 files changed, 36 insertions, 81 deletions
@@ -1,2 +1,3 @@ -missing BR on C compiler -use ldconfig_scriptlets +Rebuild for remirepo as dropped from F34 +drop uw-imap and uw-imap-static and uw-imap-utils + as only uw-imap-devel and libc-client needed diff --git a/imap-legacy.pam b/imap-legacy.pam deleted file mode 100644 index 20dff02..0000000 --- a/imap-legacy.pam +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth required pam_nologin.so -auth required pam_stack.so service=system-auth -account required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth diff --git a/imap.pam b/imap.pam deleted file mode 100644 index ccb9105..0000000 --- a/imap.pam +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth required pam_nologin.so -auth include system-auth -account include system-auth -session include system-auth diff --git a/uw-imap.spec b/uw-imap.spec index 69b3501..735c5bb 100644 --- a/uw-imap.spec +++ b/uw-imap.spec @@ -1,28 +1,25 @@ - -# Fedora review: http://bugzilla.redhat.com/166008 - -%if 0%{?fedora} || 0%{?rhel} > 6 -%define _with_devel 1 -# ship static lib, matches default upstream config -# as convenience to users, since our hacked shlib can potentially break -# abi semi-often -%global _with_static 1 -%endif - -## don't use even on rhel6, due to libc-client WONTFIX, -## https://bugzilla.redhat.com/show_bug.cgi?id=736120 -#if 0%%{?rhel} == 6 -%if 0 -%global _with_system_libc_client 1 -%endif - -# trim changelog included in binary rpms -%global _changelog_trimtime %(date +%s -d "1 year ago") +# remirepo spec file for uw-imap +# only for libc-client for php-imap +# +# Fedora spec file for uw-imap +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# + +# Needed +%bcond_without devel + +# Not used +%bcond_with static +%bcond_with daemon Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap Version: 2007f -Release: 27%{?dist} +Release: 30%{?dist} # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0 License: ASL 2.0 @@ -32,15 +29,8 @@ Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}%{?dev}%{?snap %global soname c-client %global shlibname lib%{soname}.so.%{somajor} -%if 0%{?fedora} || 0%{?rhel} > 6 %global somajor 2007 %global imap_libs lib%{soname} -%else -# rhel (<7) requires parallel-installable shlib, to not conflict with -# os-provided libc-client -%global somajor %{version} -%global imap_libs lib%{soname}%{somajor} -%endif # FC4+ uses %%_sysconfdir/pki/tls, previous releases used %%_datadir/ssl %global ssldir %(if [ -d %{_sysconfdir}/pki/tls ]; then echo "%{_sysconfdir}/pki/tls"; else echo "%{_datadir}/ssl"; fi) @@ -50,10 +40,6 @@ Obsoletes: imap < 1:%{version} # newest pam setup, using password-auth common PAM Source20: imap-password.pam -# new pam setup, using new "include" feature -Source21: imap.pam -# legacy/old pam setup, using pam_stack.so -Source22: imap-legacy.pam Source31: imap-xinetd Source32: imaps-xinetd @@ -85,12 +71,8 @@ Requires(post): openssl BuildRequires: openssl-devel -%if 0%{?_with_system_libc_client} -BuildRequires: libc-client-devel = %{version} -Requires: %{imap_libs}%{?_isa} = %{version} -%else Requires: %{imap_libs}%{?_isa} = %{version}-%{release} -%endif + %description The %{name} package provides UW server daemons for both the IMAP (Internet @@ -138,9 +120,7 @@ which will use the UW C-client common API. %package utils Summary: UW IMAP Utilities to make managing your email simpler -%if ! 0%{?_with_system_libc_client} Requires: %{imap_libs}%{?_isa} = %{version}-%{release} -%endif # imap -> uw-imap rename Obsoletes: imap-utils < 1:%{version} %description utils @@ -164,19 +144,7 @@ This package contains some utilities for managing UW IMAP email,including: %patch9 -p1 -b .shared %patch10 -p1 -b .authmd5 -%if 0%{?fedora} > 11 || 0%{?rhel} > 5 install -p -m644 %{SOURCE20} imap.pam -%else -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -install -p -m644 %{SOURCE21} imap.pam -%else -install -p -m644 %{SOURCE22} imap.pam -%endif -%endif - -%if 0%{?_with_system_libc_client} -%patch11 -p1 -b .system_c_client -%endif %patch12 -p1 -b .fmt-sec %patch13 -p1 -b .poll @@ -197,9 +165,7 @@ export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)" export EXTRACFLAGS="$EXTRACFLAGS -fPIC $RPM_OPT_FLAGS" # jorton added these, I'll assume he knows what he's doing. :) -- Rex export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing" -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 export EXTRACFLAGS="$EXTRACFLAGS -Wno-pointer-sign" -%endif echo -e "y\ny" | \ make %{?_smp_mflags} lnp \ @@ -209,23 +175,15 @@ EXTRALDFLAGS="$EXTRALDFLAGS $RPM_LD_FLAGS" \ EXTRAAUTHENTICATORS=gss \ SPECIALS="GSSDIR=${GSSDIR} LOCKPGM=%{_sbindir}/mlock SSLCERTS=%{ssldir}/certs SSLDIR=%{ssldir} SSLINCLUDE=%{_includedir}/openssl SSLKEYS=%{ssldir}/private SSLLIB=%{_libdir}" \ SSLTYPE=unix \ -%if 0%{?_with_system_libc_client} -CCLIENTLIB=%{_libdir}/%{shlibname} \ -%else CCLIENTLIB=$(pwd)/c-client/%{shlibname} \ -%endif SHLIBBASE=%{soname} \ -SHLIBNAME=%{shlibname} \ -%if 0%{?_with_system_libc_client} -%endif -# Blank line +SHLIBNAME=%{shlibname} %install mkdir -p $RPM_BUILD_ROOT%{_libdir}/ -%if ! 0%{?_with_system_libc_client} -%if 0%{?_with_static:1} +%if %{with static} install -p -m644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/ ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a %endif @@ -235,9 +193,8 @@ install -p -m755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/ # %%ghost'd c-client.cf touch c-client.cf install -p -m644 -D c-client.cf $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf -%endif -%if 0%{?_with_devel:1} +%if %{with devel} ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap/ @@ -247,6 +204,7 @@ install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/ install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/ %endif +%if %{with daemon} install -p -D -m644 src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8uw install -p -D -m644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipopd.8uw @@ -272,8 +230,10 @@ 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 +%endif +%if %{with daemon} # FIXME, do on first launch (or not at all?), not here -- Rex %post { @@ -323,8 +283,8 @@ done %{_bindir}/* %attr(2755, root, mail) %{_sbindir}/mlock %{_mandir}/man1/* +%endif -%if ! 0%{?_with_system_libc_client} %ldconfig_scriptlets -n %{imap_libs} %files -n %{imap_libs} @@ -332,15 +292,14 @@ done %doc docs/RELNOTES docs/*.txt %ghost %config(missingok,noreplace) %{_sysconfdir}/c-client.cf %{_libdir}/lib%{soname}.so.* -%endif -%if 0%{?_with_devel:1} +%if %{with devel} %files devel %{_includedir}/imap/ %{_libdir}/lib%{soname}.so %endif -%if 0%{?_with_static:1} +%if %{with static} %files static %{_libdir}/c-client.a %{_libdir}/libc-client.a @@ -348,6 +307,11 @@ done %changelog +* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 2007f-30 +- Rebuild for remirepo as dropped from F34 +- drop uw-imap and uw-imap-static and uw-imap-utils + as only uw-imap-devel and libc-client needed + * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2007f-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild |