[arch-commits] Commit in imap/trunk (1006_openssl1.1_autoverify.patch PKGBUILD)

[Pierre Schmitz]

    Date: Friday, September 17, 2021 @ 09:31:51
  Author: pierre
Revision: 424283

upgpkg: imap 2007f-12: FS#71893: Switch upstream URL

Modified:
  imap/trunk/PKGBUILD
Deleted:
  imap/trunk/1006_openssl1.1_autoverify.patch

----------------------------------+
 1006_openssl1.1_autoverify.patch |   58 -------------------------------------
 PKGBUILD                         |   22 ++++++--------
 2 files changed, 10 insertions(+), 70 deletions(-)

Deleted: 1006_openssl1.1_autoverify.patch
===================================================================
--- 1006_openssl1.1_autoverify.patch	2021-09-17 09:19:56 UTC (rev 424282)
+++ 1006_openssl1.1_autoverify.patch	2021-09-17 09:31:51 UTC (rev 424283)
@@ -1,58 +0,0 @@
-Description: Support OpenSSL 1.1
- When building with OpenSSL 1.1 and newer, use the new built-in
- hostname verification instead of code that doesn't compile due to
- structs having been made opaque.
-Bug-Debian: https://bugs.debian.org/828589
-
---- a/src/osdep/unix/ssl_unix.c
-+++ b/src/osdep/unix/ssl_unix.c
-@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
- 				/* disable certificate validation? */
-   if (flags & NET_NOVALIDATECERT)
-     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
--  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
-+  else {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000      
-+      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
-+      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-+      X509_VERIFY_PARAM_set1_host(param, host, 0);
-+#endif
-+
-+      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
- 				/* set default paths to CAs... */
-+  }
-   SSL_CTX_set_default_verify_paths (stream->context);
- 				/* ...unless a non-standard path desired */
-   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
-@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
-   if (SSL_write (stream->con,"",0) < 0)
-     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
- 				/* need to validate host names? */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-   if (!(flags & NET_NOVALIDATECERT) &&
-       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
- 				host))) {
-@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
-     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
-     return ssl_last_error = cpystr (tmp);
-   }
-+#endif
-   return NIL;
- }
- 

-@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
-  * Returns: NIL if validated, else string of error message
-  */
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- static char *ssl_validate_cert (X509 *cert,char *host)
- {
-   int i,n;
-@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
-   else ret = "Unable to locate common name in certificate";
-   return ret;
- }
-+#endif
- 

- /* Case-independent wildcard pattern match
-  * Accepts: base string

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-17 09:19:56 UTC (rev 424282)
+++ PKGBUILD	2021-09-17 09:31:51 UTC (rev 424283)
@@ -2,24 +2,23 @@
 pkgbase=imap
 pkgname=(imap c-client)
 pkgver=2007f
-pkgrel=11
+pkgrel=12
 arch=('x86_64')
 license=('APACHE')
-url="https://www.washington.edu/imap"
-makedepends=('pam')
-source=("https://www.mirrorservice.org/sites/ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
-        'c-client-2006k_GENTOO_amd64-so-fix.patch' '1006_openssl1.1_autoverify.patch'
+url="https://github.com/uw-imap/imap"
+makedepends=('pam' 'git')
+source=("imap-src::git+https://github.com/uw-imap/imap.git#tag=patches-FD29-RPM"
+        'c-client-2006k_GENTOO_amd64-so-fix.patch'
         'imap' 'ipop2' 'ipop3')
 options=('staticlibs')
-sha256sums=('53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28'
+sha256sums=('SKIP'
             '77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184'
-            '7c41c4aec4f25546c998593a09386bbb1d6c526ba7d6f65e3f55a17c20644d0a'
             'f192e6e6d7388c7f63441d4f122aa4c667a5eef93f22cb748b7aca0bfae2b034'
             '43899df58e2e21adcf08ed686cfa26e793ba1e4b376dd917cba4c1e34e7214bd'
             'b91477ef6706a693ea01e2dc15a7b826b6ae89be8182f91a6817d2fb95cbdb72')
 
 prepare() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-src"
 
   sed \
     -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
@@ -28,11 +27,10 @@
     -i src/osdep/unix/Makefile
 
   patch -p1 -i "$srcdir/c-client-2006k_GENTOO_amd64-so-fix.patch"
-  patch -p1 -i "$srcdir/1006_openssl1.1_autoverify.patch"
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-src"
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
   yes "y" | make lnp EXTRAAUTHENTICATORS=gss PASSWDTYPE=pam SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lpam" EXTRALDFLAGS="${LDFLAGS}"
@@ -47,7 +45,7 @@
   backup=(etc/xinetd.d/{imap,ipop2,ipop3})
   install=imap.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-src"
   install -d "$pkgdir/usr/bin"
   install -D -m755 imapd/imapd "$pkgdir/usr/bin/imapd"
   install -D -m755 ipopd/ipop2d "$pkgdir/usr/bin/ipop2d"
@@ -63,7 +61,7 @@
   pkgdesc="Imap client library"
   depends=('pam')
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir/$pkgbase-src"
 
   for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
     osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do