diff --git a/fetchmail-6.3.10.tar.bz2 b/fetchmail-6.3.10.tar.bz2
new file mode 100644
index 0000000..ef8a1f9
--- /dev/null
+++ b/fetchmail-6.3.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3a22d81990908f7df4bfd25f12b9e41303e956b3e70d7447356cf92ad7f6607
+size 1608066
diff --git a/fetchmail-6.3.8-smtp_errors.patch b/fetchmail-6.3.8-smtp_errors.patch
index 41820a1..ce7ecc9 100644
--- a/fetchmail-6.3.8-smtp_errors.patch
+++ b/fetchmail-6.3.8-smtp_errors.patch
@@ -6,26 +6,15 @@
# be considered that important.
# 2) use the 501 error code to mark spam - in such a case
# the 'antispam' option should be used
---- fetchmail-6.3.8.orig/sink.c 2007-03-30 00:45:17.000000000 +0200
-+++ fetchmail-6.3.8/sink.c 2007-09-25 17:37:49.332165910 +0200
-@@ -535,7 +535,32 @@
+Index: fetchmail-6.3.10-beta1/sink.c
+===================================================================
+--- fetchmail-6.3.10-beta1.orig/sink.c 2009-05-25 17:55:07.000000000 +0200
++++ fetchmail-6.3.10-beta1/sink.c 2009-06-01 14:37:12.000000000 +0200
+@@ -551,6 +551,19 @@ static int handle_smtp_report(struct que
free(responses[0]);
- return(PS_REFUSED);
+ return(PS_TRANSIENT);
-- default:
-+ case 530: /* must issue STARTTLS error */
-+ /*
-+ * Some SMTP servers insist on encrypted communication
-+ * Let's set PS_TRANSIENT, otherwise all messages to be sent
-+ * over such server would be blackholed
-+ */
-+ free(responses[0]);
-+ if (outlevel > O_SILENT)
-+ report_complete(stdout,
-+ GT_(" SMTP server requires STARTTLS, keeping message.\n"));
-+ return(PS_TRANSIENT);
-+
-+ case 501: /* Syntax error in parameters or arguments */
++ case 501: /* Syntax error in parameters or arguments */
+ /*
+ * Some SMTP servers use this error code to refuse spam, however
+ * as we don't want to delete message if e.g. the address is (possibly
@@ -37,8 +26,16 @@
+ report_complete(stdout,
+ GT_(" SMTP 501 error - if the server uses this code to report spam, include '501' in the 'antispam' option .\n"));
+ return(PS_TRANSIENT);
-+
++
+ default:
+ /* bounce non-transient errors back to the sender */
+ if (smtperr >= 500 && smtperr <= 599)
+@@ -620,7 +633,7 @@ static int handle_smtp_report_without_bo
+ #endif /* __DONT_FEED_THE_SPAMMERS__ */
+ return(PS_REFUSED);
+
+- default:
+ default:
/* bounce non-transient errors back to the sender */
if (smtperr >= 500 && smtperr <= 599)
- {
+ return(PS_SUCCESS);
diff --git a/fetchmail-6.3.9.tar.bz2 b/fetchmail-6.3.9.tar.bz2
deleted file mode 100644
index fde7ef1..0000000
--- a/fetchmail-6.3.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3dfd3b04aa552331f91f96bdf5f5afe489c31a600ae7973f5814bde5555813dc
-size 1538134
diff --git a/fetchmail.changes b/fetchmail.changes
index cecac69..39a4035 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Jul 3 09:58:22 CEST 2009 - puzel@novell.com
+
+- update to 6.3.10 (final version)
+
+-------------------------------------------------------------------
+Mon Jun 1 15:00:06 CEST 2009 - puzel@suse.cz
+
+- update to 6.3.10-beta1
+ # INCOMPATIBLE BUGFIXES AND CHANGES:
+ * Fetchmail no longer drops permanently undelivered messages by default, to
+ match historic documentation. It does this by adding a new "softbounce"
+ option, see below.
+ * There is a new "softbounce" global option that prevents the deletion of
+ messages that have not been forwarded. It defaults to "true" for fetchmail
+ 6.3.X in order to match historic documentation. This may change its default
+ in the next major release.
+ * For other changes, please see the package changelog
+- update fetchmail-6.3.8-smtp_errors.patch (partially upstreamed)
+
-------------------------------------------------------------------
Tue Jan 13 11:56:26 CET 2009 - puzel@suse.cz
diff --git a/fetchmail.spec b/fetchmail.spec
index 19aa9e4..cf38cd6 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,5 +1,5 @@
#
-# spec file for package fetchmail (Version 6.3.9)
+# spec file for package fetchmail (Version 6.3.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,10 +26,10 @@ BuildRequires: ed openssl-devel opie postfix procmail pwdutils python-devel
%if 0%{?with_krb5}
BuildRequires: krb5-devel
%endif
-License: GPL v2 or later; Other uncritical OpenSource License; Public Domain, Freeware
+License: GPL v2 or later ; Other uncritical OpenSource License ; Public Domain, Freeware
Group: Productivity/Networking/Email/Utilities
AutoReqProv: on
-Version: 6.3.9
+Version: 6.3.10
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.init
@@ -155,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-, root, root)
-%doc COPYING FAQ FEATURES NEWS NOTES OLDNEWS README README.NTLM README.SSL TODO contrib *.html *.txt *.pdf
+%doc COPYING FAQ FEATURES NEWS NOTES OLDNEWS README README.NTLM README.SSL README.SSL-SERVER TODO contrib *.html *.txt *.pdf
%{_bindir}/fetchmail
%dir %attr (0700, fetchmail, root) %{_localstatedir}/lib/fetchmail
%ghost %attr (0600, fetchmail, root) %{_localstatedir}/log/fetchmail
@@ -173,276 +173,3 @@ rm -rf $RPM_BUILD_ROOT
%{py_sitedir}/fetchmailconf.*
%changelog
-* Tue Jan 13 2009 puzel@suse.cz
-- update to 6.3.9 final
- - deleted fetchmail-fix-permissions-doc.patch (fixed upstream)
-* Mon Jan 12 2009 puzel@suse.cz
-- fix spurious messages from fetchmail.init (bnc#464037)
-* Fri Nov 14 2008 mrueckert@suse.de
-- make the kerberos handling based on suse_version instead
- of sles_version
-* Thu Oct 09 2008 puzel@suse.cz
-- fix documentation inconsistency (bnc#174287)
-- mark /etc/logrotate.d/fetchmail as %%config(noreplace)
-* Wed Oct 01 2008 puzel@suse.cz
-- Fix build on SLE9
- - do not build with kerberos support on SLE9
-* Tue Sep 09 2008 kukuk@suse.de
-- Remove support for dante (deprecated, homepage not reacheable,...)
-* Thu Sep 04 2008 puzel@suse.cz
-- update to 6.3.9rc2
- - bugfix release, see package changelog for details
-- removed fetchmail-6.3.8-CVE-2007-4565.patch (fixed in upstream)
-- removed fetchmail-6.3.8-long_headers_segfault.patch (fixed in upstream)
-* Fri Aug 22 2008 puzel@suse.cz
-- fix build on SLE10
- - do not run autoreconf if suse_version < 1010
-* Thu Jul 24 2008 puzel@suse.cz
-- specfile cleanup and rpmlint warning fixes
- * removed obsolete 'Provides: pop'
- * added logrotate dependency
- * removed unnecessary python dependency
- * removed unnecessary 'export CFLAGS="$RPM_OPT_FLAGS"'
- - %%configure macro should suffice
-- initscript fixes
- * obsolete X-UnitedLinux-Should-Start replaced by
- Should-Start
- * same with Should-Stop
- * added $remote-fs dependency
-* Tue Jul 01 2008 puzel@suse.cz
-- updated fetchmail-6.3.8-long_headers_segfault.patch from upstream
-* Tue Jun 17 2008 puzel@suse.cz
-- kerberos (krb5) support enabled [bnc#353817]
-* Wed May 28 2008 puzel@suse.cz
-- fixed broken oneshot option in initscript [bnc#360507]
-* Thu May 22 2008 puzel@suse.cz
-- fixed bnc#354291
- * caused segmentation fault when retrieving mail with long To:
- headers
-* Wed Apr 30 2008 pcerny@suse.cz
-- added option to specify polling interval to init script
-* Fri Mar 28 2008 pcerny@suse.cz
-- additional fix for bnc#246829
- [fetchmail-6.3.8-starttls.patch ->
- fetchmail-6.3.8-smtp_errors.patch]
-* Wed Nov 28 2007 pv@suse.de
-- add PreReq pwdutils #327550 - yast2-mail fetchmail error
-* Thu Sep 27 2007 pcerny@suse.de
-- Fix for DoS vulnerability (#308271 CVE-2007-4565)
-- Do not remove messages if SMTP insists on TLS (#246829)
- [fetchmail-6.3.8-starttls.patch]
-* Tue Sep 11 2007 ro@suse.de
-- remove librsaref2-devel from buildrequires (unused)
-* Fri Aug 31 2007 pcerny@suse.cz
-- librsaref2 => librsaref2-devel [#302599]
-- removed %%suseversion > 800 check (insserv)
-* Mon Jul 02 2007 lrupp@suse.de
-- rsaref => librsaref2
-* Thu Apr 19 2007 sbrabec@suse.cz
-- Updated to version 6.3.8:
- * Make the APOP challenge parser more distrustful and have it
- reject challenges that do not conform to RFC-822 msg-id format
- (CVE-2007-1558).
- * Repoll immediately if a protocol error happens during the
- authentication attempt after a failed opportunistic TLS upgrade
- (#262450).
- * Do not crash with a null pointer dereference when opening the
- BSMTP file fails.
- * Make BSMTP output actually work.
- * Add delete-later and delete-later.README.
- * Fix KPOP.
- * Fix repoll when server disconnects after opportunistic TLS
- failed for POP3.
- * Documentation and string fixes.
-* Fri Mar 30 2007 ro@suse.de
-- added pwdutils to buildreq
-* Tue Feb 06 2007 sbrabec@suse.cz
-- Repair repoll after opportunistic TLS failed (#223507#c27,
- Berlios#10133).
-- Use upstream fix of KPOP regression (#223507#c26).
-* Thu Jan 25 2007 sbrabec@suse.cz
-- Fixed regression in KPOP support (#223507#c8).
- http://lists.berlios.de/pipermail/fetchmail-devel/2007-January/000857.html
-* Wed Jan 24 2007 sbrabec@suse.cz
-- Updated to version 6.3.6 (#223507):
- * Password disclosure vulnerability fixed (CVE-2006-5867).
- * Repairs a regression in 6.3.5 that crashes fetchmail when a
- message with invalid headers is found while fetchmail's mda
- option is in use (CVE-2006-5974).
- * Repair --logfile, broken in 6.3.5.
- * Repair --user, broken in 6.3.5.
- * RPOP: used to log the password locally rather than an asterisk
- as the other protocols do.
- * POP3: Probes capabilities now when Kerberos V5 is enabled, so
- that we can actually detect if the server supports it.
- * DNS: Detect /etc/resolv.conf changes
- * When HOME and FETCHMAILHOME are unset, be sure to copy user
- database information.
-- Spec file cleanup.
-* Wed Oct 25 2006 sbrabec@suse.cz
-- Fixed problems caused by calling daemon as non-root (#207305).
-* Mon Oct 23 2006 sbrabec@suse.cz
-- Updated to version 6.3.5:
- * Bug fixes.
- * Translation updates.
- * Logging behavior changes.
- * fetchmail now supports foo@example.org=bar user mappings for
- multidrop boxes.
- * Bouncing improvements.
- * Improved IMAP and SDPS behavior.
- * See NEWS for deprecated features and major incompatible change
- advance warnings.
-* Sat Oct 21 2006 schwab@suse.de
-- Run automake.
-* Thu Jun 01 2006 sbrabec@suse.cz
-- By default run as non-root user fetchmail (159764#c1).
-- Implemented "oneshot" in the init script (159764#c8).
-* Mon Apr 03 2006 sbrabec@suse.cz
-- Backported fixes for two crashes (159764#c9, 159764#c10).
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Mon Jan 23 2006 sbrabec@suse.cz
-- Updated to version 6.3.2 (fixes CVE-2006-0321).
-* Tue Jan 10 2006 sbrabec@suse.cz
-- Updated to version 6.3.1 (fixes #140475).
-* Mon Dec 05 2005 sbrabec@suse.cz
-- Updated to version 6.3.0 (fixes #131232).
-* Wed Jul 27 2005 sbrabec@suse.cz
-- Updated to version 6.2.5.2 (#97555).
-* Mon Apr 25 2005 sbrabec@suse.cz
-- Prevent lost mails with NULL envelope (#80331).
-* Thu Feb 03 2005 ro@suse.de
-- fix build on older distributions
-* Wed Jan 19 2005 sbrabec@suse.cz
-- Turned on GSSAPI, SOCKS and RSAREF support.
-- Fixed implicit declaration and random result warnings.
-* Fri Sep 24 2004 sbrabec@suse.cz
-- Added more sysconfig options for init script.
-* Thu Sep 16 2004 aj@suse.de
-- Remove wrong definition.
-* Tue Aug 31 2004 sbrabec@suse.cz
-- Added sendmail to Required-Start/Stop (#44500).
-* Wed May 05 2004 sbrabec@suse.cz
-- Added sysconfig variable for polling interval (#39777).
-- Init script adapted to conform latest LSB.
-* Tue Apr 27 2004 ro@suse.de
-- fix missing return value in pop2.c
-* Tue Mar 30 2004 sbrabec@suse.cz
-- Added /etc/fetchmailrc to file list.
-* Thu Mar 25 2004 mmj@suse.de
-- Add postfix to # neededforbuild
-* Wed Mar 10 2004 sbrabec@suse.cz
-- Set fetchsizelimit for APOP and RPOP (bug #35555).
- http://lists.ccil.org/pipermail/fetchmail-friends/2003-October/003958.html
-* Wed Feb 04 2004 sbrabec@suse.cz
-- Updated to version 6.2.5.
-* Sat Jan 10 2004 adrian@suse.de
-- add %%defattr
-* Thu Oct 23 2003 kukuk@suse.de
-- Remove wrong requires
-* Thu Aug 07 2003 sbrabec@suse.cz
-- Updated to version 6.2.3.
-* Tue May 20 2003 mmj@suse.de
-- Fix typo
-* Wed Mar 26 2003 sbrabec@suse.cz
-- Updated to version 6.2.2.
-- Created startup script.
-* Thu Jan 16 2003 sbrabec@suse.cz
-- Updated to version 6.2.1.
-* Fri Dec 13 2002 mmj@suse.de
-- Update to 6.2.0 which has security fix for rfc822.c and some
- translations plus an SMTP timeout patch
-* Tue Dec 10 2002 sbrabec@suse.cz
-- Updated to version 6.1.3.
-* Wed Nov 20 2002 sbrabec@suse.cz
-- Spec file cleanup (bug #21912).
-* Thu Oct 24 2002 sbrabec@suse.cz
-- Update to version 6.1.1.
-* Tue Oct 01 2002 sbrabec@suse.cz
-- Removed --with-included-gettext and re-enabled NLS.
-- OPIE/OTP fixes.
-- Spec file cleanup.
-* Fri Sep 27 2002 mmj@suse.de
-- Update to 6.1.0 including since 5.9.13:
- o Support for STARTTLS over IMAP
- o Cleanups and bugfixes
- o Translation update
- o Fix for potential remote vulnerability in multidrop mode,
- which according to the author is an important security fix.
-* Mon Jul 29 2002 jreuter@suse.de
-- more spec file cleanup
-* Mon Jul 29 2002 jreuter@suse.de
-- added /etc/logrotate.d/fetchmail (Bugzilla #17279)
-- spec file cleanup
-* Fri Jul 19 2002 jreuter@suse.de
-- removed /usr/share/locale/*/LC_MESSAGES/fetchmail.mo from file list
-* Wed Jul 17 2002 jreuter@suse.de
-- updated to version 5.9.13
-- disabled NLS support because it doesn't compile and esr is about
- to remove it anyway
-- complete changelog: http://tuxedo.org/~esr/fetchmail/NEWS
-* Sat Mar 23 2002 kukuk@suse.de
-- Fix fetchmailconf (wrong python widget destroy calls) [Bug #15391]
-* Mon Sep 17 2001 bjacke@suse.de
-- minor fixes in README.SUSE
-* Thu Aug 16 2001 bjacke@suse.de
-- update to 5.9.0
-* Thu Jul 12 2001 bjacke@suse.de
-- update to 5.8.14
-* Fri Jun 15 2001 bjacke@suse.de
-- patch to prevent buffer overflow due to long headers
-* Tue Apr 03 2001 bjacke@suse.de
-- update to 5.8.0
-* Thu Mar 22 2001 ro@suse.de
-- added split-aliases as provides
-* Wed Feb 14 2001 bjacke@suse.de
-- updated to 5.6.5 (fixes #6245)
-- fix fetchmailconf nospambounce problem
-- enable RPA protocol
-* Fri Jan 05 2001 bjacke@suse.de
-- disabled IPv6 support for the time being to fix bug #5111
-* Wed Dec 20 2000 garloff@suse.de
-- pass --enable-NTLM to configure in order to enable M$ Exchange
- compatible auth proto
-- explicitly specify the directories with --mandir etc ...
-- Use DESTDIR= instead of prefix to pass RPM_BUILD_ROOT
-- add %%{?suse_update_config}
-* Mon Dec 18 2000 bjacke@suse.de
-- some spec file fixes
-* Mon Dec 18 2000 ro@suse.de
-- Fix requires for fetchmailconf (again)
-* Mon Dec 18 2000 bjacke@suse.de
-- merged ssl stuff from fetchmailssl to fetchmail package
-* Wed Nov 29 2000 bjacke@suse.de
-- updated to 5.6.0
-- adjust README to new boot concept
-* Fri Nov 10 2000 bjacke@suse.de
-- updated to version 5.5.5
-- switched to long names
-- added README.SuSE
-* Sun Sep 03 2000 bjacke@suse.de
-- update to fetchmail-5.5.1
-* Tue May 23 2000 bk@suse.de
-- moved fetchmailconf man page to subpackage fetchmcf
-* Mon May 15 2000 bk@suse.de
-- update to fetchmail-5.4.0, new major version.
-* Wed Mar 01 2000 werner@suse.de
-- Fix config.guess selection
-* Thu Feb 24 2000 dipa@suse.de
-- update to fetchmail-5.3. update to fetchmail-5.3.00
-* Tue Feb 15 2000 bk@suse.de
-- update to fetchmail-5.2.8, that's the code freeze release for 5.3.0
-* Tue Feb 08 2000 bk@suse.de
-- update to fetchmail-5.2.7, Eric's changelog to 5.2.6 is very small:
- * Updated FAQ and
- * Updated es.po.
- * Disable mail notification on server unreachable. This turned out to
- be a very bad idea.
-* Tue Feb 01 2000 ro@suse.de
-- specfile typo
-* Tue Feb 01 2000 ro@suse.de
-- create man directory
-* Mon Jan 31 2000 bk@suse.de
-- restarted spec from package-provided spec, subpackages fetchmcf (fetchmailconf)
-* Wed Oct 20 1999 bk@suse.de
-- split-off from pop, update to 5.1.2