rpms/libc-client/devel .cvsignore, 1.2, 1.3 imap-2000c-redhat-flock.patch, 1.1, 1.2 libc-client.spec, 1.13, 1.14 sources, 1.2, 1.3

Thu Jan 5 15:22:41 UTC 2006

Author: jorton

Update of /cvs/dist/rpms/libc-client/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26530

Modified Files:
	.cvsignore imap-2000c-redhat-flock.patch libc-client.spec 
	sources 
Log Message:
* Thu Jan  5 2006 Jonathan Kamens <jik at kamens.brookline.ma.us> 2004g-1
- Upstream version 2004g (#176974)
- Remove obsolete doc file "WARNING"
- Remove security patch included in new upstream version
- Custom flock code no longer necessary; included in upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	9 Sep 2004 07:20:42 -0000	1.2
+++ .cvsignore	5 Jan 2006 15:22:39 -0000	1.3
@@ -1 +1,2 @@
 imap-2002e.tar.Z
+imap-2004g.tar.Z

imap-2000c-redhat-flock.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: imap-2000c-redhat-flock.patch
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/imap-2000c-redhat-flock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imap-2000c-redhat-flock.patch	9 Sep 2004 07:20:42 -0000	1.1
+++ imap-2000c-redhat-flock.patch	5 Jan 2006 15:22:39 -0000	1.2
@@ -1,11 +1,11 @@
---- imap-2000c/src/osdep/unix/Makefile.redhat-flock	Fri May 18 01:25:48 2001
-+++ imap-2000c/src/osdep/unix/Makefile	Fri May 18 01:29:49 2001
-@@ -90,7 +90,7 @@
- BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
+--- imap-2004g/src/osdep/unix/Makefile.redhat-flock	2006-01-05 15:08:57.000000000 +0000
++++ imap-2004g/src/osdep/unix/Makefile	2006-01-05 15:09:17.000000000 +0000
+@@ -128,7 +128,7 @@
+ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-- unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-+ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o flock.o
+- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
++ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o flock.o
  CFLAGS=-g
  
  CAT=cat


Index: libc-client.spec
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/libc-client.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libc-client.spec	9 Dec 2005 22:41:31 -0000	1.13
+++ libc-client.spec	5 Jan 2006 15:22:39 -0000	1.14
@@ -4,27 +4,24 @@
 
 Summary: C-client mail access routines for IMAP and POP protocols
 Name: libc-client
-Version: 2002e
-Release: 18.1
+Version: 2004g
+Release: 1
 License: University of Washington Free-Fork License
 Group: System Environment/Daemons
 URL: http://www.washington.edu/imap/
 
-Source0: imap-%{version}.tar.Z
-Source1: flock.c
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 
 Patch0: imap-2002e-redhat-ssl.patch
-Patch1: imap-2000-linux.patch
+Patch1: imap-2004g-linux.patch
 Patch2: imap-2001a-mbox-disable.patch
 Patch3: imap-2002b-krbpath.patch
-Patch4: imap-2000c-redhat-flock.patch
 Patch5: imap-2001a-overflow.patch
-Patch6: imap-2002e-redhat-version.patch
+Patch6: imap-2004g-redhat-version.patch
 Patch7: imap-2002d-ssltype.patch
 Patch8: imap-2002e-cclient-only.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2002d-cve2005-2933.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -58,7 +55,6 @@
 
 %patch3 -p1 -b .gssapi-patch
 
-%patch4 -p1 -b .redhat-flock
 %patch5 -p1 -b .overflow
 %patch6 -p1 -b .redhat-version
 
@@ -66,15 +62,13 @@
 %patch8 -p1 -b .cclient-only
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-%patch11 -p1 -b .cve2005-2933
-
-cp %{SOURCE1} src/osdep/unix/
 
 %build
 # Set EXTRACFLAGS here instead of in imap-2000-redhat.patch (#20760)
 EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1 -DIGNORE_LOCK_EACCES_ERRORS=1"
 EXTRACFLAGS="$EXTRACFLAGS -I/usr/include/openssl"
-EXTRACFLAGS="$EXTRACFLAGS -fPIC"
+EXTRACFLAGS="$EXTRACFLAGS -fPIC -fno-strict-aliasing"
+EXTRACFLAGS="$EXTRACFLAGS -Wall -Wno-pointer-sign -Wno-parentheses"
 
 make lnp \
 EXTRACFLAGS="$EXTRACFLAGS" \
@@ -115,7 +109,7 @@
 
 %files
 %defattr(-,root,root)
-%doc CPYRIGHT README WARNING docs/RELNOTES docs/*.txt
+%doc CPYRIGHT README docs/RELNOTES docs/*.txt
 %doc docs/CONFIG docs/SSLBUILD
 %{_libdir}/lib%{soname}.so.*
 
@@ -128,6 +122,12 @@
 %{_libdir}/lib%{soname}.so
 
 %changelog
+* Thu Jan  5 2006 Jonathan Kamens <jik at kamens.brookline.ma.us> 2004g-1
+- Upstream version 2004g (#176974)
+- Remove obsolete doc file "WARNING"
+- Remove security patch included in new upstream version
+- Custom flock code no longer necessary; included in upstream
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 07:20:42 -0000	1.2
+++ sources	5 Jan 2006 15:22:39 -0000	1.3
@@ -1 +1 @@
-0d246d868f20d8c441d235b77c940676  imap-2002e.tar.Z
+5749cc4d1fa8e7a72853729906c0ae9e  imap-2004g.tar.Z


