From cf1e3b965be4c10e860b5d5c786749a73b2fc988 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:52:48 +0100 Subject: [PATCH] update guile-2 patch to fix GUILE_BINDIR [release 2.2-3mamba;Sun Jun 02 2013] --- README.md | 2 + mailutils-2.2-gcc-4.8.patch | 14 ++ mailutils-2.2-libguile-2.patch | 35 +++++ mailutils.spec | 269 +++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+) create mode 100644 mailutils-2.2-gcc-4.8.patch create mode 100644 mailutils-2.2-libguile-2.patch create mode 100644 mailutils.spec diff --git a/README.md b/README.md index 3ada98a..61dbffa 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # mailutils +Mailutils is a swiss army knife of electronic mail handling. It offers a rich set of utilities and daemons for processing the e-mail. + diff --git a/mailutils-2.2-gcc-4.8.patch b/mailutils-2.2-gcc-4.8.patch new file mode 100644 index 0000000..d72fa3f --- /dev/null +++ b/mailutils-2.2-gcc-4.8.patch @@ -0,0 +1,14 @@ +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -138,8 +138,10 @@ + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ +-#undef gets ++#ifdef gets ++# undef gets + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/mailutils-2.2-libguile-2.patch b/mailutils-2.2-libguile-2.patch new file mode 100644 index 0000000..bd6293b --- /dev/null +++ b/mailutils-2.2-libguile-2.patch @@ -0,0 +1,35 @@ +--- mailutils-2.2/libmu_scm/mu_message.c.orig 2013-06-01 17:26:58.647144139 +0200 ++++ mailutils-2.2/libmu_scm/mu_message.c 2013-06-01 17:27:16.945963528 +0200 +@@ -511,7 +511,7 @@ + SCM car = SCM_CAR (lst); + if (scm_is_string (car) + && mu_c_strncasecmp (scm_i_string_chars (car), name, +- scm_i_string_length (car)) == 0) ++ scm_c_string_length (car)) == 0) + return 1; + } + return 0; +diff -Nru mailutils-2.2.orig/configure mailutils-2.2/configure +--- mailutils-2.2.orig/configure 2010-09-08 11:59:25.000000000 +0200 ++++ mailutils-2.2/configure 2013-06-02 17:56:58.470399782 +0200 +@@ -54807,7 +54807,7 @@ + #define WITH_GUILE 1 + _ACEOF + +- GUILE_BINDIR=`guile-config info bindir` ++ GUILE_BINDIR=`guile-config info prefix`/bin + LIBMU_SCM=../libmu_scm/libmu_scm.la + LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}' + MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules' +diff -Nru mailutils-2.2.orig/configure.ac mailutils-2.2/configure.ac +--- mailutils-2.2.orig/configure.ac 2010-09-08 10:48:15.000000000 +0200 ++++ mailutils-2.2/configure.ac 2013-06-02 17:57:08.116298830 +0200 +@@ -1071,7 +1071,7 @@ + GINT_INIT([gint],[1.8 with-guile], + [useguile=yes + AC_DEFINE([WITH_GUILE],1,[Enable Guile support]) +- GUILE_BINDIR=`guile-config info bindir` ++ GUILE_BINDIR=`guile-config info prefix`/bin + LIBMU_SCM=../libmu_scm/libmu_scm.la + LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}' + MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules' diff --git a/mailutils.spec b/mailutils.spec new file mode 100644 index 0000000..a18a7e4 --- /dev/null +++ b/mailutils.spec @@ -0,0 +1,269 @@ +Name: mailutils +Version: 2.2 +Release: 3mamba +Summary: A swiss army knife of electronic mail handling +Group: System/Tools +Vendor: openmamba +Distribution: openmamba +Packager: Silvan Calarco +URL: http://mailutils.org/ +Source: ftp://ftp.gnu.org/gnu/mailutils/mailutils-%{version}.tar.xz +Patch0: mailutils-2.2-gcc-4.8.patch +Patch1: mailutils-2.2-libguile-2.patch +License: GPL +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libaudit-devel +BuildRequires: libffi-devel +BuildRequires: libfribidi-devel +BuildRequires: libgcc +BuildRequires: libgc-devel +BuildRequires: libgcrypt-devel +BuildRequires: libgmp-devel +BuildRequires: libgnutls-devel +BuildRequires: libgpg-error-devel +BuildRequires: libguile-devel +BuildRequires: libltdl-devel +BuildRequires: libncurses-devel +BuildRequires: libnettle-devel +BuildRequires: libopenldap-devel +BuildRequires: libopenssl-devel +BuildRequires: libpython27-devel +BuildRequires: libpython-devel +BuildRequires: libreadline-devel +BuildRequires: libsasl-devel +BuildRequires: libstdc++6-devel +BuildRequires: libtasn1-devel +BuildRequires: libunistring-devel +BuildRequires: libwrap-devel +BuildRequires: libz-devel +BuildRequires: p11-kit-devel +BuildRequires: pam-devel +## AUTOBUILDREQ-END +Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires(post): %{__install_info} +Requires(preun): %{__install_info} +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Mailutils is a swiss army knife of electronic mail handling. It offers a rich set of utilities and daemons for processing the e-mail. + +%package -n lib%{name} +Group: System/Libraries +Summary: Shared libraries for %{name} + +%description -n lib%{name} +This package contains shared libraries for %{name}. + +%package -n lib%{name}-devel +Group: Development/Libraries +Summary: Development files for %{name} +Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description -n lib%{name}-devel +This package contains libraries and header files for developing applications that use %{name}. + +%debug_package + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%configure +%make -j1 + +%install +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%makeinstall + +%find_lang %{name} || touch %{name}.lang + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%post -n lib%{name} -p /sbin/ldconfig +%postun -n lib%{name} -p /sbin/ldconfig + +%post -n lib%{name}-devel +## modify the infopage name as required +%install_info %{name}.info +exit 0 + +%preun -n lib%{name}-devel +## modify the infopage name as required +%uninstall_info %{name}.info +exit 0 + +%files -f %{name}.lang +%defattr(-,root,root) +%{_bindir}/dotlock +%{_bindir}/frm +%{_bindir}/from +%{_bindir}/guimb +%{_bindir}/mail +%{_bindir}/mailutils-config +%{_bindir}/messages +%{_bindir}/mimeview +%{_bindir}/movemail +%dir %{_bindir}/mu-mh +%{_bindir}/mu-mh/ali +%{_bindir}/mu-mh/anno +%{_bindir}/mu-mh/burst +%{_bindir}/mu-mh/comp +%{_bindir}/mu-mh/fmtcheck +%{_bindir}/mu-mh/folder +%{_bindir}/mu-mh/folders +%{_bindir}/mu-mh/forw +%{_bindir}/mu-mh/inc +%{_bindir}/mu-mh/install-mh +%{_bindir}/mu-mh/mark +%{_bindir}/mu-mh/mhl +%{_bindir}/mu-mh/mhn +%{_bindir}/mu-mh/mhparam +%{_bindir}/mu-mh/mhpath +%{_bindir}/mu-mh/pick +%{_bindir}/mu-mh/refile +%{_bindir}/mu-mh/repl +%{_bindir}/mu-mh/rmf +%{_bindir}/mu-mh/rmm +%{_bindir}/mu-mh/scan +%{_bindir}/mu-mh/send +%{_bindir}/mu-mh/sortm +%{_bindir}/mu-mh/whatnow +%{_bindir}/mu-mh/whom +%{_bindir}/readmsg +%{_bindir}/sieve +%{_bindir}/sieve.scm +%{_sbindir}/comsatd +%{_sbindir}/imap4d +%{_sbindir}/maidag +%{_sbindir}/pop3d +%{_datadir}/aclocal/mailutils.m4 +%{_datadir}/emacs/site-lisp/mailutils-mh.el +%{_datadir}/emacs/site-lisp/mailutils-mh.elc +%{_datadir}/guile/site/mailutils/guile-procedures.txt +%{_datadir}/guile/site/mailutils/mailutils.scm +%{_datadir}/guile/site/mailutils/sieve-core.scm +%{_datadir}/guile/site/mailutils/sieve-modules/mimeheader.scm +%{_datadir}/guile/site/mailutils/sieve-modules/numaddr.scm +%{_datadir}/guile/site/mailutils/sieve-modules/redirect.scm +%{_datadir}/guile/site/mailutils/sieve-modules/reject.scm +%{_datadir}/guile/site/mailutils/sieve-modules/vacation.scm +%{_infodir}/mailutils.info-1.gz +%{_infodir}/mailutils.info-2.gz +%{_infodir}/mailutils.info.gz +%dir %{_datadir}/mailutils +%dir %{_datadir}/mailutils/mh +%{_datadir}/mailutils/mh/components +%{_datadir}/mailutils/mh/mailutils-mh.el +%{_datadir}/mailutils/mh/mhl.format +%{_datadir}/mailutils/mh/replcomps +%{_datadir}/mailutils/mh/replgroupcomps +%{_mandir}/man1/imap4d.1.gz +%{_mandir}/man1/mail.1.gz +%{_mandir}/man1/pop3d.1.gz +%{_mandir}/man1/popauth.1.gz + +%files -n lib%{name} +%defattr(-,root,root) +%{_libdir}/libmailutils.so.* +%{_libdir}/libmu_auth.so.* +%{_libdir}/libmu_cfg.so.* +%{_libdir}/libmu_cpp.so.* +%{_libdir}/libmu_imap.so.* +%{_libdir}/libmu_maildir.so.* +%{_libdir}/libmu_mailer.so.* +%{_libdir}/libmu_mbox.so.* +%{_libdir}/libmu_mh.so.* +%{_libdir}/libmu_nntp.so.* +%{_libdir}/libmu_pop.so.* +%{_libdir}/libmu_py.so.* +%{_libdir}/libmu_scm.so.* +%{_libdir}/libmu_sieve.so.* +%dir %{_libdir}/mailutils +%{_libdir}/mailutils/list.a +%{_libdir}/mailutils/list.la +%{_libdir}/mailutils/list.so +%{_libdir}/mailutils/moderator.a +%{_libdir}/mailutils/moderator.la +%{_libdir}/mailutils/moderator.so +%{_libdir}/mailutils/numaddr.a +%{_libdir}/mailutils/numaddr.la +%{_libdir}/mailutils/numaddr.so +%{_libdir}/mailutils/pipe.a +%{_libdir}/mailutils/pipe.la +%{_libdir}/mailutils/pipe.so +%{_libdir}/mailutils/spamd.a +%{_libdir}/mailutils/spamd.la +%{_libdir}/mailutils/spamd.so +%{_libdir}/mailutils/timestamp.a +%{_libdir}/mailutils/timestamp.la +%{_libdir}/mailutils/timestamp.so +%{_libdir}/mailutils/vacation.a +%{_libdir}/mailutils/vacation.la +%{_libdir}/mailutils/vacation.so +%dir %{python_sitearch}/mailutils +%{python_sitearch}/mailutils/* +%doc AUTHORS COPYING COPYING.LESSER THANKS + +%files -n lib%{name}-devel +%defattr(-,root,root) +%dir %{_includedir}/mailutils +%{_includedir}/mailutils/* +%{_libdir}/libguile-mailutils-v-2.2.so +%{_libdir}/libmailutils.a +%{_libdir}/libmailutils.la +%{_libdir}/libmailutils.so +%{_libdir}/libmu_argp.a +%{_libdir}/libmu_auth.a +%{_libdir}/libmu_auth.la +%{_libdir}/libmu_auth.so +%{_libdir}/libmu_cfg.a +%{_libdir}/libmu_cfg.la +%{_libdir}/libmu_cfg.so +%{_libdir}/libmu_cpp.a +%{_libdir}/libmu_cpp.la +%{_libdir}/libmu_cpp.so +%{_libdir}/libmu_imap.a +%{_libdir}/libmu_imap.la +%{_libdir}/libmu_imap.so +%{_libdir}/libmu_maildir.a +%{_libdir}/libmu_maildir.la +%{_libdir}/libmu_maildir.so +%{_libdir}/libmu_mailer.a +%{_libdir}/libmu_mailer.la +%{_libdir}/libmu_mailer.so +%{_libdir}/libmu_mbox.a +%{_libdir}/libmu_mbox.la +%{_libdir}/libmu_mbox.so +%{_libdir}/libmu_mh.a +%{_libdir}/libmu_mh.la +%{_libdir}/libmu_mh.so +%{_libdir}/libmu_nntp.a +%{_libdir}/libmu_nntp.la +%{_libdir}/libmu_nntp.so +%{_libdir}/libmu_pop.a +%{_libdir}/libmu_pop.la +%{_libdir}/libmu_pop.so +%{_libdir}/libmu_py.a +%{_libdir}/libmu_py.la +%{_libdir}/libmu_py.so +%{_libdir}/libmu_scm.a +%{_libdir}/libmu_scm.la +%{_libdir}/libmu_scm.so +%{_libdir}/libmu_sieve.a +%{_libdir}/libmu_sieve.la +%{_libdir}/libmu_sieve.so +%doc ChangeLog NEWS README TODO + +%changelog +* Sun Jun 02 2013 Silvan Calarco 2.2-3mamba +- update guile-2 patch to fix GUILE_BINDIR + +* Sat Jun 01 2013 Silvan Calarco 2.2-2mamba +- python 2.7 mass rebuild + +* Thu Jul 19 2012 Silvan Calarco 2.2-1mamba +- package created by autospec