- openssl 1.0.0 build fix

[packages/mutt.git] / mutt-forcedotlock.patch

diff --git a/mutt-forcedotlock.patch b/mutt-forcedotlock.patch
index 4b7c0774e8487da2f7f6444bd88cb20732cf45b7..3c7b4d443fcbb08c15edfd963adfdb08b9ed46eb 100644 (file)
--- a/mutt-forcedotlock.patch
+++ b/mutt-forcedotlock.patch
@@ -1,47 +1,15 @@
-diff -urN mutt-1.3.17.org/configure.in mutt-1.3.17/configure.in
---- mutt-1.3.17.org/configure.in       Wed Apr  4 23:31:32 2001
-+++ mutt-1.3.17/configure.in   Wed Apr  4 23:33:55 2001
-@@ -321,41 +321,8 @@
+--- mutt-1.5.15/Makefile.am.orig       2007-06-03 12:32:52.028633000 +0200
++++ mutt-1.5.15/Makefile.am    2007-06-03 13:05:48.801283592 +0200
+@@ -138,9 +138,9 @@
+               rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
+               ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+       fi
+-      if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
+-              chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
+-              chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
++      if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
++              chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
++              chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
+               { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
        fi
-       AC_DEFINE_UNQUOTED(MAILPATH, "$mutt_cv_mailpath")
- 
--      AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include <sys/types.h>
--#include <sys/stat.h>
--
--int main (int argc, char **argv)
--{
--      struct stat s;
--
--      stat ("$mutt_cv_mailpath", &s);
--      if (s.st_mode & S_IWOTH) exit (0);
--      exit (1);
--}], mutt_cv_worldwrite=yes, mutt_cv_worldwrite=no, mutt_cv_worldwrite=no)])
--
--      mutt_cv_setgid=no
--      if test $mutt_cv_worldwrite = yes; then
--              AC_DEFINE(USE_DOTLOCK)
--      else
--
--              AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include <sys/types.h>
--#include <sys/stat.h>
--
--int main (int argc, char **argv)
--{
--      struct stat s;
--
--      stat ("$mutt_cv_mailpath", &s);
--      if (s.st_mode & S_IWGRP) exit (0);
--      exit (1);
--}], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)])
--
--              if test $mutt_cv_groupwrite = yes; then
--                      AC_DEFINE(USE_DOTLOCK)
--                      AC_DEFINE(USE_SETGID)
--                      mutt_cv_setgid=yes
--              fi
--      fi
-+      AC_DEFINE(USE_DOTLOCK)
-+      AC_DEFINE(USE_SETGID)
- fi
  
- AC_ARG_ENABLE(external_dotlock, [  --enable-external-dotlock  Force use of an external dotlock program],