diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-10 08:54:50 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-10 12:04:52 +0000 |
| commit | 28092ee650cf182b3b90eab0fd9c6d41d1d6f7c2 (patch) | |
| tree | 0bed787518048f9851484890f362e80eccbb2b9b /testing/prayer | |
| parent | be0d737c24c96e957c822f303bc082b1df3ea59d (diff) | |
| download | aports-28092ee650cf182b3b90eab0fd9c6d41d1d6f7c2.tar.bz2 aports-28092ee650cf182b3b90eab0fd9c6d41d1d6f7c2.tar.xz | |
testing/prayer: rebuild against libressl
Diffstat (limited to 'testing/prayer')
| -rw-r--r-- | testing/prayer/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/prayer/libressl.patch | 40 |
2 files changed, 51 insertions, 6 deletions
diff --git a/testing/prayer/APKBUILD b/testing/prayer/APKBUILD index 80c91bf168..43b98f52e7 100644 --- a/testing/prayer/APKBUILD +++ b/testing/prayer/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: pkgname=prayer pkgver=1.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight webmail interface for IMAP servers" url="http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/" arch="all" license="GPL" depends="" -makedepends="perl imap-dev openssl-dev db-dev linux-pam-dev tar tidyhtml-dev>=5.0.0" +makedepends="perl imap-dev libressl-dev db-dev linux-pam-dev tar + tidyhtml-dev>=5.0.0 zlib-dev" source="ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-$pkgver.tar.gz buildfix.patch disable_ssl3.patch @@ -17,7 +18,8 @@ source="ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-$pkgver.tar.gz htmltidy_buffio.patch sighandling.patch unbrand_accountd.patch - unbrand_cam_template.patch" + unbrand_cam_template.patch + libressl.patch" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -38,7 +40,8 @@ e5cfaee5abb3f92b5ad8b19cb31c4d10 makefile_install_config.patch 7c4f91263a470a2ec03fe1a0a8b531ce htmltidy_buffio.patch 4be579fda05ae887b1bbcd5c66145e68 sighandling.patch 12117d22dfaaf74d68da235b31dec2fc unbrand_accountd.patch -807ab15f361fe567047585da7451fac5 unbrand_cam_template.patch" +807ab15f361fe567047585da7451fac5 unbrand_cam_template.patch +b148ef84da83066a948ecd95e8b1a5f0 libressl.patch" sha256sums="aa79da17dceeb7eb24a1744e25286b3518eef882d8682f9959050d2bfb92ae8c prayer-1.3.5.tar.gz a8b483bcb9d951e992fa0679651758a48d0cb0c1b3e79e6b4168b0b8096fa25b buildfix.patch 1b8bfb1a560434444992c3cfc050e59384f4737eb834aa2fe89e5f55ccc716e2 disable_ssl3.patch @@ -47,7 +50,8 @@ af65ba073614068bf3d7136d0193bcf870a9963c66a0adad163c4775573ae875 no_db_version_ e8ecf9f7661ceacd89b0972154e3c7d84557b7ec942fc8ac3cfb0d861cc03dba htmltidy_buffio.patch 8a951fad98cffe4a12e52d6afc708b3e7e6b0f5ac2d4d4c8cb6d2a21bc770075 sighandling.patch 22541d2f5c07660952b27f8389a2ff6240fddb28e09e2e3d93c7646154438180 unbrand_accountd.patch -ed12c3cd3d6fff26823531b660edeee8b0fc8455f8fc9cffdccb76435bd55820 unbrand_cam_template.patch" +ed12c3cd3d6fff26823531b660edeee8b0fc8455f8fc9cffdccb76435bd55820 unbrand_cam_template.patch +59ebfb0b05d223d549cb1d6656ca2562b4e9901f3c0235fea506455ebd3ecd05 libressl.patch" sha512sums="6bb190fda2ac60c6f3801bc89eb719bea7b479c4417eb5e3315d95118dcfecceca9274fb0478360756d2f361d08ebf1f8176a393dbf1b5a3775a52f46e315be1 prayer-1.3.5.tar.gz ac7fc9e26871fd2e11e4e80bb0b6464f1262aa0b7298d043b5663da77c16b97174ac96214b2383432311a4ad6fbb4d35c4bbef0f5783be0462acf600ec15ee05 buildfix.patch ebb7710d9368aabeb8107f0cb16c399fb599345ff90fe3b8ae13a86949dd449ef13d7324048b9774183636c1581d1aa507053577608f9eff606b0d328e7ccf52 disable_ssl3.patch @@ -56,4 +60,5 @@ a968e6cc3ce3c255918a0a520f7c81b0efaafcfd4fd548905167b11c69ce3b633524771af8fcb886 f750f48a89e1eeac01638ea6d73b1850a5909041774a163d47537d8f5e77a7a01dc7928efd86801a63072443e2477cd192e4a089ddaeee0249535d1dc8157218 htmltidy_buffio.patch 679cbdf560909005cc485317a2c35f4fe5c94eacb938996d58632a030d1a0f456e40ec883ded2a31879b20c9246fede2ead44c740768d1ab936c3a231c7ad8b2 sighandling.patch 60c56f67e4b29b43973506f77837432d8e2449ea38ceb86b6b430c92af7023257740625bb3bedfe6bfa16d16c9dea73c523a98329e9415f5fc725861cc4de629 unbrand_accountd.patch -cb230d3b1e64915a6843d72222a11d4d6aea1b5e27f6ba99870cb9011c41abcacbc30c183c19c706f26360001dbd38d3ea274393ddbb8d6d6bbf2661cf1f2568 unbrand_cam_template.patch" +cb230d3b1e64915a6843d72222a11d4d6aea1b5e27f6ba99870cb9011c41abcacbc30c183c19c706f26360001dbd38d3ea274393ddbb8d6d6bbf2661cf1f2568 unbrand_cam_template.patch +281d140ebb875540df3748095d928eac24f5d8d4c777b2df053340f59c6e2f84057363a4aa8bf4af9f66cedc1590d27a6955cc4b9b481457de96c2347e3ed77f libressl.patch" diff --git a/testing/prayer/libressl.patch b/testing/prayer/libressl.patch new file mode 100644 index 0000000000..495b556143 --- /dev/null +++ b/testing/prayer/libressl.patch @@ -0,0 +1,40 @@ +diff --git a/lib/os.c b/lib/os.c +index fa53e04..a1408ed 100644 +--- a/lib/os.c ++++ b/lib/os.c +@@ -543,6 +543,7 @@ BOOL os_random(struct ssl_config * ssl_config, void *buffer, unsigned long count + { + int fd; + ++#ifndef OPENSSL_NO_EGD + if (ssl_config->egd_socket) { + if ((fd = os_connect_unix_socket(ssl_config->egd_socket)) < 0) + return (NIL); +@@ -564,6 +565,7 @@ BOOL os_random(struct ssl_config * ssl_config, void *buffer, unsigned long count + close(fd); + return (T); + } ++#endif + + if ((fd = open("/dev/urandom", O_RDONLY)) < 0) + return (NIL); +diff --git a/lib/ssl.c b/lib/ssl.c +index 0e652c8..34b7167 100644 +--- a/lib/ssl.c ++++ b/lib/ssl.c +@@ -78,6 +78,7 @@ static void os_initialize_prng(struct ssl_config *ssl_config) + int totbytes = 0; + int bytes; + ++#ifndef OPENSSL_NO_EGD + if (ssl_config->egd_socket) { + if ((bytes = RAND_egd(ssl_config->egd_socket)) == -1) { + log_fatal("EGD Socket %s failed", ssl_config->egd_socket); +@@ -88,6 +89,7 @@ static void os_initialize_prng(struct ssl_config *ssl_config) + goto SEEDED; /* ditto */ + } + } ++#endif + + /* Try the good-old default /dev/urandom, if available */ + totbytes += add_rand_file("/dev/urandom"); |