rpms/uw-imap/FC-5 imap-2006-mixproto.patch, NONE, 1.1 imap-2006-paths.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 uw-imap.spec, 1.8, 1.9 imap-2004-paths.patch, 1.1, NONE imap-2004c1-mbxproto.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Sep 21 15:57:38 UTC 2006 

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8934

Modified Files:
	.cvsignore sources uw-imap.spec 
Added Files:
	imap-2006-mixproto.patch imap-2006-paths.patch 
Removed Files:
	imap-2004-paths.patch imap-2004c1-mbxproto.patch 
Log Message:
* Fri Sep 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006-2
- imap-2006
- change default (CREATEPROTO) driver to mix
- Obsolete old libc-clients


imap-2006-mixproto.patch:

--- NEW FILE imap-2006-mixproto.patch ---
--- imap-2004c1/src/osdep/unix/Makefile.mbxproto	2005-04-28 12:44:53.000000000 -0500
+++ imap-2004c1/src/osdep/unix/Makefile	2005-04-28 12:59:29.000000000 -0500
@@ -91,7 +91,7 @@
 # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
 # formats can never be empty files.
 
-CREATEPROTO=unixproto
+CREATEPROTO=mixproto
 EMPTYPROTO=unixproto
 
 

imap-2006-paths.patch:

--- NEW FILE imap-2006-paths.patch ---
--- 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"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 20:26:23 -0000	1.2
+++ .cvsignore	21 Sep 2006 15:57:38 -0000	1.3
@@ -1 +1 @@
-imap-2004g.tar.Z
+imap-2006.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 20:26:23 -0000	1.2
+++ sources	21 Sep 2006 15:57:38 -0000	1.3
@@ -1 +1 @@
-9a80f58d8d6a0979c13714ae69050020  imap-2004g.tar.Z
+ab38578a0b00cbed6c3957898d70f76b  imap-2006.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- uw-imap.spec	1 Mar 2006 15:52:51 -0000	1.8
+++ uw-imap.spec	21 Sep 2006 15:57:38 -0000	1.9
@@ -5,14 +5,14 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2004g
-Release: 4%{?dist}.2
+Version: 2006
+Release: 2%{?dist}
 
 License: University of Washington Free-Fork License
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source:	 ftp://ftp.cac.washington.edu/imap/imap-2004g.tar.Z
+Source:	 ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -29,22 +29,21 @@
 Obsoletes: imap < 1:%{version}
 
 # legacy/old pam setup, using pam_stack.so
-Source1: imap.pam
+Source1: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source2: imap.fc5.pam
+Source2: imap.pam
 Source3: imap-xinetd
 Source4: ipop2-xinetd
 Source5: ipop3-xinetd
 Source6: imaps-xinetd
 Source7: pop3s-xinetd
 
-Patch1: imap-2004-paths.patch
-Patch2: imap-2004d-optflags.patch
+Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2004c1-mbxproto.patch
+Patch11: imap-2006-mixproto.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -66,6 +65,8 @@
 %package -n %{imap_libs} 
 Summary: UW C-client mail library 
 Group:	 System Environment/Libraries
+Obsoletes: libc-client2004d < 1:2004d-2
+Obsoletes: libc-client2004e < 2004e-2
 %description -n %{imap_libs} 
 Provides a common API for accessing mailboxes. 
 
@@ -93,7 +94,6 @@
 %setup -q -n imap-%{version}
 
 %patch1 -p1 -b .paths
-%patch2 -p1 -b .optflags
 
 %patch5 -p1 -b .overflow
 
@@ -101,11 +101,11 @@
 
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-# use mbx (instead of unix/mbox) folder format by default
+# use mix (instead of unix/mbox) folder format by default
 # its faster, allows (better) locking
-%patch11 -p1 -b .mbxproto
+%patch11 -p1 -b .mixproto
 
-%if "%{?fedora}" > "4"
+%if "%{?fedora}" > "4" || "%{?rhel}" > "5"
 install -p -m644 %{SOURCE2} imap.pam
 %else
 install -p -m644 %{SOURCE1} imap.pam
@@ -113,10 +113,10 @@
 
 
 %build
-# Not sure why this is included, omitting for now -- Rex
+# Not sure why this was ever included, omitting for now -- Rex
 #EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1"
 
-# Kerberos setup (proabably legacy-only -- Rex)
+# Kerberos setup
 if [ -x %{_sysconfdir}/profile.d/krb5.sh ]; then
   . %{_sysconfdir}/profile.d/krb5.sh
 elif ! echo ${PATH} | grep -q %{_prefix}kerberos/bin ; then
@@ -124,7 +124,8 @@
 fi
 GSSDIR=$(krb5-config --prefix)
 
-# SSL setup (probably legacy-only -- Rex)
+## SSL setup
+# (probably legacy-only) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
 
 make %{?_smp_mflags} lnp \
@@ -233,7 +234,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc docs/SSLBUILD
 %config %{_sysconfdir}/pam.d/imap
 %config %{_sysconfdir}/pam.d/pop
@@ -252,7 +253,7 @@
 %{_sbindir}/imapd
 
 %files utils
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %attr(2755, root, mail) %{_sbindir}/mlock
 %{_mandir}/man1/*
@@ -263,7 +264,7 @@
 %{_libdir}/lib%{soname}.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/imap/
 %{_libdir}/c-client.a
 %{_libdir}/libc-client.a
@@ -271,6 +272,17 @@
 
 
 %changelog
+* Fri Sep 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006-2
+- imap-2006
+- change default (CREATEPROTO) driver to mix
+- Obsolete old libc-clients
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2004g-6 
+- fc6 respin
+
+* Fri Aug 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2004g-5
+- cleanup, respin for fc6
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
 - fc5: gcc/glibc respin
 


--- imap-2004-paths.patch DELETED ---


--- imap-2004c1-mbxproto.patch DELETED ---

More information about the fedora-extras-commits mailing list