Hello community, here is the log from the commit of package imap checked in at Thu Dec 7 20:33:22 CET 2006. -------- --- imap/imap.changes 2006-02-02 11:26:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/imap/imap.changes 2006-11-16 12:06:57.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Nov 16 10:11:37 CET 2006 - mskibbe@suse.de + +- update to version 2006c1 which + o fix bugs + o fix bug( Bug 217287 - imap-2004g_suse-28: use of dangerous + "gets" function ) + o fix bug( Bug 144598 - imap-2004g_suse-4: dodgy code ) + +------------------------------------------------------------------- Old: ---- imap-2004g.tar.bz2 New: ---- imap-2006c1.diff imap-2006c1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imap.spec ++++++ --- /var/tmp/diff_new_pack.bPkgkf/_old 2006-12-07 20:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bPkgkf/_new 2006-12-07 20:26:35.000000000 +0100 @@ -1,11 +1,11 @@ # -# spec file for package imap (Version 2004g_suse) +# spec file for package imap (Version 2006c1_suse) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,12 +13,12 @@ Name: imap BuildRequires: openssl-devel pam-devel URL: http://www.washington.edu/imap/ -License: BSD +License: BSD License and BSD-like Group: Productivity/Networking/Email/Servers -Version: 2004g_suse -Release: 4 +Version: 2006c1_suse +Release: 2 Summary: IMAP4, POP2, and POP3 Mail Server -Source0: imap-2004g.tar.bz2 +Source0: imap-2006c1.tar.bz2 Source1: README.SuSE # pam config Source2: imap.pamd @@ -33,6 +33,7 @@ Patch3: imap-2004-cflags.diff Patch4: imap-2001a-overflow.diff Patch5: imap-2002c-c++.diff +Patch6: imap-2006c1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pam inet-daemon PreReq: bash /bin/echo /bin/mv @@ -78,13 +79,14 @@ Mark Crispin <mrc@cac.washington.edu> %prep -%setup -n imap-2004g +%setup -n imap-2006c1 %patch0 %patch1 %patch2 %patch3 %patch4 %patch5 +%patch6 %build export CFLAGS="$RPM_OPT_FLAGS -DDISABLE_POP_PROXY=1 -fPIC -fno-strict-aliasing -fstack-protector" @@ -103,7 +105,7 @@ install -m 644 src/imapd/imapd.8 $RPM_BUILD_ROOT/usr/share/man/man8/imapd.8 install -m 644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT/usr/share/man/man8/ipopd.8 install -m 644 $RPM_SOURCE_DIR/README.SuSE $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ -install -m 644 CONTENTS CPYRIGHT README docs/RELNOTES $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ +install -m 644 CONTENTS README docs/RELNOTES $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ install -m 644 docs/{FAQ,bugs,imaprc,md5,naming,drivers}.txt $RPM_BUILD_ROOT/usr/share/doc/packages/imap/ mkdir -p $RPM_BUILD_ROOT/%{_includedir}/imap cp src/osdep/tops-20/*.h $RPM_BUILD_ROOT/%{_includedir}/imap @@ -166,6 +168,12 @@ fi %changelog -n imap +* Thu Nov 16 2006 - mskibbe@suse.de +- update to version 2006c1 which + o fix bugs + o fix bug( Bug 217287 - imap-2004g_suse-28: use of dangerous + "gets" function ) + o fix bug( Bug 144598 - imap-2004g_suse-4: dodgy code ) * Thu Feb 02 2006 - ro@suse.de - give libc-client.so a SONAME * Wed Jan 25 2006 - mls@suse.de ++++++ imap-2002c-c++.diff ++++++ --- /var/tmp/diff_new_pack.bPkgkf/_old 2006-12-07 20:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bPkgkf/_new 2006-12-07 20:26:35.000000000 +0100 @@ -1,6 +1,6 @@ --- src/c-client/c-client.h +++ src/c-client/c-client.h -@@ -23,11 +23,6 @@ +@@ -31,11 +31,6 @@ #ifdef __cplusplus /* help out people who use C++ compilers */ extern "C" { @@ -12,8 +12,8 @@ #endif #include "mail.h" /* primary interfaces */ -@@ -43,7 +38,6 @@ - #undef LOCAL /* undo driver mischief */ +@@ -47,7 +42,6 @@ + #include "misc.h" /* miscellaneous utility routines */ #ifdef __cplusplus /* undo the C++ mischief */ -#undef private @@ -22,10 +22,10 @@ --- src/c-client/mail.h +++ src/c-client/mail.h -@@ -696,7 +696,11 @@ +@@ -813,7 +813,11 @@ + unsigned int sequence : 1; /* saved sequence bit */ unsigned int dirty : 1; /* driver internal use */ unsigned int filter : 1; /* driver internal use */ - unsigned long data; /* driver internal use */ +#ifndef __cplusplus } private; +#else @@ -34,7 +34,7 @@ /* internal date */ unsigned int day : 5; /* day of month (1-31) */ unsigned int month : 4; /* month of year (1-12) */ -@@ -807,8 +811,13 @@ +@@ -924,8 +928,13 @@ SEARCHPGM { /* search program */ SEARCHSET *msgno; /* message numbers */ SEARCHSET *uid; /* unique identifiers */ @@ -48,16 +48,17 @@ SEARCHHEADER *header; /* list of headers */ STRINGLIST *bcc; /* bcc recipients */ STRINGLIST *body; /* text in message body */ -@@ -982,7 +991,12 @@ - long result; /* search result */ +@@ -1108,8 +1117,12 @@ char *text; /* cache of fetched text */ } search; + STRING string; /* stringstruct return hack */ +#ifndef __cplusplus } private; +- /* reserved for use by main program */ +#else + } cclientPrivate; +#endif -+ - /* reserved for use by main program */ ++ /* RESERVed for use by main program */ + void *sparep; /* spare pointer */ unsigned int spare : 1; /* first spare bit */ unsigned int spare2 : 1; /* second spare bit */ ++++++ imap-2004-cflags.diff ++++++ --- /var/tmp/diff_new_pack.bPkgkf/_old 2006-12-07 20:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.bPkgkf/_new 2006-12-07 20:26:35.000000000 +0100 @@ -1,11 +1,12 @@ --- src/osdep/unix/Makefile +++ src/osdep/unix/Makefile -@@ -454,7 +454,7 @@ - SPOOLDIR=/var/spool \ - ACTIVEFILE=/var/lib/news/active \ - RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \ -+ BASECFLAGS="${MYCFLAGS}" \ - BASELDFLAGS="$(PAMLDFLAGS)" +@@ -48,7 +48,8 @@ + # Try to have some consistency in GCC builds. We want optimization, but we + # also want to be able to debug. + +-GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer ++#GCCCFLAGS= -g $(GCCOPTLEVEL) -pipe -fno-omit-frame-pointer ++GCCCFLAGS=${MYCFLAGS} + GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign + - lnx: # Linux non-shadow passwords ++++++ imap-2006c1.diff ++++++ --- Makefile +++ Makefile @@ -529,7 +529,8 @@ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @echo @echo Do you want to build with IPv6 anyway? Type y or n please: - @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make clean;exit 1);; esac' + @$(SH) -c 'read x; case "$$x" in *) exit 0;; esac' +# *) (make clean;exit 1);; esac' @echo OK, I will remember that you really want to build with IPv6. @echo You will not see this message again. @$(TOUCH) ip6 --- src/c-client/mail.c +++ src/c-client/mail.c @@ -2906,8 +2906,10 @@ /* parse time */ d = strtoul (s+1,(char **) &s,10); if (*s != ':') return NIL; - m = strtoul (++s,(char **) &s,10); - y = (*s == ':') ? strtoul (++s,(char **) &s,10) : 0; + s++; + m = strtoul (s,(char **) &s,10); + s++; + y = (*s == ':') ? strtoul (s,(char **) &s,10) : 0; /* validity check time */ if ((d > 23) || (m > 59) || (y > 60)) return NIL; /* set values in elt */ --- src/mlock/mlock.c +++ src/mlock/mlock.c @@ -38,8 +38,10 @@ #include <sys/param.h> #include <stdlib.h> #include <netdb.h> +#include <unistd.h> #include <ctype.h> #include <strings.h> +#include <string.h> #define LOCKTIMEOUT 5 /* lock timeout in minutes */ #define LOCKPROTECTION 0775 --- src/osdep/unix/mbx.c +++ src/osdep/unix/mbx.c @@ -37,6 +37,7 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> +#include <utime.h> extern int errno; /* just in case */ #include "mail.h" #include "osdep.h" --- src/osdep/unix/mh.c +++ src/osdep/unix/mh.c @@ -35,6 +35,7 @@ #include "osdep.h" #include <pwd.h> #include <time.h> +#include <utime.h> #include <sys/stat.h> #include <sys/time.h> #include "misc.h" --- src/osdep/unix/mmdf.c +++ src/osdep/unix/mmdf.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> +#include <utime.h> extern int errno; /* just in case */ #include <signal.h> #include "mail.h" --- src/osdep/unix/mtx.c +++ src/osdep/unix/mtx.c @@ -35,6 +35,7 @@ */ #include <stdio.h> +#include <utime.h> #include <ctype.h> #include <errno.h> extern int errno; /* just in case */ --- src/osdep/unix/mx.c +++ src/osdep/unix/mx.c @@ -35,6 +35,7 @@ #include "osdep.h" #include <pwd.h> #include <time.h> +#include <utime.h> #include <sys/stat.h> #include <sys/time.h> #include "misc.h" --- src/osdep/unix/tenex.c +++ src/osdep/unix/tenex.c @@ -41,6 +41,7 @@ #include <stdio.h> #include <ctype.h> +#include <utime.h> #include <errno.h> extern int errno; /* just in case */ #include "mail.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org