[packages/mailutils] - updated to 3.10 - updated info,link patches - removed obsolete ggc10 patch - added sql-quota patch
qboosh
qboosh at pld-linux.org
Mon Aug 17 19:06:16 CEST 2020
commit d1762ca337232505c5df28ce12b1d039d10f4532
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Aug 17 19:08:38 2020 +0200
- updated to 3.10
- updated info,link patches
- removed obsolete ggc10 patch
- added sql-quota patch (update sql code in mda quota)
ggc10.patch | 33 ----------------------
link.patch | 31 +++++++--------------
mailutils-info.patch | 34 ++++++++++++-----------
mailutils-sql-quota.patch | 16 +++++++++++
mailutils.spec | 70 ++++++++++++++++++++---------------------------
5 files changed, 73 insertions(+), 111 deletions(-)
---
diff --git a/mailutils.spec b/mailutils.spec
index ca3fb29..4e67e65 100644
--- a/mailutils.spec
+++ b/mailutils.spec
@@ -19,8 +19,6 @@
%bcond_without pgsql # PostgreSQL module
%bcond_without odbc # ODBC module (any variant)
%bcond_with iodbc # ODBC module using libiodbc
-# broken code:
-%bcond_with nntp # NNTP support [broken in 3.x]
#
%if %{without odbc}
%undefine with_iodbc
@@ -28,12 +26,12 @@
Summary: GNU mail utilities
Summary(pl.UTF-8): Narzędzia pocztowe z projektu GNU
Name: mailutils
-Version: 3.9
-Release: 2
+Version: 3.10
+Release: 1
License: GPL v3+
Group: Applications/Mail
Source0: https://ftp.gnu.org/gnu/mailutils/%{name}-%{version}.tar.xz
-# Source0-md5: a357709d5f34b9acc6e16b7c10e77eaa
+# Source0-md5: 6564afb9a5d507d563d0832c6ea9fb3f
Patch0: %{name}-info.patch
Patch1: %{name}-tinfo.patch
Patch2: link.patch
@@ -41,10 +39,10 @@ Patch3: %{name}-includes.patch
Patch4: %{name}-examples.patch
Patch5: %{name}-extern.patch
Patch6: %{name}-cpp.patch
-Patch7: ggc10.patch
+Patch7: %{name}-sql-quota.patch
URL: http://www.gnu.org/software/mailutils/mailutils.html
BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.11
+BuildRequires: automake >= 1:1.15
BuildRequires: bison
BuildRequires: flex
BuildRequires: fribidi-devel
@@ -59,14 +57,14 @@ BuildRequires: libltdl-devel
BuildRequires: libstdc++-devel
%endif
BuildRequires: libwrap-devel
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2.4.6
BuildRequires: libunistring-devel
%{?with_mysql:BuildRequires: mysql-devel}
BuildRequires: ncurses-devel
%{?with_ldap:BuildRequires: openldap-devel}
BuildRequires: pam-devel
%{?with_pgsql:BuildRequires: postgresql-devel}
-%{?with_python:BuildRequires: python-devel >= 1:2.5}
+%{?with_python:BuildRequires: python3-devel >= 1:3.2}
BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: tar >= 1:1.22
@@ -206,7 +204,6 @@ skrzynek pocztowych.
%{!?with_cxx:--disable-cxx} \
%{!?debug:--disable-debug} \
--enable-experimental \
- %{!?with_nntp:--disable-nntp} \
%{!?with_python:--disable-python} \
%{?with_radius:--enable-radius} \
--disable-silent-rules \
@@ -231,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/mailutils/*.{la,a}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/mailutils/c_api.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/mailutils/c_api.{la,a}
%py_postclean
@@ -258,6 +255,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%attr(755,root,root) %{_bindir}/decodemail
%attr(755,root,root) %{_bindir}/dotlock
%attr(755,root,root) %{_bindir}/frm
%attr(755,root,root) %{_bindir}/from
@@ -317,55 +315,52 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/guile/site/2.*/mailutils
%endif
%if %{with python}
-%dir %{py_sitedir}/mailutils
-%attr(755,root,root) %{py_sitedir}/mailutils/c_api.so
-%dir %{py_sitescriptdir}/mailutils
-%{py_sitescriptdir}/mailutils/*.py[co]
+%dir %{py3_sitedir}/mailutils
+%attr(755,root,root) %{py3_sitedir}/mailutils/c_api.so
+%dir %{py3_sitescriptdir}/mailutils
+%{py3_sitescriptdir}/mailutils/*.py
+%{py3_sitescriptdir}/mailutils/__pycache__
%endif
%{_infodir}/mailutils.info*
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmailutils.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmailutils.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmailutils.so.7
%attr(755,root,root) %{_libdir}/libmu_auth.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_auth.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_auth.so.7
%if %{with cxx}
%attr(755,root,root) %{_libdir}/libmu_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_cpp.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_cpp.so.7
%endif
%attr(755,root,root) %{_libdir}/libmu_dbm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_dbm.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_dbm.so.7
%attr(755,root,root) %{_libdir}/libmu_dotmail.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_dotmail.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_dotmail.so.7
%attr(755,root,root) %{_libdir}/libmu_imap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_imap.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_imap.so.7
%attr(755,root,root) %{_libdir}/libmu_maildir.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_maildir.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_maildir.so.7
%attr(755,root,root) %{_libdir}/libmu_mailer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_mailer.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_mailer.so.7
%attr(755,root,root) %{_libdir}/libmu_mbox.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_mbox.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_mbox.so.7
%attr(755,root,root) %{_libdir}/libmu_mh.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_mh.so.6
-%if %{with nntp}
-%attr(755,root,root) %{_libdir}/libmu_nntp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_nntp.so.6
-%endif
+%attr(755,root,root) %ghost %{_libdir}/libmu_mh.so.7
%attr(755,root,root) %{_libdir}/libmu_pop.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_pop.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_pop.so.7
%if %{with python}
%attr(755,root,root) %{_libdir}/libmu_py.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_py.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_py.so.7
%endif
%if %{with guile}
%attr(755,root,root) %{_libdir}/libmu_scm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_scm.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_scm.so.7
%endif
%attr(755,root,root) %{_libdir}/libmu_sieve.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmu_sieve.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmu_sieve.so.7
%attr(755,root,root) %{_libdir}/libmuaux.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmuaux.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmuaux.so.7
%if %{with guile}
%attr(755,root,root) %{_libdir}/libguile-mailutils-v-%{version}.so
%endif
@@ -413,10 +408,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libmu_cpp.so
%{_libdir}/libmu_cpp.la
%endif
-%if %{with nntp}
-%attr(755,root,root) %{_libdir}/libmu_nntp.so
-%{_libdir}/libmu_nntp.la
-%endif
%{_includedir}/mailutils
%{_aclocaldir}/mailutils.m4
@@ -434,9 +425,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libmu_mailer.a
%{_libdir}/libmu_mbox.a
%{_libdir}/libmu_mh.a
-%if %{with nntp}
-%{_libdir}/libmu_nntp.a
-%endif
%{_libdir}/libmu_pop.a
%if %{with python}
%{_libdir}/libmu_py.a
diff --git a/ggc10.patch b/ggc10.patch
deleted file mode 100644
index 36f4631..0000000
--- a/ggc10.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mailutils-3.9/lib/tcpwrap.h~ 2020-03-13 07:52:46.000000000 +0100
-+++ mailutils-3.9/lib/tcpwrap.h 2020-06-02 21:09:57.675538739 +0200
-@@ -17,7 +17,7 @@
- #include <mailutils/types.h>
-
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd,
---- mailutils-3.9/imap4d/imap4d.h~ 2020-03-13 07:52:44.000000000 +0100
-+++ mailutils-3.9/imap4d/imap4d.h 2020-06-02 21:11:17.661720737 +0200
-@@ -229,7 +229,7 @@
- extern int test_mode;
- extern int silent_expunge;
-
--int tls_available;
-+extern int tls_available;
-
- /* Input functions */
- extern mu_stream_t iostream;
---- mailutils-3.9/imap4d/imap4d.c~ 2020-03-13 07:52:44.000000000 +0100
-+++ mailutils-3.9/imap4d/imap4d.c 2020-06-02 21:11:49.814867424 +0200
-@@ -20,6 +20,8 @@
- #include <mailutils/kwd.h>
- #include "tcpwrap.h"
-
-+int tls_available;
-+
- mu_m_server_t server;
- unsigned int idle_timeout = 1800;
- int imap4d_transcript;
diff --git a/link.patch b/link.patch
index 0f525f1..95a340a 100644
--- a/link.patch
+++ b/link.patch
@@ -1,11 +1,11 @@
---- mailutils-3.1.1/lib/Makefile.am.orig 2016-12-03 16:51:47.000000000 +0100
-+++ mailutils-3.1.1/lib/Makefile.am 2017-02-09 20:41:05.002880589 +0100
+--- mailutils-3.10/lib/Makefile.am.orig 2016-12-03 16:51:47.000000000 +0100
++++ mailutils-3.10/lib/Makefile.am 2017-02-09 20:41:05.002880589 +0100
@@ -35,7 +35,7 @@
strexit.c\
mu_umaxtostr.c\
mu_umaxtostr.h
-libmuaux_la_LIBADD=gnu/libgnu.la
-+libmuaux_la_LIBADD=gnu/libgnu.la ../libmailutils/libmailutils.la
++libmuaux_la_LIBADD=gnu/libgnu.la ../libmailutils/libmailutils.la $(UNISTRING_LIBS)
libmuaux_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmutcpwrap_a_SOURCES = tcpwrap.c
@@ -38,29 +38,18 @@
+libmu_cpp_la_LIBADD = $(top_builddir)/libmailutils/libmailutils.la $(top_builddir)/libmu_sieve/libmu_sieve.la $(top_builddir)/libproto/pop/libmu_pop.la $(MU_COMMON_LIBRARIES)
libmu_cpp_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
---- mailutils-3.5/Makefile.am.orig 2018-07-28 17:24:19.000000000 +0200
-+++ mailutils-3.5/Makefile.am 2018-10-30 21:05:45.491907245 +0100
-@@ -92,14 +92,12 @@
+--- mailutils-3.10/Makefile.am.orig 2020-08-16 13:08:00.601764513 +0200
++++ mailutils-3.10/Makefile.am 2020-08-16 13:15:53.622535272 +0200
+@@ -45,11 +45,11 @@
libproto\
- testsuite\
+ libtests\
lib\
- $(LIBMU_CPP_DIR)\
$(GINT_DIR)\
$(LIBMU_SCM_DIR)\
$(LIBMU_DBM_DIR)\
libmu_sieve\
- python\
- doc\
-- examples\
- mu\
- $(SCHEME_DIR)\
- $(FRM_DIR)\
-@@ -109,6 +107,8 @@
- $(MAIL_DIR)\
- $(SIEVE_DIR)\
- $(MESSAGES_DIR)\
+ $(LIBMU_CPP_DIR)\
-+ examples\
- $(COMSAT_DIR)\
- $(READMSG_DIR)\
- $(DOTLOCK_DIR)\
+ $(PYTHON_DIR)\
+ doc\
+ examples\
diff --git a/mailutils-info.patch b/mailutils-info.patch
index b61ab03..91f8331 100644
--- a/mailutils-info.patch
+++ b/mailutils-info.patch
@@ -1,6 +1,6 @@
---- mailutils-3.1.1/doc/texinfo/mailutils.texi.orig 2017-02-09 19:09:55.552943040 +0100
-+++ mailutils-3.1.1/doc/texinfo/mailutils.texi 2017-02-09 19:12:11.392941490 +0100
-@@ -23,25 +23,22 @@
+--- mailutils-3.10/doc/texinfo/mailutils.texi.orig 2020-08-16 12:56:12.882265225 +0200
++++ mailutils-3.10/doc/texinfo/mailutils.texi 2020-08-16 13:07:41.878532612 +0200
+@@ -23,26 +23,23 @@
@syncodeindex kw ky
@ifinfo
@@ -21,23 +21,25 @@
-* movemail: (mailutils) movemail. Move Mail between Mailboxes.
-* pop3d: (mailutils) pop3d. POP3 Daemon.
-* readmsg: (mailutils) readmsg. Extract Messages from a Folder.
+-* decodemail: (mailutils) decodemail. Decode MIME messages.
-* sieve: (mailutils) sieve. Mail Filtering Utility.
-* mimeview: (mailutils) mimeview. View MIME Messages.
-* mailutils: (mailutils) mailutils. Mailutils Multi-Purpose Tool
+* Mailutils: (mailutils). GNU Mail Utilities
-+* comsatd: (mailutils) comsatd. Comsat Daemon
-+* frm: (mailutils) frm. List Headers from a Mailbox
-+* guimb: (mailutils) guimb. Mailbox Processing Language
-+* imap4d: (mailutils) imap4d. IMAP4 Daemon
-+* mail: (mailutils) mail. Send and Receive Mail
-+* maidag: (mailutils) maidag. A General-Purpose Mail Delivery Agent
-+* messages: (mailutils) messages. Count Messages in a Mailbox
-+* movemail: (mailutils) movemail. Move Mail between Mailboxes
-+* pop3d: (mailutils) pop3d. POP3 Daemon
-+* readmsg: (mailutils) readmsg. Extract Messages from a Folder
-+* sieve: (mailutils) sieve. Mail Filtering Utility
-+* mimeview: (mailutils) mimeview. View MIME Messages
-+* mailutils: (mailutils) mailutils. Mailutils Multi-Purpose Tool
++* comsatd: (mailutils)comsatd. Comsat Daemon
++* frm: (mailutils)frm. List Headers from a Mailbox
++* guimb: (mailutils)guimb. Mailbox Processing Language
++* imap4d: (mailutils)imap4d. IMAP4 Daemon
++* mail: (mailutils)mail. Send and Receive Mail
++* maidag: (mailutils)maidag. A General-Purpose Mail Delivery Agent
++* messages: (mailutils)messages. Count Messages in a Mailbox
++* movemail: (mailutils)movemail. Move Mail between Mailboxes
++* pop3d: (mailutils)pop3d. POP3 Daemon
++* readmsg: (mailutils)readmsg. Extract Messages from a Folder
++* decodemail: (mailutils)decodemail. Decode MIME messages
++* sieve: (mailutils)sieve. Mail Filtering Utility
++* mimeview: (mailutils)mimeview. View MIME Messages
++* mailutils: (mailutils)mailutils. Mailutils Multi-Purpose Tool
@end direntry
@end ifinfo
diff --git a/mailutils-sql-quota.patch b/mailutils-sql-quota.patch
new file mode 100644
index 0000000..4c7c996
--- /dev/null
+++ b/mailutils-sql-quota.patch
@@ -0,0 +1,16 @@
+--- mailutils-3.10/mda/lib/mailquota.c.orig 2020-08-08 22:32:07.000000000 +0200
++++ mailutils-3.10/mda/lib/mailquota.c 2020-08-16 21:38:28.339173150 +0200
+@@ -274,12 +274,8 @@
+ {
+ char *p;
+
+- if (get_size (tmp, quota, &p))
+- {
+- mu_error (_("bogus mailbox quota for `%s' (near `%s')"),
+- name, p);
++ if (get_quota (quota, tmp))
+ *quota = groupquota;
+- }
+ }
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mailutils.git/commitdiff/d1762ca337232505c5df28ce12b1d039d10f4532
More information about the pld-cvs-commit
mailing list