commit 1ab28bd1ec7ee6ca998b521ccb413020de4a1b91 Author: Arkadiusz Miśkiewicz <ar...@maven.pl> Date: Wed Sep 26 13:31:19 2018 +0200
- up to 0.3.4 masqmail-includes.patch | 12 ------------ masqmail-resolv.patch | 18 ++++++++++-------- masqmail.spec | 14 +++++--------- 3 files changed, 15 insertions(+), 29 deletions(-) --- diff --git a/masqmail.spec b/masqmail.spec index 130327c..907c5d7 100644 --- a/masqmail.spec +++ b/masqmail.spec @@ -1,17 +1,16 @@ Summary: An offline mail server with pop3 client support Summary(pl.UTF-8): Serwer pocztowy offline ze wsparciem dla pop3 Name: masqmail -Version: 0.2.21 -Release: 4 +Version: 0.3.4 +Release: 1 License: GPL Group: Networking/Daemons/SMTP Source0: http://ftp.debian.org/debian/pool/main/m/masqmail/%{name}_%{version}.orig.tar.gz -# Source0-md5: 7e989a8b0562054aea22c654507f2cb5 +# Source0-md5: 551bd887c71d7b8f3bb149b617adb1b3 Source1: %{name}.aliases Source2: %{name}.conf Source3: %{name}.default.route Patch0: %{name}-resolv.patch -Patch1: %{name}-includes.patch URL: http://packages.debian.org/masqmail BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -40,7 +39,6 @@ Zastępuje sendmaila oraz inne MTA jak qmail czy exim. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__aclocal} @@ -73,10 +71,8 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/default.route install src/mservdetect $RPM_BUILD_ROOT%{_bindir} install src/masqmail $RPM_BUILD_ROOT%{_sbindir} install tpl/* $RPM_BUILD_ROOT%{_datadir}/masqmail/tpl -install docs/man/masqmail.*.5 $RPM_BUILD_ROOT%{_mandir}/man5 -install docs/man/masqmail.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install debian/*.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install debian/newaliases $RPM_BUILD_ROOT%{_bindir} +install man/masqmail.*.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install man/masqmail.8 $RPM_BUILD_ROOT%{_mandir}/man8 ln -sf ../sbin/masqmail $RPM_BUILD_ROOT%{_bindir}/mailq ln -sf ../sbin/masqmail $RPM_BUILD_ROOT/usr/lib/sendmail ln -sf masqmail $RPM_BUILD_ROOT%{_sbindir}/sendmail diff --git a/masqmail-includes.patch b/masqmail-includes.patch deleted file mode 100644 index e480f71..0000000 --- a/masqmail-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -add missing sys/stat.h for S_ISDIR macro - ---- masqmail-0.2.21/src/local.c~ 2003-05-19 21:44:46.000000000 +0200 -+++ masqmail-0.2.21/src/local.c 2018-09-23 17:07:45.256866939 +0200 -@@ -19,6 +19,7 @@ - #include "masqmail.h" - #include "peopen.h" - #include <sys/wait.h> -+#include <sys/stat.h> - - static - void message_stream(FILE *out, message *msg, GList *hdr_list, guint flags) diff --git a/masqmail-resolv.patch b/masqmail-resolv.patch index 4e74721..b70eeda 100644 --- a/masqmail-resolv.patch +++ b/masqmail-resolv.patch @@ -1,14 +1,16 @@ ---- masqmail-0.2.20/configure.ac.orig 2003-06-03 17:52:45.000000000 +0200 -+++ masqmail-0.2.20/configure.ac 2004-04-01 21:09:53.755571277 +0200 -@@ -36,9 +36,9 @@ +--- masqmail-0.3.4/configure.ac~ 2012-01-18 09:31:45.000000000 +0100 ++++ masqmail-0.3.4/configure.ac 2018-09-26 13:27:12.085535818 +0200 +@@ -37,11 +37,9 @@ if test "$resolver_enabled" = yes; then dnl checks necessary for libc5: dnl if there is res_search in libc, it is probably libc5 dnl if not, it is probably libc6 and we need libresolv - AC_CHECK_LIB(c, res_search, need_resolv=no, need_resolv=yes) + AC_CHECK_LIB(c, res_search, need_resolv=no, [AC_CHECK_LIB(c, __res_search, need_resolv=no, need_resolv=yes)]) if test "$need_resolv" = yes; then -- AC_CHECK_LIB(resolv, res_search,has_resolv=yes,AC_MSG_ERROR("no libresolv")) -+ AC_CHECK_LIB(resolv, res_search,has_resolv=yes, [AC_CHECK_LIB(resolv, __res_search, has_resolv=yes, [AC_MSG_ERROR("no libresolv")])]) - RESOLV_LIBS='-lresolv' - else - RESOLV_LIBS='' +- AC_CHECK_LIB(resolv, res_search, +- has_resolv=yes; RESOLV_LIBS="-lresolv", +- has_resolv=no) ++ AC_CHECK_LIB(resolv, res_search,has_resolv=yes, [AC_CHECK_LIB(resolv, __res_search, has_resolv=yes; RESOLV_LIBS="-lresolv", [AC_MSG_ERROR("no libresolv")])]) + if test "$has_resolv" = no; then + saved_LIBS="$LIBS" + LIBS="$LIBS -lresolv" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/masqmail.git/commitdiff/1ab28bd1ec7ee6ca998b521ccb413020de4a1b91 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit