diff --git a/.cvsignore b/.cvsignore index 49cdea8..20aadfe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -imap-2006k.tar.Z +imap-2007a1.tar.Z diff --git a/imap-2004d-optflags.patch b/imap-2004d-optflags.patch deleted file mode 100644 index 1e4af5b..0000000 --- a/imap-2004d-optflags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- imap-2004d/src/osdep/unix/Makefile.optflags 2005-04-29 12:53:09.000000000 -0500 -+++ imap-2004d/src/osdep/unix/Makefile 2005-04-29 12:55:16.000000000 -0500 -@@ -36,7 +36,7 @@ - # -O3 seems to be safe, but empirical observation from our local expert - # indicates that in some (many?) cases -O3 code runs slower than -O2. - --GCCOPTLEVEL= -O2 -+GCCOPTLEVEL= -O2 $(RPM_OPT_FLAGS) - - - # Extended flags needed for SSL. You may need to modify. -@@ -454,7 +454,7 @@ - SPOOLDIR=/var/spool \ - ACTIVEFILE=/var/lib/news/active \ - RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \ -+ BASECFLAGS="$(GCCOPTLEVEL)" \ - BASELDFLAGS="$(PAMLDFLAGS)" - - lnx: # Linux non-shadow passwords diff --git a/imap-2006-paths.patch b/imap-2006-paths.patch deleted file mode 100644 index 8c3d0b1..0000000 --- a/imap-2006-paths.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- imap-2006/src/osdep/unix/Makefile.paths 2006-08-30 20:31:57.000000000 -0500 -+++ imap-2006/src/osdep/unix/Makefile 2006-09-15 08:34:25.000000000 -0500 -@@ -96,11 +96,11 @@ - LOGINPW=std - SIGTYPE=bsd - CRXTYPE=std --ACTIVEFILE=/usr/lib/news/active --SPOOLDIR=/usr/spool -+ACTIVEFILE=/var/lib/news/active -+SPOOLDIR=/var/spool - MAILSPOOL=$(SPOOLDIR)/mail - NEWSSPOOL=$(SPOOLDIR)/news --RSHPATH=/usr/ucb/rsh -+RSHPATH=/usr/bin/rsh - LOCKPGM=/etc/mlock - MD5PWD="/etc/cram-md5.pwd" - diff --git a/imap-2007-paths.patch b/imap-2007-paths.patch new file mode 100644 index 0000000..a2784d9 --- /dev/null +++ b/imap-2007-paths.patch @@ -0,0 +1,18 @@ +diff -up imap-2007/src/osdep/unix/Makefile.paths imap-2007/src/osdep/unix/Makefile +--- imap-2007/src/osdep/unix/Makefile.paths 2007-12-17 16:10:24.000000000 -0600 ++++ imap-2007/src/osdep/unix/Makefile 2007-12-21 09:30:04.000000000 -0600 +@@ -96,11 +96,11 @@ CHECKPW=std + LOGINPW=std + SIGTYPE=bsd + CRXTYPE=std +-ACTIVEFILE=/usr/lib/news/active +-SPOOLDIR=/usr/spool ++ACTIVEFILE=/var/lib/news/active ++SPOOLDIR=/var/spool + MAILSPOOL=$(SPOOLDIR)/mail + NEWSSPOOL=$(SPOOLDIR)/news +-RSHPATH=/usr/ucb/rsh ++RSHPATH=/usr/bin/rsh + MD5PWD=/etc/cram-md5.pwd + # Tries one of the test alternatives below if not specified. + LOCKPGM= diff --git a/sources b/sources index 402778c..17086f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a98066870fb8075c744079309e379c8 imap-2006k.tar.Z +828a84c64ef933bfcc805b838576a774 imap-2007a1.tar.Z diff --git a/uw-imap.spec b/uw-imap.spec index c99c6f0..0207f0c 100644 --- a/uw-imap.spec +++ b/uw-imap.spec @@ -1,14 +1,19 @@ # Fedora review: http://bugzilla.redhat.com/166008 -#define beta +#define beta 1 #define dev .DEV.SNAP- #define snap 0709171900 +# ship static lib, matches default upstream config +# as convenience to users, since our hacked shlib can potentially break +# abi semi-often +%define _with_static 1 + Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap -Version: 2006k -Release: 1%{?dist} +Version: 2007a1 +Release: 2%{?dist} # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0 License: ASL 2.0 @@ -20,11 +25,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define soname c-client #define somajor %{version} -%define somajor 2006 +%define somajor 2007 %define shlibname lib%{soname}.so.%{somajor} +%if 0%{?fedora} > 2 || 0%{?rhel} > 5 +%define imap_libs lib%{soname} +%else +# rhel (4,5) requires parallel-installable shlib, to not conflict with +# os-provided libc-client %define imap_libs lib%{soname}%{somajor} -## Old naming -#define imap_libs lib%{soname} +%endif # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs %global sslcerts %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi) @@ -43,7 +52,7 @@ Source33: ipop2-xinetd Source34: ipop3-xinetd Source35: pop3s-xinetd -Patch1: imap-2006-paths.patch +Patch1: imap-2007-paths.patch # See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271 Patch2: imap-2004a-doc.patch Patch5: imap-2001a-overflow.patch @@ -72,9 +81,9 @@ Group: System Environment/Libraries Obsoletes: libc-client2004d < 1:2004d-2 Obsoletes: libc-client2004e < 2004e-2 Obsoletes: libc-client2004g < 2004g-7 -%if 0%{?fedora} > 6 -# not strictly needed, but cleaner uprade path -Obsoletes: libc-client < %{version}-%{release} +Obsoletes: libc-client2006 < 2006k-1 +%if "%{imap_libs}" != "libc-client2007" +Obsoletes: libc-client2007 < 2007-2 %endif %description -n %{imap_libs} Provides a common API for accessing mailboxes. @@ -85,9 +94,11 @@ Group: Development/Libraries Requires: %{imap_libs} = %{version}-%{release} # imap -> uw-imap rename Obsoletes: imap-devel < 1:%{version} -%if 0%{?fedora} > 6 +%if "%{imap_libs}" == "libc-client" Obsoletes: libc-client-devel < %{version}-%{release} Provides: libc-client-devel = %{version}-%{release} +%else +Conflicts: libc-client-devel < %{version}-%{release} %endif %description devel Contains the header files and libraries for developing programs @@ -97,9 +108,10 @@ which will use the UW C-client common API. Summary: UW IMAP static library Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} +#Provides: libc-client-static = %{version}-%{release} Requires: krb5-devel openssl-devel pam-devel %description static -Contains static libraries for developing programs +Contains static libraries for developing programs which will use the UW C-client common API. %package utils @@ -108,11 +120,18 @@ Group: Applications/System # imap -> uw-imap rename Obsoletes: imap-utils < 1:%{version} %description utils -This package contains some utilities for managing UW IMAP email. +This package contains some utilities for managing UW IMAP email,including: +* dmail : procmail Mail Delivery Module +* mailutil : mail utility program +* mtest : C client test program +* tmail : Mail Delivery Module +* mlock + %prep -%setup -q -n imap-%{version}%{?dev}%{?snap} +#setup -q -n imap-%{version}%{?dev}%{?snap} +%setup -q -n imap-2007a %patch1 -p1 -b .paths %patch2 -p1 -b .doc @@ -178,8 +197,9 @@ install -m644 ./c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap/ install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/ install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/ -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/ -install -p -m644 src/{ipopd/ipopd,imapd/imapd}.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +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 + mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -p -m755 ipopd/ipop{2d,3d} $RPM_BUILD_ROOT%{_sbindir}/ install -p -m755 imapd/imapd $RPM_BUILD_ROOT%{_sbindir}/ @@ -207,7 +227,7 @@ touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf -# FIXME, do this on daemon startup -- Rex +# FIXME -- Rex %post { cd %{sslcerts} &> /dev/null || : @@ -289,6 +309,30 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 19 2008 Rex Dieter 2007a1-2 +- uw-imap conflicts with cyrus-imapd (#222486) + +* Wed Mar 19 2008 Rex Dieter 2007a1-1 +- imap-2007a1 +- include static lib +- utils: update %%description + +* Thu Mar 13 2008 Rex Dieter 2007a-1 +- imap-2007a + +* Fri Feb 08 2008 Rex Dieter 2007-3 +- respin (gcc43) + +* Wed Jan 23 2008 Rex Dieter 2007-2 +- Obsoletes: libc-client2006 (#429796) +- drop libc-client hacks for parallel-installability, fun while it lasted + +* Fri Dec 21 2007 Rex Dieter 2007-1 +- imap-2007 + +* Tue Dec 04 2007 Rex Dieter 2006k-2 +- respin for new openssl + * Fri Nov 09 2007 Rex Dieter 2006k-1 - imap-2006k (final)