Hello community,
here is the log from the commit of package imap for openSUSE:Factory
checked in at Thu Feb 4 08:51:30 CET 2010.
--------
--- imap/imap.changes 2009-11-03 20:18:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/imap/imap.changes 2009-12-18 21:15:24.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Dec 18 18:39:49 UTC 2009 - chris@computersalat.de
+
+- update to 2007e which
+ o fix bugs
+- cleanup spec
+ o sort tags
+ o {name} macro
+- rework patches
+ o imap-2002c-c++.diff > imap-2007e-c++.patch
+ o imap-2006c1.diff > imap-2007e.patch
+- rpmlint
+ o deprecated-use-of-%run_ldconfig
+ o shlib-policy-name-error
+ - renamed sub-pkg 'lib' to 'libc-client2007e_suse'
+ o files-duplicate {_includedir}
+ - added rpmlintrc
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
imap-2002c-c++.diff
imap-2006c1.diff
imap-2006c1.tar.bz2
New:
----
imap-2007e-c++.patch
imap-2007e.patch
imap-2007e.tar.bz2
imap.rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ imap.spec ++++++
--- /var/tmp/diff_new_pack.oKUg1g/_old 2010-02-04 08:50:56.000000000 +0100
+++ /var/tmp/diff_new_pack.oKUg1g/_new 2010-02-04 08:50:56.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package imap (Version 2006c1_suse)
+# spec file for package imap (Version 2007e_suse)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,33 +19,39 @@
Name: imap
-BuildRequires: openssl-devel pam-devel
-Url: http://www.washington.edu/imap/
+Summary: IMAP4, POP2, and POP3 Mail Server
+Version: 2007e_suse
+Release: 1
License: Apache Software License ..
Group: Productivity/Networking/Email/Servers
-Version: 2006c1_suse
-Release: 130
-Summary: IMAP4, POP2, and POP3 Mail Server
-Source0: imap-2006c1.tar.bz2
+Url: http://www.washington.edu/imap/
+Source0: %{name}-2007e.tar.bz2
Source1: README.SuSE
# pam config
-Source2: imap.pamd
+Source2: %{name}.pamd
Source3: pop.pamd
# xinetd config
-Source4: imap.xinetd
+Source4: %{name}.xinetd
# c-client config
Source5: c-client.cf
Source6: %name.firewall
-Patch0: imap-2001a-include.diff
-Patch1: imap-2004a-doc.diff
-Patch2: imap-2002e-ssl.diff
-Patch3: imap-2004-cflags.diff
-Patch4: imap-2001a-overflow.diff
-Patch5: imap-2002c-c++.diff
-Patch6: imap-2006c1.diff
+Source100: %{name}.rpmlintrc
+Patch0: %{name}-2001a-include.diff
+Patch1: %{name}-2004a-doc.diff
+Patch2: %{name}-2002e-ssl.diff
+Patch3: %{name}-2004-cflags.diff
+Patch4: %{name}-2001a-overflow.diff
+#Patch5: %{name}-2002c-c++.patch
+Patch5: %{name}-2007e-c++.patch
+#Patch6: %{name}-2006c1.diff
+Patch6: %{name}-2007e.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: pam inet-daemon
PreReq: bash /bin/echo /bin/mv
+BuildRequires: openssl-devel pam-devel
+%if 0%{?suse_version} >= 1100
+BuildRequires: fdupes
+%endif
+Requires: pam inet-daemon
%description
This package contains IMAP4, POP2, and POP3 mail servers.
@@ -58,13 +64,13 @@
--------
Mark Crispin
-%package lib
-License: BSD 3-clause (or similar)
+%package -n libc-client2007e_suse
Summary: IMAP4rev1/c-client Development Environment
+License: BSD3c(or similar)
Group: Development/Libraries/C and C++
-Provides: imap-devel:/usr/lib/libc-client.so
+Provides: %{name}-devel:/usr/lib/libc-client.so
-%description lib
+%description -n libc-client2007e_suse
This package contains the libraries for IMAP client programs.
@@ -74,10 +80,11 @@
Mark Crispin
%package devel
-License: BSD 3-clause (or similar)
Summary: IMAP4rev1/c-client Development Environment
+License: BSD3c(or similar)
Group: Development/Libraries/C and C++
-Requires: imap-lib = %version
+#Requires: %{name}-lib = %version
+Requires: libc-client2007e_suse = %{version}
%description devel
This package contains the libraries and header files for IMAP client
@@ -90,14 +97,14 @@
Mark Crispin
%prep
-%setup -n imap-2006c1
+%setup -n %{name}-2007e
%patch0
%patch1
%patch2
%patch3
%patch4
-%patch5
-%patch6
+%patch5 -p1
+%patch6 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -DDISABLE_POP_PROXY=1 -fPIC -fno-strict-aliasing -fstack-protector"
@@ -109,21 +116,21 @@
mkdir -p $RPM_BUILD_ROOT/usr/{sbin,share/man/man8,share/doc/packages/imap}
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
install -m 755 imapd/imapd ipopd/ipop2d ipopd/ipop3d mtest/mtest $RPM_BUILD_ROOT/usr/sbin/
-install -m 644 $RPM_SOURCE_DIR/imap.pamd ${RPM_BUILD_ROOT}/etc/pam.d/imap
+install -m 644 $RPM_SOURCE_DIR/%{name}.pamd ${RPM_BUILD_ROOT}/etc/pam.d/%{name}
install -m 644 $RPM_SOURCE_DIR/pop.pamd ${RPM_BUILD_ROOT}/etc/pam.d/pop
-install -m 644 -D $RPM_SOURCE_DIR/imap.xinetd $RPM_BUILD_ROOT/etc/xinetd.d/imap
+install -m 644 -D $RPM_SOURCE_DIR/%{name}.xinetd $RPM_BUILD_ROOT/etc/xinetd.d/%{name}
install -m 644 $RPM_SOURCE_DIR/c-client.cf ${RPM_BUILD_ROOT}/etc/c-client.cf
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 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
-cp src/osdep/unix/*.h $RPM_BUILD_ROOT/%{_includedir}/imap
-cp src/c-client/*.h $RPM_BUILD_ROOT/%{_includedir}/imap
-cp c-client/linkage.{h,c} $RPM_BUILD_ROOT/%{_includedir}/imap
-cp c-client/osdep.h $RPM_BUILD_ROOT/%{_includedir}/imap
+install -m 644 $RPM_SOURCE_DIR/README.SuSE $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/
+install -m 644 CONTENTS README docs/RELNOTES $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/
+install -m 644 docs/{FAQ,bugs,imaprc,md5,naming,drivers}.txt $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/
+mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}
+cp src/osdep/tops-20/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
+cp src/osdep/unix/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
+cp src/c-client/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
+cp c-client/linkage.{h,c} $RPM_BUILD_ROOT/%{_includedir}/%{name}
+cp c-client/osdep.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
mkdir -p $RPM_BUILD_ROOT/%{_libdir}
install -m 644 c-client/c-client.a $RPM_BUILD_ROOT/%{_libdir}/libc-client.a
ln -sf libc-client.a $RPM_BUILD_ROOT/%{_libdir}/c-client.a
@@ -134,28 +141,44 @@
ln -sf ../usr/sbin/ipop2d $RPM_BUILD_ROOT/etc/rpop2d
install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+# rpmlint
+%if 0%{?suse_version} >= 1100
+%fdupes $RPM_BUILD_ROOT%{_includedir}
+%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post
+if [ -f /usr/share/ssl/certs/imapd.pem ] ; then
+ if [ ! -f /etc/ssl/certs/imapd.pem ] ; then
+ echo "moving imapd certificate to /etc/ssl/certs"
+ mv /usr/share/ssl/certs/imapd.pem /etc/ssl/certs/
+ fi
+fi
+if [ -f /usr/share/ssl/certs/ipop3d.pem ] ; then
+ if [ ! -f /etc/ssl/certs/ipop3d.pem ] ; then
+ echo "moving ipop3d certificate to /etc/ssl/certs"
+ mv /usr/share/ssl/certs/ipop3d.pem /etc/ssl/certs/
+ fi
+fi
-%post lib
-%run_ldconfig
+%post -n libc-client2007e_suse -p /sbin/ldconfig
-%postun lib
-%run_ldconfig
+%postun -n libc-client2007e_suse -p /sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
%files
%defattr (-,root,root)
/usr/sbin/*
/usr/share/man/man8/*
%config /etc/pam.d/*
-%config(noreplace) /etc/xinetd.d/imap
+%config(noreplace) /etc/xinetd.d/%{name}
/etc/rimapd
/etc/rpop3d
/etc/rpop2d
-%doc /usr/share/doc/packages/imap
+%doc /usr/share/doc/packages/%{name}
-%files lib
+%files -n libc-client2007e_suse
%defattr (-,root,root)
%config(noreplace) /etc/c-client.cf
%{_libdir}/*.so
@@ -165,20 +188,6 @@
%files devel
%defattr (-,root,root)
%{_libdir}/*.a
-%{_includedir}/imap
-
-%post
-if [ -f /usr/share/ssl/certs/imapd.pem ] ; then
- if [ ! -f /etc/ssl/certs/imapd.pem ] ; then
- echo "moving imapd certificate to /etc/ssl/certs"
- mv /usr/share/ssl/certs/imapd.pem /etc/ssl/certs/
- fi
-fi
-if [ -f /usr/share/ssl/certs/ipop3d.pem ] ; then
- if [ ! -f /etc/ssl/certs/ipop3d.pem ] ; then
- echo "moving ipop3d certificate to /etc/ssl/certs"
- mv /usr/share/ssl/certs/ipop3d.pem /etc/ssl/certs/
- fi
-fi
+%{_includedir}/%{name}
%changelog
++++++ imap-2007e-c++.patch ++++++
diff -ruN imap-2007e-orig/src/c-client/c-client.h imap-2007e/src/c-client/c-client.h
--- imap-2007e-orig/src/c-client/c-client.h 2008-06-04 18:18:34.000000000 +0000
+++ imap-2007e/src/c-client/c-client.h 2009-12-18 18:33:08.672359365 +0000
@@ -31,11 +31,6 @@
#ifdef __cplusplus /* help out people who use C++ compilers */
extern "C" {
- /* If you use gcc, you may also have to use -fno-operator-names */
-#define private cclientPrivate /* private to c-client */
-#define and cclientAnd /* C99 doesn't realize that ISO 646 is dead */
-#define or cclientOr
-#define not cclientNot
#endif
#include "mail.h" /* primary interfaces */
@@ -48,7 +43,6 @@
#include "misc.h" /* miscellaneous utility routines */
#ifdef __cplusplus /* undo the C++ mischief */
-#undef private
}
#endif
diff -ruN imap-2007e-orig/src/c-client/mail.h imap-2007e/src/c-client/mail.h
--- imap-2007e-orig/src/c-client/mail.h 2008-12-16 23:21:34.000000000 +0000
+++ imap-2007e/src/c-client/mail.h 2009-12-18 18:36:50.946447125 +0000
@@ -826,7 +826,11 @@
unsigned int dirty : 1; /* driver internal use */
unsigned int filter : 1; /* driver internal use */
unsigned int ghost : 1; /* driver internal use */
+#ifndef __cplusplus
} private;
+#else
+ } cclientPrivate;
+#endif
/* internal date */
unsigned int day : 5; /* day of month (1-31) */
unsigned int month : 4; /* month of year (1-12) */
@@ -937,8 +941,13 @@
SEARCHPGM { /* search program */
SEARCHSET *msgno; /* message numbers */
SEARCHSET *uid; /* unique identifiers */
+#ifndef __cplusplus
SEARCHOR *or; /* or'ed in programs */
SEARCHPGMLIST *not; /* and'ed not program */
+#else
+ SEARCHOR *cclientOr; /* or'ed in programs */
+ SEARCHPGMLIST *cclientNot; /* and'ed not program */
+#endif
SEARCHHEADER *header; /* list of headers */
STRINGLIST *bcc; /* bcc recipients */
STRINGLIST *body; /* text in message body */
@@ -1123,8 +1132,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 */
void *sparep; /* spare pointer */
unsigned int spare : 1; /* first spare bit */
unsigned int spare2 : 1; /* second spare bit */
++++++ imap-2007e.patch ++++++
diff -ruN imap-2007e-2001a-include/Makefile imap-2007e/Makefile
--- imap-2007e-2001a-include/Makefile 2008-06-04 18:43:35.000000000 +0000
+++ imap-2007e/Makefile 2009-12-18 19:19:29.246393113 +0000
@@ -638,7 +638,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 noip6;exit 1);; esac'
+ @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 0;; esac'
+# *) (make noip6;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
diff -ruN imap-2007e-2001a-include/src/c-client/mail.c imap-2007e/src/c-client/mail.c
--- imap-2007e-2001a-include/src/c-client/mail.c 2008-06-04 18:39:54.000000000 +0000
+++ imap-2007e/src/c-client/mail.c 2009-12-18 19:05:31.284336262 +0000
@@ -2931,8 +2931,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 */
diff -ruN imap-2007e-2001a-include/src/mlock/mlock.c imap-2007e/src/mlock/mlock.c
--- imap-2007e-2001a-include/src/mlock/mlock.c 2008-06-04 18:18:34.000000000 +0000
+++ imap-2007e/src/mlock/mlock.c 2009-12-18 19:05:31.284336262 +0000
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
diff -ruN imap-2007e-2001a-include/src/osdep/unix/mbx.c imap-2007e/src/osdep/unix/mbx.c
--- imap-2007e-2001a-include/src/osdep/unix/mbx.c 2008-06-04 18:18:34.000000000 +0000
+++ imap-2007e/src/osdep/unix/mbx.c 2009-12-18 19:05:31.284336262 +0000
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
extern int errno; /* just in case */
#include "mail.h"
#include "osdep.h"
diff -ruN imap-2007e-2001a-include/src/osdep/unix/mh.c imap-2007e/src/osdep/unix/mh.c
--- imap-2007e-2001a-include/src/osdep/unix/mh.c 2009-12-18 19:04:25.449346000 +0000
+++ imap-2007e/src/osdep/unix/mh.c 2009-12-18 19:06:12.366202134 +0000
@@ -35,6 +35,7 @@
#include "osdep.h"
#include
#include
+#include
#include
#include
#include "misc.h"
diff -ruN imap-2007e-2001a-include/src/osdep/unix/mmdf.c imap-2007e/src/osdep/unix/mmdf.c
--- imap-2007e-2001a-include/src/osdep/unix/mmdf.c 2008-06-04 18:39:54.000000000 +0000
+++ imap-2007e/src/osdep/unix/mmdf.c 2009-12-18 19:05:31.292336625 +0000
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
extern int errno; /* just in case */
#include
#include "mail.h"
diff -ruN imap-2007e-2001a-include/src/osdep/unix/mtx.c imap-2007e/src/osdep/unix/mtx.c
--- imap-2007e-2001a-include/src/osdep/unix/mtx.c 2008-06-04 18:18:34.000000000 +0000
+++ imap-2007e/src/osdep/unix/mtx.c 2009-12-18 19:05:31.292336625 +0000
@@ -35,6 +35,7 @@
*/
#include
+#include
#include
#include
extern int errno; /* just in case */
diff -ruN imap-2007e-2001a-include/src/osdep/unix/mx.c imap-2007e/src/osdep/unix/mx.c
--- imap-2007e-2001a-include/src/osdep/unix/mx.c 2009-12-18 19:04:25.449346000 +0000
+++ imap-2007e/src/osdep/unix/mx.c 2009-12-18 19:06:23.634713928 +0000
@@ -35,6 +35,7 @@
#include "osdep.h"
#include
#include
+#include
#include
#include
#include "misc.h"
diff -ruN imap-2007e-2001a-include/src/osdep/unix/tenex.c imap-2007e/src/osdep/unix/tenex.c
--- imap-2007e-2001a-include/src/osdep/unix/tenex.c 2008-06-04 18:18:34.000000000 +0000
+++ imap-2007e/src/osdep/unix/tenex.c 2009-12-18 19:05:31.292336625 +0000
@@ -41,6 +41,7 @@
#include
#include
+#include
#include
extern int errno; /* just in case */
#include "mail.h"
++++++ imap.rpmlintrc ++++++
addFilter("files-duplicate */etc/pam.d/pop")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org