diff options
author | plunky <plunky@pkgsrc.org> | 2020-04-19 06:06:00 +0000 |
---|---|---|
committer | plunky <plunky@pkgsrc.org> | 2020-04-19 06:06:00 +0000 |
commit | e027069d1ae6e11ba090e390756909b3719bcf84 (patch) | |
tree | 76083d7f19865595e718e45a5aee43674d5259c5 /www | |
parent | f12f901a3c04079e71f83f65da304bacb4aa664d (diff) | |
download | pkgsrc-e027069d1ae6e11ba090e390756909b3719bcf84.tar.gz |
repair build:
add COMPILER_RPATH_FLAG to make env
drop SSl3 support as breaks with newer OpenSSL
Diffstat (limited to 'www')
-rw-r--r-- | www/screws/Makefile | 5 | ||||
-rw-r--r-- | www/screws/distinfo | 8 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_Config.c | 15 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_Ssl.c | 15 | ||||
-rw-r--r-- | www/screws/patches/patch-src_Server_Ssl.h | 11 |
5 files changed, 34 insertions, 20 deletions
diff --git a/www/screws/Makefile b/www/screws/Makefile index 57901fe059e..7f4bebf157c 100644 --- a/www/screws/Makefile +++ b/www/screws/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.47 2020/01/18 21:51:11 jperkin Exp $ +# $NetBSD: Makefile,v 1.48 2020/04/19 06:06:00 plunky Exp $ # DISTNAME= screws-0.56 -PKGREVISION= 24 +PKGREVISION= 25 CATEGORIES= www MASTER_SITES= ftp://ftp.nopcode.org/prj/screws/ @@ -21,6 +21,7 @@ PKG_GROUPS= ${SCREWS_GROUP} MAKE_ENV+= ETCPREFIX=${PKG_SYSCONFDIR:Q} MAKE_ENV+= PERL=${PERL5:Q} +MAKE_ENV+= COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG} INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} EGDIR= ${PREFIX}/share/examples/screws diff --git a/www/screws/distinfo b/www/screws/distinfo index 9ab50d34809..a97667afe82 100644 --- a/www/screws/distinfo +++ b/www/screws/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2016/04/03 20:24:27 joerg Exp $ +$NetBSD: distinfo,v 1.19 2020/04/19 06:06:00 plunky Exp $ SHA1 (screws-0.56.tar.gz) = 3335e7e7116561499ee7164831c31df4ecebe403 RMD160 (screws-0.56.tar.gz) = 5d7f1af67a42cd5726f0d4708713bb13c4c8fe21 @@ -15,7 +15,7 @@ SHA1 (patch-ah) = 90ba05b735295caa1ce6974ac5d7c1d35799c49f SHA1 (patch-ai) = 76c15330b3f3ba3c9d7442d98ea461e6b89ce33d SHA1 (patch-aj) = f2b4c3d70c309a5221fea0d6ff008a597c9f8411 SHA1 (patch-ak) = fde982c23af9f6c1d724276f8e8f5dd19b0faebe -SHA1 (patch-src_Server_Config.c) = 385339a7ac651b139963b3dba1a81dde26d407ff +SHA1 (patch-src_Server_Config.c) = 4d139aa8e07147bb2682b14ae106615543b69f23 SHA1 (patch-src_Server_IO__buffer.c) = c695f7dfaa2f000ab191edc339c1c02b95641a42 -SHA1 (patch-src_Server_Ssl.c) = a782d93fef0ac57c05876b3567f15321c7797207 -SHA1 (patch-src_Server_Ssl.h) = 2dd870425c5642303fd5a34231b3c1cd72795a24 +SHA1 (patch-src_Server_Ssl.c) = dddea00b99ad13f954cf6c875e764dc0da26465f +SHA1 (patch-src_Server_Ssl.h) = 83c54b0e2f4abbb244f8e0c86a1f6a6abe11b376 diff --git a/www/screws/patches/patch-src_Server_Config.c b/www/screws/patches/patch-src_Server_Config.c index ba697f4235f..8c03a134bae 100644 --- a/www/screws/patches/patch-src_Server_Config.c +++ b/www/screws/patches/patch-src_Server_Config.c @@ -1,14 +1,19 @@ -$NetBSD: patch-src_Server_Config.c,v 1.1 2016/04/03 20:24:27 joerg Exp $ +$NetBSD: patch-src_Server_Config.c,v 1.2 2020/04/19 06:06:00 plunky Exp $ ---- src/Server/Config.c.orig 2016-04-03 16:01:12.152955846 +0000 +remove deprecated methods + +--- src/Server/Config.c.orig 2004-09-16 22:05:58.000000000 +0000 +++ src/Server/Config.c -@@ -648,9 +648,6 @@ conf_parse_key(line,buf,key) +@@ -648,12 +648,6 @@ conf_parse_key(line,buf,key) case K_ENC: sscanf(buf,"%*s %s",b[0]); if ( conf_check_args(b,1) ) return ERROR_PREVIOUS; - if (!strcmp(b[0],"ssl2")) - Svr.enc=ENC_SSL2; - else - if (!strcmp(b[0],"ssl3")) - Svr.enc=ENC_SSL3; +- if (!strcmp(b[0],"ssl3")) +- Svr.enc=ENC_SSL3; +- else + if (!strcmp(b[0],"ssl23")) + Svr.enc=ENC_SSL23; else diff --git a/www/screws/patches/patch-src_Server_Ssl.c b/www/screws/patches/patch-src_Server_Ssl.c index 3cbeba90bbd..f7ad6135103 100644 --- a/www/screws/patches/patch-src_Server_Ssl.c +++ b/www/screws/patches/patch-src_Server_Ssl.c @@ -1,14 +1,19 @@ -$NetBSD: patch-src_Server_Ssl.c,v 1.1 2016/04/03 20:24:27 joerg Exp $ +$NetBSD: patch-src_Server_Ssl.c,v 1.2 2020/04/19 06:06:00 plunky Exp $ ---- src/Server/Ssl.c.orig 2016-04-03 16:00:51.049640130 +0000 +remove deprecatd methods + +--- src/Server/Ssl.c.orig 2004-09-16 22:05:58.000000000 +0000 +++ src/Server/Ssl.c -@@ -82,9 +82,6 @@ SslInit(n,ctx) +@@ -82,12 +82,6 @@ SslInit(n,ctx) switch(Svr.enc) { - case ENC_SSL2: - sm=SSLv2_server_method(); - break; - case ENC_SSL3: - sm=SSLv3_server_method(); +- case ENC_SSL3: +- sm=SSLv3_server_method(); +- break; + case ENC_SSL23: + sm=SSLv23_server_method(); break; diff --git a/www/screws/patches/patch-src_Server_Ssl.h b/www/screws/patches/patch-src_Server_Ssl.h index e58d70cda29..e1c0e0a7bfa 100644 --- a/www/screws/patches/patch-src_Server_Ssl.h +++ b/www/screws/patches/patch-src_Server_Ssl.h @@ -1,12 +1,15 @@ -$NetBSD: patch-src_Server_Ssl.h,v 1.1 2016/04/03 20:24:27 joerg Exp $ +$NetBSD: patch-src_Server_Ssl.h,v 1.2 2020/04/19 06:06:00 plunky Exp $ ---- src/Server/Ssl.h.orig 2016-04-03 16:01:03.871663755 +0000 +remove deprecated methods + +--- src/Server/Ssl.h.orig 2004-09-16 22:05:58.000000000 +0000 +++ src/Server/Ssl.h -@@ -9,7 +9,6 @@ +@@ -9,8 +9,6 @@ #endif enum { - ENC_SSL2, - ENC_SSL3, +- ENC_SSL3, ENC_SSL23, ENC_TLS + }; |