[arch-commits] Commit in imap/repos/extra-x86_64 (13 files)

Pierre Schmitz pierre at gemini.archlinux.org
Fri Sep 17 09:31:58 UTC 2021


    Date: Friday, September 17, 2021 @ 09:31:57
  Author: pierre
Revision: 424284

archrelease: copy trunk to extra-x86_64

Added:
  imap/repos/extra-x86_64/PKGBUILD
    (from rev 424283, imap/trunk/PKGBUILD)
  imap/repos/extra-x86_64/c-client-2006k_GENTOO_amd64-so-fix.patch
    (from rev 424283, imap/trunk/c-client-2006k_GENTOO_amd64-so-fix.patch)
  imap/repos/extra-x86_64/imap
    (from rev 424283, imap/trunk/imap)
  imap/repos/extra-x86_64/imap.install
    (from rev 424283, imap/trunk/imap.install)
  imap/repos/extra-x86_64/ipop2
    (from rev 424283, imap/trunk/ipop2)
  imap/repos/extra-x86_64/ipop3
    (from rev 424283, imap/trunk/ipop3)
Deleted:
  imap/repos/extra-x86_64/1006_openssl1.1_autoverify.patch
  imap/repos/extra-x86_64/PKGBUILD
  imap/repos/extra-x86_64/c-client-2006k_GENTOO_amd64-so-fix.patch
  imap/repos/extra-x86_64/imap
  imap/repos/extra-x86_64/imap.install
  imap/repos/extra-x86_64/ipop2
  imap/repos/extra-x86_64/ipop3

------------------------------------------+
 1006_openssl1.1_autoverify.patch         |   58 ----------
 PKGBUILD                                 |  154 ++++++++++++++---------------
 c-client-2006k_GENTOO_amd64-so-fix.patch |   26 ++--
 imap                                     |   20 +--
 imap.install                             |   80 +++++++--------
 ipop2                                    |   20 +--
 ipop3                                    |   20 +--
 7 files changed, 159 insertions(+), 219 deletions(-)

Deleted: 1006_openssl1.1_autoverify.patch
===================================================================
--- 1006_openssl1.1_autoverify.patch	2021-09-17 09:31:51 UTC (rev 424283)
+++ 1006_openssl1.1_autoverify.patch	2021-09-17 09:31:57 UTC (rev 424284)
@@ -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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-17 09:31:51 UTC (rev 424283)
+++ PKGBUILD	2021-09-17 09:31:57 UTC (rev 424284)
@@ -1,78 +0,0 @@
-
-pkgbase=imap
-pkgname=(imap c-client)
-pkgver=2007f
-pkgrel=11
-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'
-        'imap' 'ipop2' 'ipop3')
-options=('staticlibs')
-md5sums=('2126fd125ea26b73b20f01fcd5940369'
-         '7f3937a871edd54203fe51f91423e204'
-         'cc8cc4df43f73bc144b9a41c55ef5991'
-         '3ae5b3b333bc8ea2da106f6a97d7bd8d'
-         '448f988dc5f9bdb2223dcea3abc4f5f1'
-         '1499b13015075f0aafba04324a6f523a')
-
-prepare() {
-  cd $srcdir/$pkgbase-$pkgver
-
-  sed \
-    -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
-    -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
-    -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
-    -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
-  # 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}"
-
-}
-
-package_imap() {
-  pkgdesc="An IMAP/POP server"
-  depends=('c-client')
-  provides=('imap-server' 'pop3-server')
-  conflicts=('courier-mta' 'courier-imap')
-  backup=(etc/xinetd.d/{imap,ipop2,ipop3})
-  install=imap.install
-
-  cd $srcdir/$pkgbase-$pkgver
-  install -d $pkgdir/usr/bin
-  install -D -m755 imapd/imapd $pkgdir/usr/bin/imapd
-  install -D -m755 ipopd/ipop2d $pkgdir/usr/bin/ipop2d
-  install -D -m755 ipopd/ipop3d $pkgdir/usr/bin/ipop3d
-
-  # install xinetd.d configs
-  install -D -m644 ../imap $pkgdir/etc/xinetd.d/imap
-  install -D -m644 ../ipop2 $pkgdir/etc/xinetd.d/ipop2
-  install -D -m644 ../ipop3 $pkgdir/etc/xinetd.d/ipop3
-}
-
-package_c-client() {
-  pkgdesc="Imap client library"
-  depends=('pam')
-
-  cd $srcdir/$pkgbase-$pkgver
-
-  for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
-    osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do
-    install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h
-  done
-  install -D -m644 c-client/c-client.a $pkgdir/usr/lib/c-client.a
-  ln -sf c-client.a $pkgdir/usr/lib/libc-client.a
-
-  install -D -m755 c-client/libc-client.so.1.0.0 $pkgdir/usr/lib/libc-client.so.1.0.0
-  ln -sf /usr/lib/libc-client.so.1.0.0 $pkgdir/usr/lib/libc-client.so.1
-  ln -sf /usr/lib/libc-client.so.1.0.0 $pkgdir/usr/lib/libc-client.so
-}

Copied: imap/repos/extra-x86_64/PKGBUILD (from rev 424283, imap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-09-17 09:31:57 UTC (rev 424284)
@@ -0,0 +1,76 @@
+
+pkgbase=imap
+pkgname=(imap c-client)
+pkgver=2007f
+pkgrel=12
+arch=('x86_64')
+license=('APACHE')
+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=('SKIP'
+            '77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184'
+            'f192e6e6d7388c7f63441d4f122aa4c667a5eef93f22cb748b7aca0bfae2b034'
+            '43899df58e2e21adcf08ed686cfa26e793ba1e4b376dd917cba4c1e34e7214bd'
+            'b91477ef6706a693ea01e2dc15a7b826b6ae89be8182f91a6817d2fb95cbdb72')
+
+prepare() {
+  cd "$srcdir/$pkgbase-src"
+
+  sed \
+    -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
+    -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
+    -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
+    -i src/osdep/unix/Makefile
+
+  patch -p1 -i "$srcdir/c-client-2006k_GENTOO_amd64-so-fix.patch"
+}
+
+build() {
+  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}"
+
+}
+
+package_imap() {
+  pkgdesc="An IMAP/POP server"
+  depends=('c-client')
+  provides=('imap-server' 'pop3-server')
+  conflicts=('courier-mta' 'courier-imap')
+  backup=(etc/xinetd.d/{imap,ipop2,ipop3})
+  install=imap.install
+
+  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"
+  install -D -m755 ipopd/ipop3d "$pkgdir/usr/bin/ipop3d"
+
+  # install xinetd.d configs
+  install -D -m644 ../imap "$pkgdir/etc/xinetd.d/imap"
+  install -D -m644 ../ipop2 "$pkgdir/etc/xinetd.d/ipop2"
+  install -D -m644 ../ipop3 "$pkgdir/etc/xinetd.d/ipop3"
+}
+
+package_c-client() {
+  pkgdesc="Imap client library"
+  depends=('pam')
+
+  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
+    install -D -m644 c-client/${i}.h "$pkgdir/usr/include/imap/${i}.h"
+  done
+  install -D -m644 c-client/c-client.a "$pkgdir/usr/lib/c-client.a"
+  ln -sf c-client.a "$pkgdir/usr/lib/libc-client.a"
+
+  install -D -m755 c-client/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so.1.0.0"
+  ln -sf /usr/lib/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so.1"
+  ln -sf /usr/lib/libc-client.so.1.0.0 "$pkgdir/usr/lib/libc-client.so"
+}

Deleted: c-client-2006k_GENTOO_amd64-so-fix.patch
===================================================================
--- c-client-2006k_GENTOO_amd64-so-fix.patch	2021-09-17 09:31:51 UTC (rev 424283)
+++ c-client-2006k_GENTOO_amd64-so-fix.patch	2021-09-17 09:31:57 UTC (rev 424284)
@@ -1,13 +0,0 @@
-diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
---- a/src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
-+++ b/src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
-@@ -962,6 +962,9 @@ onceenv:
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
- 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
-+	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+	 >> ARCHIVE
- 	echo $(OS) > OSTYPE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
- 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)

Copied: imap/repos/extra-x86_64/c-client-2006k_GENTOO_amd64-so-fix.patch (from rev 424283, imap/trunk/c-client-2006k_GENTOO_amd64-so-fix.patch)
===================================================================
--- c-client-2006k_GENTOO_amd64-so-fix.patch	                        (rev 0)
+++ c-client-2006k_GENTOO_amd64-so-fix.patch	2021-09-17 09:31:57 UTC (rev 424284)
@@ -0,0 +1,13 @@
+diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
+--- a/src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
++++ b/src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
+@@ -962,6 +962,9 @@ onceenv:
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)

Deleted: imap
===================================================================
--- imap	2021-09-17 09:31:51 UTC (rev 424283)
+++ imap	2021-09-17 09:31:57 UTC (rev 424284)
@@ -1,10 +0,0 @@
-service imap2
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/bin/imapd
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}

Copied: imap/repos/extra-x86_64/imap (from rev 424283, imap/trunk/imap)
===================================================================
--- imap	                        (rev 0)
+++ imap	2021-09-17 09:31:57 UTC (rev 424284)
@@ -0,0 +1,10 @@
+service imap2
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/bin/imapd
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}

Deleted: imap.install
===================================================================
--- imap.install	2021-09-17 09:31:51 UTC (rev 424283)
+++ imap.install	2021-09-17 09:31:57 UTC (rev 424284)
@@ -1,40 +0,0 @@
-post_install() {
-  if [ ! -e /etc/ssl/certs/imapd.pem ]; then
-    generate_certificate imapd
-  fi
-  if [ ! -e /etc/ssl/certs/ipop3d.pem ]; then
-    generate_certificate ipop3d
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-generate_certificate() {
-  t=$1
-  echo -n "Generating $t certificate..."
-
-  umask 077
-  tmpdir=$(mktemp -d)
-  PEM1="$tmpdir/$t.pem1"
-  PEM2="$tmpdir/$t.pem2"
-  cert="$tmpdir/$t.pem"
-  /usr/bin/openssl req -newkey rsa:4096 -keyout "$PEM1" \
-    -nodes -x509 -days 365 -out "$PEM2" >/dev/null 2>&1 << EOF
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root at localhost.localdomain
-EOF
-
-  cat "$PEM1" >  "$cert"
-  echo ""     >> "$cert"
-  cat "$PEM2" >> "$cert"
-  install -Dm 600 "$cert" -t /etc/ssl/certs
-  rm -rf "$tmpdir"
-  echo "done."
-}

Copied: imap/repos/extra-x86_64/imap.install (from rev 424283, imap/trunk/imap.install)
===================================================================
--- imap.install	                        (rev 0)
+++ imap.install	2021-09-17 09:31:57 UTC (rev 424284)
@@ -0,0 +1,40 @@
+post_install() {
+  if [ ! -e /etc/ssl/certs/imapd.pem ]; then
+    generate_certificate imapd
+  fi
+  if [ ! -e /etc/ssl/certs/ipop3d.pem ]; then
+    generate_certificate ipop3d
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+generate_certificate() {
+  t=$1
+  echo -n "Generating $t certificate..."
+
+  umask 077
+  tmpdir=$(mktemp -d)
+  PEM1="$tmpdir/$t.pem1"
+  PEM2="$tmpdir/$t.pem2"
+  cert="$tmpdir/$t.pem"
+  /usr/bin/openssl req -newkey rsa:4096 -keyout "$PEM1" \
+    -nodes -x509 -days 365 -out "$PEM2" >/dev/null 2>&1 << EOF
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root at localhost.localdomain
+EOF
+
+  cat "$PEM1" >  "$cert"
+  echo ""     >> "$cert"
+  cat "$PEM2" >> "$cert"
+  install -Dm 600 "$cert" -t /etc/ssl/certs
+  rm -rf "$tmpdir"
+  echo "done."
+}

Deleted: ipop2
===================================================================
--- ipop2	2021-09-17 09:31:51 UTC (rev 424283)
+++ ipop2	2021-09-17 09:31:57 UTC (rev 424284)
@@ -1,10 +0,0 @@
-service pop2
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/bin/ipop2d
-        log_on_success  += HOST DURATION 
-        log_on_failure  += HOST
-        disable                 = yes
-}

Copied: imap/repos/extra-x86_64/ipop2 (from rev 424283, imap/trunk/ipop2)
===================================================================
--- ipop2	                        (rev 0)
+++ ipop2	2021-09-17 09:31:57 UTC (rev 424284)
@@ -0,0 +1,10 @@
+service pop2
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/bin/ipop2d
+        log_on_success  += HOST DURATION 
+        log_on_failure  += HOST
+        disable                 = yes
+}

Deleted: ipop3
===================================================================
--- ipop3	2021-09-17 09:31:51 UTC (rev 424283)
+++ ipop3	2021-09-17 09:31:57 UTC (rev 424284)
@@ -1,10 +0,0 @@
-service pop3
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/bin/ipop3d
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}

Copied: imap/repos/extra-x86_64/ipop3 (from rev 424283, imap/trunk/ipop3)
===================================================================
--- ipop3	                        (rev 0)
+++ ipop3	2021-09-17 09:31:57 UTC (rev 424284)
@@ -0,0 +1,10 @@
+service pop3
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/bin/ipop3d
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}



More information about the arch-commits mailing list