head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.48 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.46 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.44 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.42 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.40 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.38 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.36 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.34 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.32 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.30 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.28 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.26 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.24 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.22 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.20 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.18 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.16 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.14 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.12 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.10 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.8 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.6 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.4 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.2 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.3.0.2 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.4 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.2.0.26 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.24 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.22 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.20 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.18 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.16 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.14 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.12 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.10 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.6 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.4 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.2 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.1.0.20 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.18 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.16 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.14 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.12 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.10 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.8 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.6 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.4 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.2 pkgsrc-2014Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2020.04.25.19.13.12; author rillig; state Exp; branches; next 1.3; commitid uNatgRZm0ogXFN5C; 1.3 date 2019.12.28.11.19.53; author wiz; state Exp; branches; next 1.2; commitid yfvUHmK8UqQOSsQB; 1.2 date 2016.12.15.23.46.48; author joerg; state Exp; branches; next 1.1; commitid ST4rwWoZVZjZC8yz; 1.1 date 2014.06.15.21.55.17; author pettai; state Exp; branches; next ; commitid NRnYvqdwbworoFEx; desc @@ 1.4 log @chat/psybnc: fix accidentally hard-coded PREFIX @ text @$NetBSD: patch-ac,v 1.3 2019/12/28 11:19:53 wiz Exp $ 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 @@@@ -290,7 +290,7 @@@@ int checkssl() strcat(sysbuf,DN); 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); #endif return checkcmp(); } @@@@ -394,6 +394,7 @@@@ int main() "/usr/sbin/openssl", "/usr/local/bin/openssl", "/usr/local/ssl/bin/openssl", + "@@PREFIX@@/bin/openssl", NULL }; #endif @@@@ -566,7 +567,7 @@@@ int main() strcpy(sslbin,sslblist[sslin]); printf("Yes.\n"); strcpy(sslopt,"-DHAVE_SSL "); - strcpy(ssllib,"-L/usr/local/ssl/lib -lssl -lcrypto "); + strcpy(ssllib,"-L@@PREFIX@@/lib -lssl -lcrypto "); } #else if(strlen(SSLPATH)+13 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) - fprintf(makefile,"CFLAGS = -O -Wall -Wno-pointer-sign -ggdb\n"); + fprintf(makefile,"CFLAGS += -O -Wall -Wno-pointer-sign -ggdb\n"); #else - fprintf(makefile,"CFLAGS = -O -Wall -ggdb\n"); + fprintf(makefile,"CFLAGS += -O -Wall -ggdb\n"); #endif - fprintf(makefile,"LIBS = -lm %s %s %s %s\n", socklib, ssllib, dnslib, mysqllib); /* math lib needed for snprintf of ap */ + fprintf(makefile,"LIBS = $(LDFLAGS) -lm %s %s %s %s\n", socklib, ssllib, dnslib, mysqllib); /* math lib needed for snprintf of ap */ if(ssl==0) #ifdef SSLPATH 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); #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"); @ 1.3 log @psybnc: update to 2.4b2nb1. Honor CFLAGS and LDFLAGS. Fixes RELRO build. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2016/12/15 23:46:48 joerg Exp $ d14 1 a14 1 + system(CC " tools/chkssl.c -I/usr/pkg/include -L/usr/pkg/lib -lssl -lcrypto -o tools/chkssl" DN); d22 1 a22 1 + "/usr/pkg/bin/openssl", d31 1 a31 1 + strcpy(ssllib,"-L/usr/pkg/lib -lssl -lcrypto "); d54 1 a54 1 + fprintf(makefile,"INCLUDE = -I./src/ -I. -I/usr/pkg/include %s %s\n", mysqlheaders, dnsinc); @ 1.2 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2014/06/15 21:55:17 pettai Exp $ d35 15 a49 1 @@@@ -625,7 +626,7 @@@@ int main() @ 1.1 log @psyBNC is an easy-to-use, multi-user, permanent IRC-Bouncer with many features. Some of its features include symmetric ciphering of talk and connections (Blowfish and IDEA), the possibility of linking multiple bouncers to an internal network including a shared partyline, vhost- and relay support to connected bouncers and an extensive online help system. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 add pkgsrc path to openssl d14 1 a14 1 + system(CC " tools/chkssl.c -I@@PREFIX@@/include -L@@PREFIX@@/lib -lssl -lcrypto -o tools/chkssl" DN); d22 1 a22 1 + "@@PREFIX@@/bin/openssl", d31 1 a31 1 + strcpy(ssllib,"-L@@PREFIX@@/lib -lssl -lcrypto "); d40 1 a40 1 + fprintf(makefile,"INCLUDE = -I./src/ -I. -I@@PREFIX@@/include %s %s\n", mysqlheaders, dnsinc); d44 26 @