diff options
author | joerg <joerg@pkgsrc.org> | 2016-12-15 23:46:48 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2016-12-15 23:46:48 +0000 |
commit | 195d194709b2a048098787b32e54327203058585 (patch) | |
tree | da88d3700a76d90adf8074359582df7757f28810 /chat/psybnc | |
parent | 6b1ea02f6dff254e99731ae08d776daaae316ef6 (diff) | |
download | pkgsrc-195d194709b2a048098787b32e54327203058585.tar.gz |
Don't create certificates at build time. They are not installed and the
process fails if no openssl.cnf exists. Patch can likely be extended to
remove dependency on the openssl binary completely, but that's beyond
the scope of this fix.
Diffstat (limited to 'chat/psybnc')
-rw-r--r-- | chat/psybnc/distinfo | 4 | ||||
-rw-r--r-- | chat/psybnc/patches/patch-ac | 40 |
2 files changed, 36 insertions, 8 deletions
diff --git a/chat/psybnc/distinfo b/chat/psybnc/distinfo index 010d3c29ae0..e1ff9418d00 100644 --- a/chat/psybnc/distinfo +++ b/chat/psybnc/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 01:20:23 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/12/15 23:46:48 joerg Exp $ SHA1 (psyBNC-2.4BETA2.tar.gz) = 6af7b3a89857213fdcca05deeeedd0303fb614bf RMD160 (psyBNC-2.4BETA2.tar.gz) = 053d09539341ebe9936a50a80b35bd9849f70eb1 SHA512 (psyBNC-2.4BETA2.tar.gz) = cb92d4273dd8547f22df7bd9fd3a2e50a14a40d18eecea8438e4a27259156de65986a588f0470c022e9ca3b372e1c74f3cf5429c0673254c580b6b30e2c80e53 Size (psyBNC-2.4BETA2.tar.gz) = 1061094 bytes SHA1 (patch-aa) = 61b46a7180926d56fb0b56c9c56320695962176b -SHA1 (patch-ac) = 44dfcef810bd557a5ffc019d7a6a8303b9b8295c +SHA1 (patch-ac) = 62b0d9a0a4e0a8ed9417d1646de0dfc4bd3a92e6 diff --git a/chat/psybnc/patches/patch-ac b/chat/psybnc/patches/patch-ac index 0fb105f4b95..ff8e5079aa5 100644 --- a/chat/psybnc/patches/patch-ac +++ b/chat/psybnc/patches/patch-ac @@ -1,6 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2014/06/15 21:55:17 pettai Exp $ +$NetBSD: patch-ac,v 1.2 2016/12/15 23:46:48 joerg Exp $ -add pkgsrc path to openssl +Add pkgsrc path to openssl. +Don't bother creating SSL keys, they are not installed anyway and should +be created on the target system. --- tools/autoconf.c.orig 2011-07-14 18:11:35.000000000 +0000 +++ tools/autoconf.c @@ -9,7 +11,7 @@ add pkgsrc path to openssl system(sysbuf); #else - system(CC " tools/chkssl.c -I/usr/local/ssl/include -L/usr/local/ssl/lib -lssl -lcrypto -o tools/chkssl" DN); -+ system(CC " tools/chkssl.c -I@PREFIX@/include -L@PREFIX@/lib -lssl -lcrypto -o tools/chkssl" DN); ++ system(CC " tools/chkssl.c -I/usr/pkg/include -L/usr/pkg/lib -lssl -lcrypto -o tools/chkssl" DN); #endif return checkcmp(); } @@ -17,7 +19,7 @@ add pkgsrc path to openssl "/usr/sbin/openssl", "/usr/local/bin/openssl", "/usr/local/ssl/bin/openssl", -+ "@PREFIX@/bin/openssl", ++ "/usr/pkg/bin/openssl", NULL }; #endif @@ -26,7 +28,7 @@ add pkgsrc path to openssl printf("Yes.\n"); strcpy(sslopt,"-DHAVE_SSL "); - strcpy(ssllib,"-L/usr/local/ssl/lib -lssl -lcrypto "); -+ strcpy(ssllib,"-L@PREFIX@/lib -lssl -lcrypto "); ++ strcpy(ssllib,"-L/usr/pkg/lib -lssl -lcrypto "); } #else if(strlen(SSLPATH)+13<sizeof(mbuf)) @@ -35,7 +37,33 @@ add pkgsrc path to openssl fprintf(makefile,"INCLUDE = -I./src/ -I. -I%sinclude %s %s\n", SSLPATH, mysqlheaders, dnsinc); #else - fprintf(makefile,"INCLUDE = -I./src/ -I. -I/usr/local/ssl/include %s %s\n", mysqlheaders, dnsinc); -+ fprintf(makefile,"INCLUDE = -I./src/ -I. -I@PREFIX@/include %s %s\n", mysqlheaders, dnsinc); ++ fprintf(makefile,"INCLUDE = -I./src/ -I. -I/usr/pkg/include %s %s\n", mysqlheaders, dnsinc); #endif else fprintf(makefile,"INCLUDE = -I./src/ -I. %s %s\n", mysqlheaders, dnsinc); +@@ -641,25 +642,6 @@ int main() + /* fprintf(makefile," @strip $(TARGET)\n");*/ + if(ssl==0) + { +- if(!fexists("key/psybnc.cert.pem")) /* only create, if not exist */ +- { +- mkdir("key",0700); +- fprintf(makefile," @echo \"*** GENERATING SSL-KEYS FROM CERTIFICATE **\"\n"); +- fprintf(makefile," @echo \"* You will be prompted for Cert-Contents *\"\n"); +- fprintf(makefile," @echo \"* This Infos will be used only for SSL *\"\n"); +- fprintf(makefile," @echo \"* Alter the informations to your values *\"\n"); +- fprintf(makefile," @echo \"* for the sake of correct Cert-Checking *\"\n"); +- fprintf(makefile," @echo \"*******************************************\"\n"); +- fprintf(makefile," @echo \"Generating certificate request .. \"\n"); +- fprintf(makefile," @%s req -new -config src/ssl.cnf -out key/psybnc.req.pem \\\n",sslbin); +- fprintf(makefile," -keyout key/psybnc.key.pem -nodes\n"); +- fprintf(makefile," @echo \"Generating self-signed certificate .. \"\n"); +- fprintf(makefile," @%s req -x509 -days 365 -in key/psybnc.req.pem \\\n",sslbin); +- fprintf(makefile," -key key/psybnc.key.pem -out key/psybnc.cert.pem\n"); +- fprintf(makefile," @echo \"Generating fingerprint ..\"\n"); +- fprintf(makefile," @%s x509 -subject -dates -fingerprint -noout \\\n",sslbin); +- fprintf(makefile," -in key/psybnc.cert.pem\n"); +- } + if(!fexists("src/ssl.rnd")) + { + sslrnd=fopen("src/ssl.rnd","w"); |