treewide: Run refresh on all packages

The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>

15 files changed, 28 insertions, 54 deletions

diff --git a/mail/dovecot/patches/001-configure_in.patch b/mail/dovecot/patches/001-configure_in.patch
index 11c31b87e..b01d5b619 100644
--- a/mail/dovecot/patches/001-configure_in.patch
+++ b/mail/dovecot/patches/001-configure_in.patch
@@ -72,7 +72,7 @@
          int f = open("conftest.mmap", O_RDWR|O_CREAT|O_TRUNC, 0600);
 --- a/m4/want_gssapi.m4
 +++ b/m4/want_gssapi.m4
-@@ -54,7 +54,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
+@@ -55,7 +55,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
    
    				# does the kerberos library support SPNEGO?
    				AC_CACHE_CHECK([whether GSSAPI supports SPNEGO],i_cv_gssapi_spnego,[
@@ -81,7 +81,7 @@
    				    #ifdef HAVE_GSSAPI_H
    				    #  include <gssapi.h>
    				    #else
-@@ -62,6 +62,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
+@@ -63,6 +63,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [
    				    #endif
    				    #include <krb5.h>
    				    #include <string.h>
diff --git a/mail/dovecot/patches/100-openssl-deprecated.patch b/mail/dovecot/patches/100-openssl-deprecated.patch
index e0d40e1e1..12b760d7c 100644
--- a/mail/dovecot/patches/100-openssl-deprecated.patch
+++ b/mail/dovecot/patches/100-openssl-deprecated.patch
@@ -1,6 +1,6 @@
 --- a/src/lib-dcrypt/dcrypt-openssl.c
 +++ b/src/lib-dcrypt/dcrypt-openssl.c
-@@ -20,6 +20,7 @@
+@@ -23,6 +23,7 @@
  #include <openssl/engine.h>
  #include <openssl/hmac.h>
  #include <openssl/objects.h>
@@ -50,7 +50,7 @@
  #include <openssl/x509.h>
  #include <openssl/pem.h>
  #include <openssl/ssl.h>
-@@ -514,8 +517,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX
+@@ -555,8 +558,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX
  	int nid;
  	const char *curve_name;
  #endif
diff --git a/mail/dovecot/patches/110-openssl-engine.patch b/mail/dovecot/patches/110-openssl-engine.patch
index 6f8d47119..57ce75978 100644
--- a/mail/dovecot/patches/110-openssl-engine.patch
+++ b/mail/dovecot/patches/110-openssl-engine.patch
@@ -1,6 +1,6 @@
 --- a/src/lib-dcrypt/dcrypt-openssl.c
 +++ b/src/lib-dcrypt/dcrypt-openssl.c
-@@ -17,10 +17,12 @@
+@@ -20,10 +20,12 @@
  #include <openssl/bio.h>
  #include <openssl/pem.h>
  #include <openssl/x509.h>
@@ -14,7 +14,7 @@
  #include "dcrypt.h"
  #include "dcrypt-private.h"
  
-@@ -179,11 +181,13 @@ static bool dcrypt_openssl_error(const c
+@@ -235,11 +237,13 @@ dcrypt_openssl_padding_mode(enum dcrypt_
  static bool dcrypt_openssl_initialize(const struct dcrypt_settings *set,
  				      const char **error_r)
  {
diff --git a/mail/emailrelay/patches/010-openssl-1.1.patch b/mail/emailrelay/patches/010-openssl-1.1.patch
index 5bba1abbb..28523e7ee 100644
--- a/mail/emailrelay/patches/010-openssl-1.1.patch
+++ b/mail/emailrelay/patches/010-openssl-1.1.patch
@@ -1,6 +1,6 @@
 --- a/src/gssl/gssl_openssl.cpp
 +++ b/src/gssl/gssl_openssl.cpp
-@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G::StringArray & library_config , Library
+@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G
  	m_verbose(verbose) ,
  	m_config(library_config)
  {
diff --git a/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch b/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch
index be914733c..3d2f45d40 100644
--- a/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch
+++ b/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch
@@ -9,8 +9,6 @@ They're part of OPENSSL_init_ssl now.
  fdm.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/fdm.c b/fdm.c
-index cdf8383..6721bbd 100644
 --- a/fdm.c
 +++ b/fdm.c
 @@ -717,8 +717,10 @@ retry:
@@ -24,6 +22,3 @@ index cdf8383..6721bbd 100644
  
  	/* Filter account list. */
  	TAILQ_INIT(&actaq);
--- 
-2.17.1
-
diff --git a/mail/fdm/patches/030-cdefs.patch b/mail/fdm/patches/030-cdefs.patch
index 221d7d41a..d1ae7af3d 100644
--- a/mail/fdm/patches/030-cdefs.patch
+++ b/mail/fdm/patches/030-cdefs.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] Fix bas64 declarations, from makepost at firemail dot cc.
  fdm.h | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/fdm.h b/fdm.h
-index 41eaa37..511a7b1 100644
 --- a/fdm.h
 +++ b/fdm.h
 @@ -20,7 +20,6 @@
@@ -19,7 +17,7 @@ index 41eaa37..511a7b1 100644
  #include <sys/stat.h>
  
  #ifdef HAVE_QUEUE_H
-@@ -725,8 +724,8 @@ size_t		 strlcat(char *, const char *, size_t);
+@@ -725,8 +724,8 @@ size_t		 strlcat(char *, const char *, s
  
  #ifndef HAVE_B64_NTOP
  /* base64.c */
diff --git a/mail/greyfix/patches/100-ignore_cross_compile_test.patch b/mail/greyfix/patches/100-ignore_cross_compile_test.patch
index fda272e2c..41fc7603d 100644
--- a/mail/greyfix/patches/100-ignore_cross_compile_test.patch
+++ b/mail/greyfix/patches/100-ignore_cross_compile_test.patch
@@ -1,6 +1,6 @@
---- a/configure	2017-03-08 20:12:00.720885949 +0200
-+++ b/configure	2017-03-08 20:12:51.210722711 +0200
-@@ -4190,37 +4190,6 @@
+--- a/configure
++++ b/configure
+@@ -4190,37 +4190,6 @@ _ACEOF
  
  fi
  
diff --git a/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch b/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch
index c18ef4efa..f4be787ca 100644
--- a/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch
+++ b/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch
@@ -7,11 +7,9 @@ Subject: [PATCH] OpenSSL 1.1 support for HMAC api
  utils.c | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/utils.c b/utils.c
-index b072138..abfb86e 100755
 --- a/utils.c
 +++ b/utils.c
-@@ -791,8 +791,14 @@ char *encode_cram_md5(char *challenge,char *user,char *secret)
+@@ -791,8 +791,14 @@ char *encode_cram_md5(char *challenge,ch
      unsigned char
          hmac_md5[16];
  
@@ -26,7 +24,7 @@ index b072138..abfb86e 100755
  
      const EVP_MD
          *md5=NULL;
-@@ -831,11 +837,20 @@ char *encode_cram_md5(char *challenge,char *user,char *secret)
+@@ -831,11 +837,20 @@ char *encode_cram_md5(char *challenge,ch
      showVerbose("Challenge After decoding: %s\n",data);
  
      /* take HMAC-MD5 of the challenge*/
diff --git a/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch b/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch
index b8c4eec30..16ba32a27 100644
--- a/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch
+++ b/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch
@@ -9,8 +9,6 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
  utils.c |  6 +++++-
  2 files changed, 14 insertions(+), 2 deletions(-)
 
-diff --git a/main.c b/main.c
-index d275e6a..51bfb1d 100755
 --- a/main.c
 +++ b/main.c
 @@ -91,7 +91,11 @@ static void usage(void)
@@ -40,8 +38,6 @@ index d275e6a..51bfb1d 100755
  #endif /* ! HAVE_OPENSSL */
                  rc = 0;
                  goto ExitProcessing;
-diff --git a/utils.c b/utils.c
-index abfb86e..02366c5 100755
 --- a/utils.c
 +++ b/utils.c
 @@ -440,10 +440,12 @@ void initialize_openssl(char *cipher)
@@ -58,7 +54,7 @@ index abfb86e..02366c5 100755
      ssl_ctx=SSL_CTX_new(SSLv23_client_method());
      if (ssl_ctx == NULL)
      {
-@@ -825,7 +827,9 @@ char *encode_cram_md5(char *challenge,char *user,char *secret)
+@@ -825,7 +827,9 @@ char *encode_cram_md5(char *challenge,ch
          return(NULL);
  
      showVerbose("Server Challenge: %s\n",challenge);
@@ -68,6 +64,3 @@ index abfb86e..02366c5 100755
  
      /* decode the challenge */
      data=mutils_decode_base64((unsigned char *) challenge,strlen(challenge),&data_len);
--- 
-2.19.1
-
diff --git a/mail/nail/patches/010-remove-gssapi.patch b/mail/nail/patches/010-remove-gssapi.patch
index e88d35628..f56297622 100644
--- a/mail/nail/patches/010-remove-gssapi.patch
+++ b/mail/nail/patches/010-remove-gssapi.patch
@@ -1,12 +1,9 @@
-diff --git a/makeconfig b/makeconfig
-index 0ab36b8..ee1e3a1 100644
 --- a/makeconfig
 +++ b/makeconfig
-@@ -413,47 +413,6 @@ int main(void)
- !
+@@ -414,47 +414,6 @@ int main(void)
  fi
  
--cat >$tmp2.c <<\!
+ cat >$tmp2.c <<\!
 -#include <gssapi/gssapi.h>
 -
 -int main(void)
@@ -47,6 +44,7 @@ index 0ab36b8..ee1e3a1 100644
 -}
 -%
 -
- cat >$tmp2.c <<\!
+-cat >$tmp2.c <<\!
  #include "config.h"
  #ifdef HAVE_NL_LANGINFO
+ #include <langinfo.h>
diff --git a/mail/nail/patches/300-openssl-deprecated.patch b/mail/nail/patches/300-openssl-deprecated.patch
index 8ba69adab..d78a6e05a 100644
--- a/mail/nail/patches/300-openssl-deprecated.patch
+++ b/mail/nail/patches/300-openssl-deprecated.patch
@@ -10,7 +10,7 @@
  		initialized = 1;
  	}
  	if (rand_init == 0)
-@@ -215,12 +217,13 @@ ssl_verify_cb(int success, X509_STORE_CTX *store)
+@@ -215,12 +217,13 @@ ssl_verify_cb(int success, X509_STORE_CT
  static const SSL_METHOD *
  ssl_select_method(const char *uhp)
  {
diff --git a/mail/opendkim/patches/020-uclibc.patch b/mail/opendkim/patches/020-uclibc.patch
index b74c3a99e..34da7f4b5 100644
--- a/mail/opendkim/patches/020-uclibc.patch
+++ b/mail/opendkim/patches/020-uclibc.patch
@@ -10,7 +10,7 @@
  	int n;
  	int ret;
  	struct dkim_res_qh *rq;
-@@ -209,6 +212,7 @@ dkim_res_query(void *srv, int type, unsigned char *query, unsigned char *buf,
+@@ -209,6 +212,7 @@ dkim_res_query(void *srv, int type, unsi
  	*qh = (void *) rq;
  
  	return DKIM_DNS_SUCCESS;
diff --git a/mail/sendmail/patches/010-enable-nonroot-install.patch b/mail/sendmail/patches/010-enable-nonroot-install.patch
index ff6e8b301..6093b6d6c 100644
--- a/mail/sendmail/patches/010-enable-nonroot-install.patch
+++ b/mail/sendmail/patches/010-enable-nonroot-install.patch
@@ -1,7 +1,5 @@
-Index: sendmail-8.15.2/cf/cf/Makefile
-===================================================================
---- sendmail-8.15.2.orig/cf/cf/Makefile
-+++ sendmail-8.15.2/cf/cf/Makefile
+--- a/cf/cf/Makefile
++++ b/cf/cf/Makefile
 @@ -80,10 +80,10 @@ install:
  install-cf:  install-sendmail-cf install-submit-cf
  
diff --git a/mail/sendmail/patches/011-libmilter-so-version.patch b/mail/sendmail/patches/011-libmilter-so-version.patch
index fdd5eee11..3b4df034b 100644
--- a/mail/sendmail/patches/011-libmilter-so-version.patch
+++ b/mail/sendmail/patches/011-libmilter-so-version.patch
@@ -1,7 +1,5 @@
-Index: sendmail-8.15.2/libmilter/Makefile.m4
-===================================================================
---- sendmail-8.15.2.orig/libmilter/Makefile.m4
-+++ sendmail-8.15.2/libmilter/Makefile.m4
+--- a/libmilter/Makefile.m4
++++ b/libmilter/Makefile.m4
 @@ -9,7 +9,10 @@ define(`confMT', `true')
  SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
  PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
diff --git a/mail/sendmail/patches/102-pthreads-stack-size.patch b/mail/sendmail/patches/102-pthreads-stack-size.patch
index a2e10d6d0..aec19bffd 100644
--- a/mail/sendmail/patches/102-pthreads-stack-size.patch
+++ b/mail/sendmail/patches/102-pthreads-stack-size.patch
@@ -12,10 +12,8 @@ above. Also, a bug report has been filed upstream:
 https://sourceforge.net/p/opendkim/bugs/258/
 
 
-Index: sendmail-8.15.2/libmilter/libmilter.h
-===================================================================
---- sendmail-8.15.2.orig/libmilter/libmilter.h
-+++ sendmail-8.15.2/libmilter/libmilter.h
+--- a/libmilter/libmilter.h
++++ b/libmilter/libmilter.h
 @@ -127,10 +127,10 @@ struct smfi_str
  # define MI_SOCK_READ(s, b, l)	read(s, b, l)
  # define MI_SOCK_READ_FAIL(x)	((x) < 0)
@@ -29,10 +27,8 @@ Index: sendmail-8.15.2/libmilter/libmilter.h
  typedef pthread_mutex_t smutex_t;
  # define smutex_init(mp)	(pthread_mutex_init(mp, NULL) == 0)
  # define smutex_destroy(mp)	(pthread_mutex_destroy(mp) == 0)
-Index: sendmail-8.15.2/libmilter/main.c
-===================================================================
---- sendmail-8.15.2.orig/libmilter/main.c
-+++ sendmail-8.15.2/libmilter/main.c
+--- a/libmilter/main.c
++++ b/libmilter/main.c
 @@ -16,6 +16,12 @@ SM_RCSID("@(#)$Id: main.c,v 8.85 2013-11
  #include <fcntl.h>
  #include <sys/stat.h>