diff options
58 files changed, 2 insertions, 3074 deletions
@@ -15074,3 +15074,5 @@ audio/p5-Audio||2020-06-05|Has expired: Depends on expired math/p5-Math-GSL databases/rubygem-peek-pg-rails5||2020-06-05|Removed: not required by gitlab-ce anymore devel/rubygem-peek-gc-rails5|devel/rubygem-peek-gc-rails52|2020-06-05|Removed: please use devel/rubygem-peek-gc-rails52 instead devel/rubygem-peek-rails5|devel/rubygem-peek-rails60|2020-06-05|Removed: please use devel/rubygem-peek-rails60 instead +net/freerdp1|net/freerdp|2020-06-06|Has expired: Superseded by the freerdp port/package +irc/psybnc||2020-06-06|Has expired: Broken for more than 6 months diff --git a/irc/Makefile b/irc/Makefile index 7811a060f6c7..6460623878e1 100644 --- a/irc/Makefile +++ b/irc/Makefile @@ -87,7 +87,6 @@ SUBDIR += pircbot SUBDIR += pisg SUBDIR += polari - SUBDIR += psybnc SUBDIR += py-fishcrypt SUBDIR += py-irc SUBDIR += py-limnoria diff --git a/irc/psybnc/Makefile b/irc/psybnc/Makefile deleted file mode 100644 index c98aea9e94d6..000000000000 --- a/irc/psybnc/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# Created by: Mina Naguib <webmaster@topfx.com> -# $FreeBSD$ - -PORTNAME= psybnc -DISTVERSION= 2.3.2-9 -PORTREVISION= 2 -CATEGORIES= irc -MASTER_SITES= http://www.psybnc.at/download/beta/ -DISTNAME= psyBNC-${DISTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Powerful IRC bouncer - -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-05-05 - -LICENSE= GPLv1+ # though COPYING is GPLv2 - -USES= dos2unix ssl -DOS2UNIX_GLOB= *.c *.h -WRKSRC= ${WRKDIR}/psybnc -PSYBASE?= ${PREFIX}/psybnc -MAKE_ARGS= PSYBASE=${PSYBASE} -SUB_FILES= pkg-message -SUB_LIST= PSYBASE=${PSYBASE} -PLIST_SUB= PSYBASE=${PSYBASE:S,^${PREFIX}/,,} - -OPTIONS_DEFINE= MENUCONFIG -MENUCONFIG_DESC=Configure using menu - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MMENUCONFIG} -IS_INTERACTIVE= yes -.endif - -post-patch: - @${REINPLACE_CMD} -e 's#=help/#=${PSYBASE}/help/#' ${WRKSRC}/lang/* - @${REINPLACE_CMD} -e 's,gcc,${CC} -Wno-return-type,g' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,gcc,${CC} -Wno-return-type,g' ${WRKSRC}/tools/autoconf.c - -do-configure: -.if ${PORT_OPTIONS:MMENUCONFIG} - cd ${WRKSRC} && ${MAKE_CMD} menuconfig -.else -# Fool makefile.out into believing certs are unnecessary - ${TOUCH} ${WRKSRC}/key/psybnc.cert.pem -.endif - -do-install: - ${MKDIR} ${STAGEDIR}${PSYBASE}/lang/ ${STAGEDIR}${PSYBASE}/key/ ${STAGEDIR}${PSYBASE}/help/ - ${INSTALL_DATA} ${WRKSRC}/lang/INFO ${STAGEDIR}${PSYBASE}/lang/ - ${INSTALL_DATA} ${WRKSRC}/lang/*.lng ${STAGEDIR}${PSYBASE}/lang/ - ${INSTALL_DATA} ${WRKSRC}/src/ssl.cnf ${STAGEDIR}${PSYBASE}/key/ - ${INSTALL_DATA} ${WRKSRC}/help/*.TXT ${STAGEDIR}${PSYBASE}/help/ - ${INSTALL_DATA} ${WRKSRC}/help/*.DEU ${STAGEDIR}${PSYBASE}/help/ - ${INSTALL_DATA} ${WRKSRC}/help/*.ITA ${STAGEDIR}${PSYBASE}/help/ - ${INSTALL_PROGRAM} ${WRKSRC}/psybnc ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/psybnc.conf ${STAGEDIR}${PREFIX}/etc/psybnc.conf.sample - if [ -f ${WRKSRC}/key/psybnc.req.pem ]; then \ - ${INSTALL_DATA} ${WRKSRC}/key/psybnc.cert.pem ${STAGEDIR}${PSYBASE}/key/; \ - ${INSTALL_DATA} ${WRKSRC}/key/psybnc.key.pem ${STAGEDIR}${PSYBASE}/key/; \ - ${INSTALL_DATA} ${WRKSRC}/key/psybnc.req.pem ${STAGEDIR}${PSYBASE}/key/; \ - fi - -.include <bsd.port.mk> diff --git a/irc/psybnc/distinfo b/irc/psybnc/distinfo deleted file mode 100644 index 2b1e4069c452..000000000000 --- a/irc/psybnc/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (psyBNC-2.3.2-9.tar.gz) = 9129ade198f26f7a47301d2ab5933a2844bdd187fca437f8264ae88f168e1644 -SIZE (psyBNC-2.3.2-9.tar.gz) = 318676 diff --git a/irc/psybnc/files/patch-Makefile b/irc/psybnc/files/patch-Makefile deleted file mode 100644 index 013844412a81..000000000000 --- a/irc/psybnc/files/patch-Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.orig 2007-03-20 14:02:50 UTC -+++ Makefile -@@ -7,7 +7,7 @@ all: $(OBJS) - @$(CC) tools/convconf.c -o tools/convconf - @tools/convconf - @echo [*] Running Autoconfig. -- @$(CC) -I. tools/autoconf.c -o tools/autoconf -+ @$(CC) -I. tools/autoconf.c -o tools/autoconf -DPSYBASE=\"$(PSYBASE)\" -DPREFIX=\"$(PREFIX)\" - @tools/autoconf - @echo [*] Compiling MakeSalt for Encryption.. - @$(CC) -I. -o makesalt tools/makesalt.c -@@ -23,7 +23,7 @@ menuconfig: - @$(CC) tools/convconf.c -o tools/convconf - @tools/convconf - @echo [*] Running Autoconfig. -- @$(CC) -I. tools/autoconf.c -o tools/autoconf -+ @$(CC) -I. tools/autoconf.c -o tools/autoconf -DPSYBASE=\"$(PSYBASE)\" -DPREFIX=\"$(PREFIX)\" - @tools/autoconf - @echo [*] Creating Menu, please wait. - @echo This needs the 'ncurses' library. If it is not available, menuconf wont work. If you are using 'curses', use make menuconfig-curses instead. -@@ -39,7 +39,7 @@ menuconfig-curses: - @$(CC) tools/convconf.c -o tools/convconf - @tools/convconf - @echo [*] Running Autoconfig. -- @$(CC) -I. tools/autoconf.c -o tools/autoconf -+ @$(CC) -I. tools/autoconf.c -o tools/autoconf -DPSYBASE=\"$(PSYBASE)\" -DPREFIX=\"$(PREFIX)\" - @tools/autoconf - @echo [*] Creating Menu, please wait. - @echo This needs the 'curses' library. If it is not available, menuconf wont work. diff --git a/irc/psybnc/files/patch-lang_english.lng b/irc/psybnc/files/patch-lang_english.lng deleted file mode 100644 index 48c65f706605..000000000000 --- a/irc/psybnc/files/patch-lang_english.lng +++ /dev/null @@ -1,11 +0,0 @@ ---- lang/english.lng.orig 2008-10-22 19:09:46 UTC -+++ lang/english.lng -@@ -1999,7 +1999,7 @@ msg0994=SYSTEM - ; psybnc.c line 201: - msg0995=PORT1 - ; psybnc.c line 203: --msg0996=No Listenports/-hosts defined.˙Run either 'make menuconfig' to setup˙or add:˙PSYBNC.SYSTEM.PORT1=yourport˙and˙PSYBNC.SYSTEM.HOST1=*˙to the psybnc.conf˙ -+msg0996=No Listenports/-hosts defined.˙Add:˙PSYBNC.SYSTEM.PORT1=yourport˙and˙PSYBNC.SYSTEM.HOST1=*˙to the psybnc.conf˙ - ; psybnc.c line 207: - msg0997=SYSTEM - ; psybnc.c line 212: diff --git a/irc/psybnc/files/patch-lang_german.lng b/irc/psybnc/files/patch-lang_german.lng deleted file mode 100644 index ef291091da49..000000000000 --- a/irc/psybnc/files/patch-lang_german.lng +++ /dev/null @@ -1,11 +0,0 @@ ---- lang/german.lng.orig 2008-10-22 19:10:34 UTC -+++ lang/german.lng -@@ -2004,7 +2004,7 @@ msg0994=SYSTEM - ; psybnc.c line 201: - msg0995=PORT1 - ; psybnc.c line 203: --msg0996=Keine Listen-Ports definiert.˙Starte 'make menuconfig' ˙oder fuege:˙PSYBNC.SYSTEM.PORT1=deinport˙und˙PSYBNC.SYSTEM.HOST1=*˙zur psybnc.conf hinzu˙ -+msg0996=Keine Listen-Ports definiert.˙Fuege:˙PSYBNC.SYSTEM.PORT1=deinport˙und˙PSYBNC.SYSTEM.HOST1=*˙zur psybnc.conf hinzu˙ - ; psybnc.c line 207: - msg0997=SYSTEM - ; psybnc.c line 212: diff --git a/irc/psybnc/files/patch-lang_italiano.lng b/irc/psybnc/files/patch-lang_italiano.lng deleted file mode 100644 index e08978a9e5d2..000000000000 --- a/irc/psybnc/files/patch-lang_italiano.lng +++ /dev/null @@ -1,11 +0,0 @@ ---- lang/italiano.lng.orig 2008-10-22 19:10:54 UTC -+++ lang/italiano.lng -@@ -1999,7 +1999,7 @@ msg0994=SYSTEM - ; psybnc.c line 201: - msg0995=PORT1 - ; psybnc.c line 203: --msg0996=Nessuna porta/host di listening definite.˙Esegui 'make menuconfig' per il setup˙oppure aggiungi:˙PSYBNC.SYSTEM.PORT1=tuaporta˙e˙PSYBNC.SYSTEM.HOST1=*˙al file psybnc.conf˙ -+msg0996=Nessuna porta/host di listening definite.˙Aggiungi:˙PSYBNC.SYSTEM.PORT1=tuaporta˙e˙PSYBNC.SYSTEM.HOST1=*˙al file psybnc.conf˙ - ; psybnc.c line 207: - msg0997=SYSTEM - ; psybnc.c line 212: diff --git a/irc/psybnc/files/patch-src_match.c b/irc/psybnc/files/patch-src_match.c deleted file mode 100644 index de4407673c75..000000000000 --- a/irc/psybnc/files/patch-src_match.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/match.c.orig 2016-06-20 14:41:27 UTC -+++ src/match.c -@@ -36,6 +36,7 @@ - /* Remove the next line to use this in IrcII */ - #define EGGDROP - -+#include <p_global.h> - - /* =================================================================== - * Best to leave stuff after this point alone, but go on and change diff --git a/irc/psybnc/files/patch-src_p__blowfish.c b/irc/psybnc/files/patch-src_p__blowfish.c deleted file mode 100644 index 610f3a2cd4c0..000000000000 --- a/irc/psybnc/files/patch-src_p__blowfish.c +++ /dev/null @@ -1,38 +0,0 @@ ---- src/p_blowfish.c.orig 2016-06-20 14:41:27 UTC -+++ src/p_blowfish.c -@@ -27,16 +27,21 @@ - static char rcsid[] = "@(#)$Id: p_blowfish.c,v 1.3 2005/06/04 18:00:14 hisi Exp $"; - #endif - -+#include <p_global.h> -+/* - #include <stdio.h> - #include <string.h> - #include <config.h> - - char *strmncpy(char *dest, char *source, size_t len); - char *lngtxt(int msgnum); -+*/ - -+/* - #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } - #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__) - #define free(n) _pfree(n,__FILE__,__FUNCTION__,__LINE__) -+*/ - - unsigned char *hashstring(unsigned char *str,int len); - unsigned char *unhashstring(unsigned char *str); -@@ -478,10 +483,11 @@ char * BLOWencrypt(unsigned char *str) - char *p, *s, *dest, *d, *pt; - char rim[5],ep[5],rep[5]; - int i; -- dest = (char *) pmalloc((strlen(str) + 9) * 2); -+ dest = __pmalloc((strlen(str) + 9) * 2, "p_blowfish.c", "BLOWencrypt", 481); -+ dest = pmalloc((strlen(str) + 9) * 2); - *dest=0; - /* pad fake string with 8 bytes to make sure there's enough */ -- s = (char *) pmalloc(strlen(str) + 9); -+ s = pmalloc(strlen(str) + 9); - strcpy(s, str); - p = s; - while (*p) diff --git a/irc/psybnc/files/patch-src_p__global.h b/irc/psybnc/files/patch-src_p__global.h deleted file mode 100644 index 71b50ff458d8..000000000000 --- a/irc/psybnc/files/patch-src_p__global.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/p_global.h.orig 2016-06-20 14:41:27 UTC -+++ src/p_global.h -@@ -972,7 +972,7 @@ int checklogging(int usern); - #endif - - #ifndef P_MEMORY --unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line); -+char *__pmalloc(unsigned long size,char *module,char *function,int line); - void _pfree(void * pointer,char *module, char *function, int line); - struct usert *user(int usern); - struct newpeert *newpeer(int usern); -@@ -1267,8 +1267,8 @@ extern char * BLOW_stringdecrypt(unsigne - - #endif - --#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } --#define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__) -+#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,(char*)__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } -+#define pmalloc(n) __pmalloc((n),__FILE__,(char*)__FUNCTION__,(int)__LINE__) - - #define SSLCERT "key/psybnc.cert.pem" - #define SSLKEY "key/psybnc.key.pem" diff --git a/irc/psybnc/files/patch-src_p__idea.c b/irc/psybnc/files/patch-src_p__idea.c deleted file mode 100644 index 4191c9a44231..000000000000 --- a/irc/psybnc/files/patch-src_p__idea.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/p_idea.c.orig 2016-06-20 14:41:27 UTC -+++ src/p_idea.c -@@ -50,6 +50,9 @@ static char rcsid[] = "@(#)$Id: p_idea.c - * string encryption by psychoid - */ - -+ -+#include <p_global.h> -+/* - #include <time.h> - #include <string.h> - #include <stdlib.h> -@@ -62,7 +65,7 @@ extern int cline; - - #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; } - #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__) -- -+*/ - #ifdef CRYPT - - #define IDEAROUNDS 8 diff --git a/irc/psybnc/files/patch-src_p__memory.c b/irc/psybnc/files/patch-src_p__memory.c deleted file mode 100644 index 3d29fb64f9c5..000000000000 --- a/irc/psybnc/files/patch-src_p__memory.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/p_memory.c.orig 2016-06-20 14:41:27 UTC -+++ src/p_memory.c -@@ -32,10 +32,10 @@ FILE *logm=NULL; - - /* malloc-wrapper. No memory will log an error entry and kill the bouncer */ - --unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line) -+char *__pmalloc(unsigned long size,char *module,char *function, int line) - { -- unsigned long *rc; -- if (!(rc=(unsigned long *)malloc(size))) -+ char *rc; -+ if (!(rc=(char *)malloc(size))) - { - p_log(LOG_ERROR,-1,lngtxt(602),module,function,line); - exit(0x0); -@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s - return rc; - } - --void _pfree(unsigned long *pointer, char *module, char *function, int line) -+void _pfree(char *pointer, char *module, char *function, int line) - { - #ifdef LOGALLOC - if(logm==NULL) -@@ -67,7 +67,7 @@ void _pfree(unsigned long *pointer, char - free(pointer); - } - --#define free(a) _pfree((void *)a,__FILE__,__FUNCTION__,__LINE__) -+#define free(a) _pfree((void *)a,__FILE__,(char*)__FUNCTION__,__LINE__) - - /* struct wrappers. Those alloc, delete and return the needed structures */ - diff --git a/irc/psybnc/files/patch-src_p__string.c b/irc/psybnc/files/patch-src_p__string.c deleted file mode 100644 index deaa2623baa7..000000000000 --- a/irc/psybnc/files/patch-src_p__string.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/p_string.c.orig 2016-06-20 14:41:27 UTC -+++ src/p_string.c -@@ -616,7 +616,7 @@ int loadlanguage(char *langf) - int msg; - pcontext; - clearlanguage(); -- ap_snprintf(lfname,sizeof(lfname),"lang/%s.lng",langf); -+ ap_snprintf(lfname,sizeof(lfname),"%s/lang/%s.lng",PSYBASE, langf); - maxindex=0; - langname[0]=0; - lfile=fopen(lfname,"r"); diff --git a/irc/psybnc/files/patch-src_psybnc.c b/irc/psybnc/files/patch-src_psybnc.c deleted file mode 100644 index a4c2ef801b3d..000000000000 --- a/irc/psybnc/files/patch-src_psybnc.c +++ /dev/null @@ -1,47 +0,0 @@ ---- src/psybnc.c.orig 2016-06-20 14:41:27 UTC -+++ src/psybnc.c -@@ -44,6 +44,8 @@ int slice=0; - - #ifdef HAVE_SSL - -+int fexists(char *fname); -+ - void initSSL() - { - SSL_load_error_strings(); -@@ -171,13 +173,17 @@ main (int argc, char **argv) - if(argc==2) - { - strmncpy(configfile,argv[1],sizeof(configfile)); -- } else { -+ } else if (fexists("psybnc.conf")) { -+ strcpy(configfile, "psybnc.conf"); -+ } else if (fexists(PREFIX "/etc/psybnc.conf")) { - strcpy(configfile,"psybnc.conf"); /* rcsid */ -+ } else { -+ strcpy(configfile, "psybnc.conf"); - } - conffile=fopen(configfile,"r"); - if(conffile==NULL) - { -- printf("Configuration File %s not found, aborting\nRun 'make menuconfig' for creating a configuration or create the file manually.\n",conffile); /* rcsid */ -+ printf("Configuration file psybnc.conf not found in current directory or in " PREFIX "/etc/psybnc.conf.\n Copy " PREFIX "/etc/psybnc.conf.sample to the current directory as psybnc.conf :\n cp " PREFIX "/etc/psybnc.conf.sample psybnc.conf\n\nOR create the file manually.\n"); /* rcsid */ - exit (0x0); - } - fclose(conffile); -@@ -302,3 +308,15 @@ main (int argc, char **argv) - bncmain(); - } - -+int fexists(char *fname) -+{ -+ FILE *fn; -+ int rc=0; -+ fn=fopen(fname,"r"); -+ if(fn!=NULL) -+ { -+ fclose(fn); -+ rc=1; -+ } -+ return rc; -+} diff --git a/irc/psybnc/files/patch-tools_autoconf.c b/irc/psybnc/files/patch-tools_autoconf.c deleted file mode 100644 index bbb25ca3c206..000000000000 --- a/irc/psybnc/files/patch-tools_autoconf.c +++ /dev/null @@ -1,24 +0,0 @@ ---- tools/autoconf.c.orig 2016-06-20 14:41:27 UTC -+++ tools/autoconf.c -@@ -443,9 +443,9 @@ int main() - fprintf(makefile,"INCLUDE = -I./src/ -I.\n"); - fprintf(makefile,"OBJS = src/psybnc.o src/match.o src/p_client.o src/p_crypt.o src/p_dcc.o src/p_hash.o src/p_idea.o src/p_inifunc.o src/p_link.o src/p_log.o src/p_memory.o src/p_network.o src/p_parse.o src/p_peer.o src/p_server.o src/p_socket.o src/p_string.o src/p_sysmsg.o src/p_userfile.o src/p_uchannel.o src/p_script.o src/p_topology.o src/p_intnet.o src/p_blowfish.o src/p_translate.o src/p_coredns.o src/snprintf.o %s\n",env); - if(provi==0) -- fprintf(makefile,"DEFINE = -DHAVE_CONFIG %s%s%s%s%s%s\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt); -+ fprintf(makefile,"DEFINE = -DHAVE_CONFIG %s%s%s%s%s%s -DPSYBASE=\\\"%s\\\" -DPREFIX=\\\"%s\\\"\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt, PSYBASE, PREFIX); - else -- fprintf(makefile,"DEFINE = -DHAVE_PROV_CONFIG %s%s%s%s%s%s\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt); -+ fprintf(makefile,"DEFINE = -DHAVE_PROV_CONFIG %s%s%s%s%s%s -DPSYBASE=\\\"%s\\\" -DPREFIX=\\\"%s\\\"\n",sunosopt,bigopt,ipv6opt,timeopt,sslopt,dnsopt, PSYBASE, PREFIX); - fprintf(makefile,"TARGET = psybnc\n"); - fprintf(makefile,"\n"); - fprintf(makefile,"all: $(OBJS)\n"); -@@ -453,7 +453,8 @@ int main() - fprintf(makefile," @strip $(TARGET)\n"); - if(ssl==0) - { -- if(!fexists("key/psybnc.cert.pem")) /* only create, if not exist */ -+ if(!fexists(PSYBASE "/key/psybnc.cert.pem") && -+ !fexists("key/psybnc.cert.pem")) /* only create, if not exist */ - { - mkdir("key",0700); - fprintf(makefile," @echo \"*** GENERATING SSL-KEYS FROM CERTIFICATE **\"\n"); diff --git a/irc/psybnc/files/pkg-message.in b/irc/psybnc/files/pkg-message.in deleted file mode 100644 index 26c0128bf74d..000000000000 --- a/irc/psybnc/files/pkg-message.in +++ /dev/null @@ -1,16 +0,0 @@ -[ -{ type: install - message: <<EOM -If you have not created SSL certificates for psybnc already, do so using the -following commands: - -cd %%PSYBASE%% -/usr/bin/openssl req -new -config key/ssl.cnf -out key/psybnc.req.pem \ - -keyout key/psybnc.key.pem -nodes -/usr/bin/openssl req -x509 -days 365 -in key/psybnc.req.pem \ - -key key/psybnc.key.pem -out key/psybnc.cert.pem -/usr/bin/openssl x509 -subject -dates -fingerprint -noout \ - -in key/psybnc.cert.pem -EOM -} -] diff --git a/irc/psybnc/pkg-descr b/irc/psybnc/pkg-descr deleted file mode 100644 index f5893caafd74..000000000000 --- a/irc/psybnc/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -psyBNC is an extremely powerful IRC bouncer. - -Features include: - -. It stays connected when you disconnect -. It allows Full Online Administration -. It allows you to set Users who could get op from psyBNC -. It supports full logging of Messages and traffic -. It supports linking to other psyBNCs + PartyLine -. It allows multiple connections of one Client to different irc-servers -. It has a translation module - - english to italian,english to german,english to portugese,english to french, - french to english,german to english,portugese to english,french to english -. Modular -. IPv6 Support -. Much more (see README in package) - -WWW: http://www.psyBNC.at/ diff --git a/irc/psybnc/pkg-plist b/irc/psybnc/pkg-plist deleted file mode 100644 index ba0bcfe3c6e2..000000000000 --- a/irc/psybnc/pkg-plist +++ /dev/null @@ -1,250 +0,0 @@ -bin/psybnc -@sample etc/psybnc.conf.sample -%%PSYBASE%%/lang/INFO -%%PSYBASE%%/lang/english.lng -%%PSYBASE%%/lang/german.lng -%%PSYBASE%%/lang/italiano.lng -%%PSYBASE%%/help/ADDLOG.TXT -%%PSYBASE%%/help/DELLOG.TXT -%%PSYBASE%%/help/LISTLOGS.TXT -%%PSYBASE%%/help/PLAYTRAFFICLOG.TXT -%%PSYBASE%%/help/PROXY.TXT -%%PSYBASE%%/help/SETLEAVEMSG.TXT -%%PSYBASE%%/help/SETAWAYNICK.TXT -%%PSYBASE%%/help/ADDAUTOOP.TXT -%%PSYBASE%%/help/DELAUTOOP.TXT -%%PSYBASE%%/help/LISTAUTOOPS.TXT -%%PSYBASE%%/help/SRELOAD.TXT -%%PSYBASE%%/help/ADDALLOW.TXT -%%PSYBASE%%/help/ADDASK.TXT -%%PSYBASE%%/help/ADDBAN.TXT -%%PSYBASE%%/help/ADDDCC.TXT -%%PSYBASE%%/help/ADDNETWORK.TXT -%%PSYBASE%%/help/ADDOP.TXT -%%PSYBASE%%/help/ADDSERVER.TXT -%%PSYBASE%%/help/ADDUSER.TXT -%%PSYBASE%%/help/BCONNECT.TXT -%%PSYBASE%%/help/BHELP.TXT -%%PSYBASE%%/help/BKILL.TXT -%%PSYBASE%%/help/BQUIT.TXT -%%PSYBASE%%/help/BWHO.TXT -%%PSYBASE%%/help/DELALLOW.TXT -%%PSYBASE%%/help/DELASK.TXT -%%PSYBASE%%/help/DELBAN.TXT -%%PSYBASE%%/help/DELDCC.TXT -%%PSYBASE%%/help/DELENCRYPT.TXT -%%PSYBASE%%/help/LISTASK.TXT -%%PSYBASE%%/help/DELLINK.TXT -%%PSYBASE%%/help/DELNETWORK.TXT -%%PSYBASE%%/help/DELOP.TXT -%%PSYBASE%%/help/DELSERVER.TXT -%%PSYBASE%%/help/DELTRANSLATE.TXT -%%PSYBASE%%/help/DELUSER.TXT -%%PSYBASE%%/help/ENCRYPT.TXT -%%PSYBASE%%/help/ERASEMAINLOG.TXT -%%PSYBASE%%/help/ERASEPRIVATELOG.TXT -%%PSYBASE%%/help/ERASETRAFFICLOG.TXT -%%PSYBASE%%/help/JUMP.TXT -%%PSYBASE%%/help/LINKFROM.TXT -%%PSYBASE%%/help/LINKTO.TXT -%%PSYBASE%%/help/LISTALLOW.TXT -%%PSYBASE%%/help/AIDLE.TXT -%%PSYBASE%%/help/LISTBANS.TXT -%%PSYBASE%%/help/LISTDCC.TXT -%%PSYBASE%%/help/LISTENCRYPT.TXT -%%PSYBASE%%/help/LISTLINKS.TXT -%%PSYBASE%%/help/LISTOPS.TXT -%%PSYBASE%%/help/LISTSERVERS.TXT -%%PSYBASE%%/help/MADMIN.TXT -%%PSYBASE%%/help/NAMEBOUNCER.TXT -%%PSYBASE%%/help/PASSWORD.TXT -%%PSYBASE%%/help/PLAYMAINLOG.TXT -%%PSYBASE%%/help/PLAYPRIVATELOG.TXT -%%PSYBASE%%/help/RELAYLINK.TXT -%%PSYBASE%%/help/SETAWAY.TXT -%%PSYBASE%%/help/SETUSERNAME.TXT -%%PSYBASE%%/help/SOCKSTAT.TXT -%%PSYBASE%%/help/TRANSLATE.TXT -%%PSYBASE%%/help/UNADMIN.TXT -%%PSYBASE%%/help/BVHOST.DEU -%%PSYBASE%%/help/ADDIGNORE.DEU -%%PSYBASE%%/help/ADDIGNORE.TXT -%%PSYBASE%%/help/RELINK.TXT -%%PSYBASE%%/help/DCCCHAT.TXT -%%PSYBASE%%/help/DCCANSWER.TXT -%%PSYBASE%%/help/DCCSEND.TXT -%%PSYBASE%%/help/DCCGET.TXT -%%PSYBASE%%/help/DCCCANCEL.TXT -%%PSYBASE%%/help/BREHASH.TXT -%%PSYBASE%%/help/LISTTASKS.TXT -%%PSYBASE%%/help/SWITCHNET.TXT -%%PSYBASE%%/help/DCCENABLE.TXT -%%PSYBASE%%/help/AUTOREJOIN.TXT -%%PSYBASE%%/help/LEAVEQUIT.TXT -%%PSYBASE%%/help/AUTOGETDCC.TXT -%%PSYBASE%%/help/ADDALLOW.DEU -%%PSYBASE%%/help/ADDASK.DEU -%%PSYBASE%%/help/ADDAUTOOP.DEU -%%PSYBASE%%/help/ADDBAN.DEU -%%PSYBASE%%/help/ADDDCC.DEU -%%PSYBASE%%/help/ADDLOG.DEU -%%PSYBASE%%/help/ADDNETWORK.DEU -%%PSYBASE%%/help/ADDOP.DEU -%%PSYBASE%%/help/ADDSERVER.DEU -%%PSYBASE%%/help/ADDUSER.DEU -%%PSYBASE%%/help/AIDLE.DEU -%%PSYBASE%%/help/AUTOGETDCC.DEU -%%PSYBASE%%/help/AUTOREJOIN.DEU -%%PSYBASE%%/help/BCONNECT.DEU -%%PSYBASE%%/help/BHELP.DEU -%%PSYBASE%%/help/BKILL.DEU -%%PSYBASE%%/help/BQUIT.DEU -%%PSYBASE%%/help/BREHASH.DEU -%%PSYBASE%%/help/BWHO.DEU -%%PSYBASE%%/help/DCCANSWER.DEU -%%PSYBASE%%/help/DCCCANCEL.DEU -%%PSYBASE%%/help/DCCCHAT.DEU -%%PSYBASE%%/help/DCCENABLE.DEU -%%PSYBASE%%/help/DCCGET.DEU -%%PSYBASE%%/help/DCCSEND.DEU -%%PSYBASE%%/help/DELALLOW.DEU -%%PSYBASE%%/help/DELASK.DEU -%%PSYBASE%%/help/DELAUTOOP.DEU -%%PSYBASE%%/help/DELBAN.DEU -%%PSYBASE%%/help/DELDCC.DEU -%%PSYBASE%%/help/DELENCRYPT.DEU -%%PSYBASE%%/help/DELLINK.DEU -%%PSYBASE%%/help/DELLOG.DEU -%%PSYBASE%%/help/DELNETWORK.DEU -%%PSYBASE%%/help/DELOP.DEU -%%PSYBASE%%/help/DELSERVER.DEU -%%PSYBASE%%/help/DELTRANSLATE.DEU -%%PSYBASE%%/help/DELUSER.DEU -%%PSYBASE%%/help/ENCRYPT.DEU -%%PSYBASE%%/help/ERASEMAINLOG.DEU -%%PSYBASE%%/help/ERASEPRIVATELOG.DEU -%%PSYBASE%%/help/ERASETRAFFICLOG.DEU -%%PSYBASE%%/help/JUMP.DEU -%%PSYBASE%%/help/LEAVEQUIT.DEU -%%PSYBASE%%/help/LINKFROM.DEU -%%PSYBASE%%/help/LINKTO.DEU -%%PSYBASE%%/help/LISTALLOW.DEU -%%PSYBASE%%/help/LISTASK.DEU -%%PSYBASE%%/help/LISTAUTOOPS.DEU -%%PSYBASE%%/help/LISTBANS.DEU -%%PSYBASE%%/help/LISTDCC.DEU -%%PSYBASE%%/help/LISTENCRYPT.DEU -%%PSYBASE%%/help/LISTLINKS.DEU -%%PSYBASE%%/help/LISTLOGS.DEU -%%PSYBASE%%/help/LISTOPS.DEU -%%PSYBASE%%/help/LISTSERVERS.DEU -%%PSYBASE%%/help/LISTTASKS.DEU -%%PSYBASE%%/help/MADMIN.DEU -%%PSYBASE%%/help/NAMEBOUNCER.DEU -%%PSYBASE%%/help/PASSWORD.DEU -%%PSYBASE%%/help/PLAYMAINLOG.DEU -%%PSYBASE%%/help/PLAYPRIVATELOG.DEU -%%PSYBASE%%/help/PLAYTRAFFICLOG.DEU -%%PSYBASE%%/help/PROXY.DEU -%%PSYBASE%%/help/RELAYLINK.DEU -%%PSYBASE%%/help/RELINK.DEU -%%PSYBASE%%/help/SETAWAY.DEU -%%PSYBASE%%/help/SETAWAYNICK.DEU -%%PSYBASE%%/help/SETLEAVEMSG.DEU -%%PSYBASE%%/help/DELIGNORE.DEU -%%PSYBASE%%/help/DELIGNORE.TXT -%%PSYBASE%%/help/SETUSERNAME.DEU -%%PSYBASE%%/help/SOCKSTAT.DEU -%%PSYBASE%%/help/SRELOAD.DEU -%%PSYBASE%%/help/SWITCHNET.DEU -%%PSYBASE%%/help/TRANSLATE.DEU -%%PSYBASE%%/help/UNADMIN.DEU -%%PSYBASE%%/help/BVHOST.ITA -%%PSYBASE%%/help/LISTIGNORES.DEU -%%PSYBASE%%/help/LISTIGNORES.TXT -%%PSYBASE%%/help/SETLANG.DEU -%%PSYBASE%%/help/SETLANG.TXT -%%PSYBASE%%/help/ADDALLOW.ITA -%%PSYBASE%%/help/ADDASK.ITA -%%PSYBASE%%/help/ADDAUTOOP.ITA -%%PSYBASE%%/help/ADDBAN.ITA -%%PSYBASE%%/help/ADDDCC.ITA -%%PSYBASE%%/help/ADDIGNORE.ITA -%%PSYBASE%%/help/ADDLOG.ITA -%%PSYBASE%%/help/ADDNETWORK.ITA -%%PSYBASE%%/help/ADDOP.ITA -%%PSYBASE%%/help/ADDSERVER.ITA -%%PSYBASE%%/help/ADDUSER.ITA -%%PSYBASE%%/help/AIDLE.ITA -%%PSYBASE%%/help/AUTOGETDCC.ITA -%%PSYBASE%%/help/AUTOREJOIN.ITA -%%PSYBASE%%/help/BCONNECT.ITA -%%PSYBASE%%/help/BHELP.ITA -%%PSYBASE%%/help/BKILL.ITA -%%PSYBASE%%/help/BQUIT.ITA -%%PSYBASE%%/help/BREHASH.ITA -%%PSYBASE%%/help/BWHO.ITA -%%PSYBASE%%/help/DCCANSWER.ITA -%%PSYBASE%%/help/DCCCANCEL.ITA -%%PSYBASE%%/help/DCCCHAT.ITA -%%PSYBASE%%/help/DCCENABLE.ITA -%%PSYBASE%%/help/DCCGET.ITA -%%PSYBASE%%/help/DCCSEND.ITA -%%PSYBASE%%/help/JUMP.ITA -%%PSYBASE%%/help/DELALLOW.ITA -%%PSYBASE%%/help/DELASK.ITA -%%PSYBASE%%/help/DELAUTOOP.ITA -%%PSYBASE%%/help/DELBAN.ITA -%%PSYBASE%%/help/DELDCC.ITA -%%PSYBASE%%/help/DELENCRYPT.ITA -%%PSYBASE%%/help/DELIGNORE.ITA -%%PSYBASE%%/help/DELLINK.ITA -%%PSYBASE%%/help/DELLOG.ITA -%%PSYBASE%%/help/DELNETWORK.ITA -%%PSYBASE%%/help/DELOP.ITA -%%PSYBASE%%/help/DELSERVER.ITA -%%PSYBASE%%/help/DELTRANSLATE.ITA -%%PSYBASE%%/help/DELUSER.ITA -%%PSYBASE%%/help/ENCRYPT.ITA -%%PSYBASE%%/help/ERASEMAINLOG.ITA -%%PSYBASE%%/help/ERASEPRIVATELOG.ITA -%%PSYBASE%%/help/ERASETRAFFICLOG.ITA -%%PSYBASE%%/help/LEAVEQUIT.ITA -%%PSYBASE%%/help/LINKFROM.ITA -%%PSYBASE%%/help/LINKTO.ITA -%%PSYBASE%%/help/LISTALLOW.ITA -%%PSYBASE%%/help/LISTASK.ITA -%%PSYBASE%%/help/LISTAUTOOPS.ITA -%%PSYBASE%%/help/LISTBANS.ITA -%%PSYBASE%%/help/LISTDCC.ITA -%%PSYBASE%%/help/LISTENCRYPT.ITA -%%PSYBASE%%/help/LISTIGNORES.ITA -%%PSYBASE%%/help/LISTLINKS.ITA -%%PSYBASE%%/help/LISTLOGS.ITA -%%PSYBASE%%/help/LISTOPS.ITA -%%PSYBASE%%/help/LISTSERVERS.ITA -%%PSYBASE%%/help/LISTTASKS.ITA -%%PSYBASE%%/help/MADMIN.ITA -%%PSYBASE%%/help/NAMEBOUNCER.ITA -%%PSYBASE%%/help/PASSWORD.ITA -%%PSYBASE%%/help/PLAYMAINLOG.ITA -%%PSYBASE%%/help/PLAYPRIVATELOG.ITA -%%PSYBASE%%/help/PLAYTRAFFICLOG.ITA -%%PSYBASE%%/help/PROXY.ITA -%%PSYBASE%%/help/RELAYLINK.ITA -%%PSYBASE%%/help/RELINK.ITA -%%PSYBASE%%/help/SETAWAY.ITA -%%PSYBASE%%/help/SETAWAYNICK.ITA -%%PSYBASE%%/help/SETLANG.ITA -%%PSYBASE%%/help/SETLEAVEMSG.ITA -%%PSYBASE%%/help/SETUSERNAME.ITA -%%PSYBASE%%/help/SOCKSTAT.ITA -%%PSYBASE%%/help/SRELOAD.ITA -%%PSYBASE%%/help/SWITCHNET.ITA -%%PSYBASE%%/help/TRANSLATE.ITA -%%PSYBASE%%/help/UNADMIN.ITA -%%PSYBASE%%/help/BVHOST.TXT -%%PSYBASE%%/help/DCCSENDME.TXT -%%PSYBASE%%/help/DCCSENDME.ITA -%%PSYBASE%%/help/DCCSENDME.DEU -%%PSYBASE%%/key/ssl.cnf diff --git a/net/Makefile b/net/Makefile index e65253129db3..555abc311400 100644 --- a/net/Makefile +++ b/net/Makefile @@ -169,7 +169,6 @@ SUBDIR += freeradius-client SUBDIR += freeradius3 SUBDIR += freerdp - SUBDIR += freerdp1 SUBDIR += freeswitch SUBDIR += freevrrpd SUBDIR += frr5 diff --git a/net/freerdp1/Makefile b/net/freerdp1/Makefile deleted file mode 100644 index 6b5e81f49a70..000000000000 --- a/net/freerdp1/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# Created by: Alexander Logvinov <avl@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= freerdp -PORTVERSION= 1.2.0 -PORTREVISION= 18 -CATEGORIES= net comms -PKGNAMESUFFIX= 1 - -MAINTAINER= kevans@FreeBSD.org -COMMENT= Free implementation of Remote Desktop Protocol - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Superseded by the freerdp port/package -EXPIRATION_DATE=2020-06-06 -BROKEN_FreeBSD_11_powerpc64= fails to build: ninja: error: build.ninja:315: bad $-escape (literal $ must be written as $$) -BROKEN_FreeBSD_12_powerpc64= fails to build: ninja: error: build.ninja:315: bad $-escape (literal $ must be written as $$) - -USE_GITHUB= yes -GH_ACCOUNT= FreeRDP -GH_PROJECT= ${GH_ACCOUNT} -GH_TAGNAME= f5ff6e1 - -USES= alias cmake compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl -USE_LDCONFIG= yes -CPE_VENDOR= freerdp_project - -CMAKE_ARGS+= -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}} - -CMAKE_ARGS_aarch64= -DWITH_NEON=ON -CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang - -OPTIONS_DEFINE= ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11 -OPTIONS_DEFAULT= CUPS GSTREAMER X11 -OPTIONS_SUB= yes - -OPTIONS_DEFINE_armv6= NEON -OPTIONS_DEFINE_armv7= NEON -OPTIONS_EXCLUDE_armv6= SSE -OPTIONS_EXCLUDE_armv7= SSE - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_BOOL= WITH_ALSA - -CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CMAKE_BOOL= WITH_CUPS - -FFMPEG_BROKEN= fails to build with ffmpeg 4.0 -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ - libavutil.so:multimedia/ffmpeg -FFMPEG_CMAKE_BOOL= WITH_FFMPEG - -GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 -GSTREAMER_USES= gnome xorg -GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xorgproto,xext,xrandr -GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 - -NEON_DESC= Enable Media Processing Engine instructions -NEON_CMAKE_BOOL= WITH_NEON -.if ! ${CFLAGS:M-march*} -NEON_CFLAGS= -march=armv7-a -.endif - -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_BOOL= WITH_PULSE - -SSE_CMAKE_BOOL= WITH_SSE2 - -X11_DESC= Build FreeRDP X11 client -X11_BUILD_DEPENDS= xmlto:textproc/xmlto -X11_CMAKE_BOOL= WITH_X11 -X11_CMAKE_OFF= -DWITH_XKBFILE=OFF -X11_USES= xorg -X11_USE= xorg=x11,xkbfile,xcursor,xorgproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender - -post-patch: - @${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \ - ${REINPLACE_CMD} \ - -e 's|list(APPEND $${MODULE_PREFIX}_LIBS freerdp)|list(APPEND $${MODULE_PREFIX}_LIBS freerdp1)|' \ - -e 's|list(APPEND $${MODULE_PREFIX}_LIBS winpr)|list(APPEND $${MODULE_PREFIX}_LIBS winpr1)|' - @${FIND} ${WRKSRC} -name 'CMakeLists.txt' | ${XARGS} \ - ${REINPLACE_CMD} -E \ - -e 's|freerdp winpr|freerdp1 winpr1|' \ - -e 's|winpr freerdp|winpr1 freerdp1|' \ - -e 's|-lwinpr|-lwinpr1|' \ - -e 's|-lfreerdp|-lfreerdp1|' \ - -e 's|^([[:blank:]]*)target_link_libraries\((.+) freerdp\)([[:blank:]]*)$$|\1target_link_libraries(\2 freerdp1)\3|' \ - -e 's|^([[:blank:]]*)target_link_libraries\((.+) winpr\)([[:blank:]]*)$$|\1target_link_libraries(\2 winpr1)\3|' \ - -e 's|^([[:blank:]]*)set\((.+) freerdp (.+) winpr\)([[:blank:]]*)$$|\1set(\2 freerdp1 \3 winpr1)\4|' \ - -e 's|^([[:blank:]]*)set\((.+) winpr\)([[:blank:]]*)$$|\1set(\2 winpr1)\3|' - @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ - ${WRKSRC}/client/X11/CMakeLists.txt - @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ - ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h - @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ - ${WRKSRC}/channels/drive/client/statvfs.c - @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ - ${WRKSRC}/winpr/CMakeLists.txt \ - ${WRKSRC}/CMakeLists.txt - -.include <bsd.port.mk> diff --git a/net/freerdp1/distinfo b/net/freerdp1/distinfo deleted file mode 100644 index 275287073c99..000000000000 --- a/net/freerdp1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1481433621 -SHA256 (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = f39c7eaa007a3aef580f364f8f5c0b9208c6c3c8f5f00a4c0ed020a81535eb32 -SIZE (FreeRDP-FreeRDP-1.2.0-f5ff6e1_GH0.tar.gz) = 6033856 diff --git a/net/freerdp1/files/patch-CMakeLists.txt b/net/freerdp1/files/patch-CMakeLists.txt deleted file mode 100644 index 6c9c2194b421..000000000000 --- a/net/freerdp1/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.intermediate 2015-06-06 13:17:20 UTC -+++ CMakeLists.txt -@@ -322,6 +322,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") - set(FREEBSD TRUE) - endif() - endif() -+if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") -+ set(BSD TRUE) -+ set(FREEBSD TRUE) -+endif() - - # Android - if(ANDROID) diff --git a/net/freerdp1/files/patch-client_X11_CMakeLists.txt b/net/freerdp1/files/patch-client_X11_CMakeLists.txt deleted file mode 100644 index bee5a38a474c..000000000000 --- a/net/freerdp1/files/patch-client_X11_CMakeLists.txt +++ /dev/null @@ -1,70 +0,0 @@ ---- client/X11/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC -+++ client/X11/CMakeLists.txt -@@ -16,7 +16,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --set(MODULE_NAME "xfreerdp-client") -+set(MODULE_NAME "xfreerdp1-client") - set(MODULE_PREFIX "FREERDP_CLIENT_X11_CONTROL") - - include(FindDocBookXSL) -@@ -66,7 +66,7 @@ if(WITH_CLIENT_INTERFACE) - else() - set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h) - add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) -- set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp") -+ set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1") - endif() - - set(${MODULE_PREFIX}_LIBS -@@ -84,31 +84,31 @@ if(WITH_MANPAGES) - - TODAY(MAN_TODAY) - -- configure_file(xfreerdp.1.xml.in xfreerdp.1.xml @ONLY IMMEDIATE) -+ configure_file(xfreerdp.1.xml.in xfreerdp1.1.xml @ONLY IMMEDIATE) - - add_executable(generate_argument_docbook generate_argument_docbook.c) - -- set(GAD_LIBS freerdp-client) -- target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp winpr) -+ set(GAD_LIBS freerdp1-client) -+ target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp1 winpr1) - -- add_custom_command(OUTPUT xfreerdp.1 -+ add_custom_command(OUTPUT xfreerdp1.1 - COMMAND generate_argument_docbook - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml ${CMAKE_CURRENT_BINARY_DIR} -- COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp.1.xml -+ COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp1.1.xml - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS -- ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1.xml -+ ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml - generate_argument_docbook) - -- add_custom_target(xfreerdp.manpage ALL -- DEPENDS xfreerdp.1) -+ add_custom_target(xfreerdp1.manpage ALL -+ DEPENDS xfreerdp1.1) - -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION share/man/man1) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1 DESTINATION man/man1) - else() - message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed") - endif() -@@ -199,7 +199,7 @@ endif() - - include_directories(${CMAKE_SOURCE_DIR}/resources) - --set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp freerdp-client) -+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp1 freerdp1-client) - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - - if(WITH_IPP) diff --git a/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake b/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake deleted file mode 100644 index 0a49213fc2df..000000000000 --- a/net/freerdp1/files/patch-client_X11_ModuleOptions.cmake +++ /dev/null @@ -1,8 +0,0 @@ ---- client/X11/ModuleOptions.cmake.orig 2014-09-11 22:46:32 UTC -+++ client/X11/ModuleOptions.cmake -@@ -1,4 +1,4 @@ - --set(FREERDP_CLIENT_NAME "xfreerdp") -+set(FREERDP_CLIENT_NAME "xfreerdp1") - set(FREERDP_CLIENT_PLATFORM "X11") - set(FREERDP_CLIENT_VENDOR "FreeRDP") diff --git a/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt b/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt deleted file mode 100644 index 5ee19c1a63b4..000000000000 --- a/net/freerdp1/files/patch-client_X11_cli_CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- client/X11/cli/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC -+++ client/X11/cli/CMakeLists.txt -@@ -15,7 +15,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --set(MODULE_NAME "xfreerdp-cli") -+set(MODULE_NAME "xfreerdp1-cli") - set(MODULE_PREFIX "FREERDP_CLIENT_X11") - - include_directories(..) -@@ -24,9 +24,9 @@ set(${MODULE_PREFIX}_SRCS - xfreerdp.c) - - add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) --set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp" RUNTIME_OUTPUT_DIRECTORY "..") -+set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1" RUNTIME_OUTPUT_DIRECTORY "..") - --set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp-client) -+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp1-client) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - diff --git a/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in b/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in deleted file mode 100644 index 0f219a987938..000000000000 --- a/net/freerdp1/files/patch-client_X11_xfreerdp.1.xml.in +++ /dev/null @@ -1,37 +0,0 @@ ---- client/X11/xfreerdp.1.xml.in.orig 2014-09-11 22:46:32 UTC -+++ client/X11/xfreerdp.1.xml.in -@@ -16,13 +16,13 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// - </author> - </refentryinfo> - <refmeta> -- <refentrytitle>xfreerdp</refentrytitle> -+ <refentrytitle>xfreerdp1</refentrytitle> - <manvolnum>1</manvolnum> - <refmiscinfo class="source">freerdp</refmiscinfo> -- <refmiscinfo class="manual">xfreerdp</refmiscinfo> -+ <refmiscinfo class="manual">xfreerdp1</refmiscinfo> - </refmeta> - <refnamediv> -- <refname><application>xfreerdp</application></refname> -+ <refname><application>xfreerdp1</application></refname> - <refpurpose>FreeRDP X11 client</refpurpose> - </refnamediv> - <refsynopsisdiv> -@@ -30,7 +30,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// - <date>@MAN_TODAY@</date> - </refsynopsisdivinfo> - <para> -- <command>xfreerdp</command> [file] [options] [/v:server[:port]] -+ <command>xfreerdp1</command> [file] [options] [/v:server[:port]] - </para> - </refsynopsisdiv> - <refsect1> -@@ -39,7 +39,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5// - </refsect1info> - <title>DESCRIPTION</title> - <para> -- <command>xfreerdp</command> is an X11 Remote Desktop Protocol (RDP) -+ <command>xfreerdp1</command> is an X11 Remote Desktop Protocol (RDP) - client which is part of the FreeRDP project. An RDP server is built-in - to many editions of Windows. Alternative servers included xrdp and VRDP (VirtualBox). - </para> diff --git a/net/freerdp1/files/patch-client_common_CMakeLists.txt b/net/freerdp1/files/patch-client_common_CMakeLists.txt deleted file mode 100644 index 8d33cbb4a7f4..000000000000 --- a/net/freerdp1/files/patch-client_common_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- client/common/CMakeLists.txt.orig 2016-12-04 15:05:17 UTC -+++ client/common/CMakeLists.txt -@@ -15,7 +15,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --set(MODULE_NAME "freerdp-client") -+set(MODULE_NAME "freerdp1-client") - set(MODULE_PREFIX "FREERDP_CLIENT") - - # Policy CMP0022: INTERFACE_LINK_LIBRARIES defines the link -@@ -58,7 +58,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PRE - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} - ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES}) - --set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) -+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr1 freerdp1) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - diff --git a/net/freerdp1/files/patch-cmake_ConfigOptions.cmake b/net/freerdp1/files/patch-cmake_ConfigOptions.cmake deleted file mode 100644 index f99ac8a71da8..000000000000 --- a/net/freerdp1/files/patch-cmake_ConfigOptions.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/ConfigOptions.cmake.orig 2015-11-29 19:53:58 UTC -+++ cmake/ConfigOptions.cmake -@@ -6,7 +6,7 @@ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES " - elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE)) - # Mac is weird like that. - set(TARGET_ARCH "x64") --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") - set(TARGET_ARCH "ARM") - endif() - diff --git a/net/freerdp1/files/patch-cmake_FindGStreamer__1__0.cmake b/net/freerdp1/files/patch-cmake_FindGStreamer__1__0.cmake deleted file mode 100644 index 1c309f266f5d..000000000000 --- a/net/freerdp1/files/patch-cmake_FindGStreamer__1__0.cmake +++ /dev/null @@ -1,16 +0,0 @@ -Don't use custom code to find the include dirs for gstreamer 1.0 (core). -Since 1.6.0 there are multiple include paths. So use pkg-config to find -which. IMO the rest of this file should use pkg-config.... - ---- cmake/FindGStreamer_1_0.cmake.orig 2014-09-11 22:46:32 UTC -+++ cmake/FindGStreamer_1_0.cmake -@@ -78,7 +78,8 @@ endmacro() - # 1.1. Find headers and libraries - set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR}) - find_package(Glib REQUIRED) --FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) -+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0) -+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0) - FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) - - # 1.2. Check Gstreamer version diff --git a/net/freerdp1/files/patch-cmake_FindOpenSSL.cmake b/net/freerdp1/files/patch-cmake_FindOpenSSL.cmake deleted file mode 100644 index b03bcca93b08..000000000000 --- a/net/freerdp1/files/patch-cmake_FindOpenSSL.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/FindOpenSSL.cmake.orig 2014-09-11 22:46:32 UTC -+++ cmake/FindOpenSSL.cmake -@@ -266,7 +266,7 @@ if (OPENSSL_INCLUDE_DIR) - set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") - file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str -- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") -+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") - - # The version number is encoded as 0xMNNFFPPS: major minor fix patch status - # The status gives if this is a developer or prerelease and is ignored here. diff --git a/net/freerdp1/files/patch-ffmpeg29 b/net/freerdp1/files/patch-ffmpeg29 deleted file mode 100644 index 6f644891961d..000000000000 --- a/net/freerdp1/files/patch-ffmpeg29 +++ /dev/null @@ -1,59 +0,0 @@ -https://github.com/FreeRDP/FreeRDP/commit/b7b66968f93f - ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2014-09-11 22:46:32 UTC -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -@@ -62,6 +62,9 @@ - #define AV_CODEC_ID_AC3 CODEC_ID_AC3 - #endif - -+#if LIBAVUTIL_VERSION_MAJOR < 52 -+#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P -+#endif - - typedef struct _TSMFFFmpegDecoder - { -@@ -103,7 +106,11 @@ static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder - mdecoder->codec_context->bit_rate = media_type->BitRate; - mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; -+#if LIBAVCODEC_VERSION_MAJOR < 55 - mdecoder->frame = avcodec_alloc_frame(); -+#else -+ mdecoder->frame = av_frame_alloc(); -+#endif - return TRUE; - } - -@@ -322,7 +329,11 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder *dec - mdecoder->codec_context->width, mdecoder->codec_context->height); - mdecoder->decoded_data = malloc(mdecoder->decoded_size); - ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size); -+#if LIBAVCODEC_VERSION_MAJOR < 55 - frame = avcodec_alloc_frame(); -+#else -+ frame = av_frame_alloc(); -+#endif - avpicture_fill((AVPicture *) frame, mdecoder->decoded_data, - mdecoder->codec_context->pix_fmt, - mdecoder->codec_context->width, mdecoder->codec_context->height); -@@ -385,7 +396,11 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder *dec - (int16_t *) dst, &frame_size, src, src_size); - #else - { -+#if LIBAVCODEC_VERSION_MAJOR < 55 - AVFrame *decoded_frame = avcodec_alloc_frame(); -+#else -+ AVFrame *decoded_frame = av_frame_alloc(); -+#endif - int got_frame = 0; - AVPacket pkt; - av_init_packet(&pkt); -@@ -464,7 +479,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_format(ITSMFDeco - TSMFFFmpegDecoder *mdecoder = (TSMFFFmpegDecoder *) decoder; - switch(mdecoder->codec_context->pix_fmt) - { -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUV420P: - return RDP_PIXFMT_I420; - default: - CLOG_ERR("unsupported pixel format %u", diff --git a/net/freerdp1/files/patch-freerdp.pc.in b/net/freerdp1/files/patch-freerdp.pc.in deleted file mode 100644 index 3ff4436d239b..000000000000 --- a/net/freerdp1/files/patch-freerdp.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -Index: freerdp.pc.in ---- freerdp.pc.in.orig 2014-09-11 22:46:32 UTC -+++ freerdp.pc.in -@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop P - URL: http://www.freerdp.com/ - Version: @FREERDP_VERSION_FULL@ - Requires: --Requires.private: winpr zlib libssl -+Requires.private: winpr zlib - Libs: -L${libdir} ${libs} - Libs.private: -ldl -lpthread - Cflags: -I${includedir} diff --git a/net/freerdp1/files/patch-git_1b5f5747 b/net/freerdp1/files/patch-git_1b5f5747 deleted file mode 100644 index 39ec082de833..000000000000 --- a/net/freerdp1/files/patch-git_1b5f5747 +++ /dev/null @@ -1,30 +0,0 @@ ---- winpr/libwinpr/bcrypt/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC -+++ winpr/libwinpr/bcrypt/CMakeLists.txt -@@ -17,8 +17,3 @@ - - winpr_module_add(bcrypt.c) - --winpr_include_directory_add( -- ${OPENSSL_INCLUDE_DIR} -- ${ZLIB_INCLUDE_DIRS}) -- --winpr_library_add(${ZLIB_LIBRARIES}) ---- winpr/libwinpr/crypto/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC -+++ winpr/libwinpr/crypto/CMakeLists.txt -@@ -20,6 +20,16 @@ winpr_module_add( - crypto.h - cert.c) - -+if(OPENSSL_FOUND) -+ winpr_include_directory_add(${OPENSSL_INCLUDE_DIR}) -+ winpr_library_add(${OPENSSL_LIBRARIES}) -+endif() -+ -+if(MBEDTLS_FOUND) -+ winpr_include_directory_add(${MBEDTLS_INCLUDE_DIR}) -+ winpr_library_add(${MBEDTLS_LIBRARIES}) -+endif() -+ - if(WIN32) - winpr_library_add(crypt32) - endif() diff --git a/net/freerdp1/files/patch-git_1b663cef b/net/freerdp1/files/patch-git_1b663cef deleted file mode 100644 index fb2fe13ccdfd..000000000000 --- a/net/freerdp1/files/patch-git_1b663cef +++ /dev/null @@ -1,57 +0,0 @@ -The patch below comes from upstream and has been slightly adjusted to apply -on the tarball we build. - -From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 -From: Bernhard Miklautz <bernhard.miklautz@shacknet.at> -Date: Fri, 12 Dec 2014 18:26:45 +0100 -Subject: [PATCH] build: cmake 3.1 compatibility - -* fix problem with REMOVE_DUPLICATES on undefined lists -* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as - previously - necessary adoptions for regex and matches done. Should - work with all cmake versions. - -Tested with 3.1.0-rc3 ---- channels/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC -+++ channels/CMakeLists.txt -@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake") - file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") - - foreach(FILEPATH ${FILEPATHS}) -- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") -- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH}) -+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") -+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH}) - set(CHANNEL_OPTION) - include(${FILEPATH}) - if(${CHANNEL_OPTION}) ---- channels/client/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC -+++ channels/client/CMakeLists.txt -@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/addin.c - ${CMAKE_CURRENT_SOURCE_DIR}/addin.h) - -+if(CHANNEL_STATIC_CLIENT_ENTRIES) - list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES) -+endif() - - foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) - foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) ---- third-party/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC -+++ third-party/CMakeLists.txt -@@ -22,11 +22,11 @@ - file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") - - foreach(dir ${all_valid_subdirs}) -- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") -- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) -+ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt") -+ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir}) - message(STATUS "Adding third-party component ${dir_trimmed}") - add_subdirectory(${dir_trimmed}) - endif() - endforeach(dir) - --set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) -\ No newline at end of file -+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) diff --git a/net/freerdp1/files/patch-git_434436b7 b/net/freerdp1/files/patch-git_434436b7 deleted file mode 100644 index 0d46c3d007fb..000000000000 --- a/net/freerdp1/files/patch-git_434436b7 +++ /dev/null @@ -1,65 +0,0 @@ -From 434436b75f00c5475f66ff0f4062e168aa409688 Mon Sep 17 00:00:00 2001 -From: ivan-83 <rozhuk.im@gmail.com> -Date: Tue, 10 Mar 2015 01:21:28 +0300 -Subject: [PATCH] * BSD/FreeBSD build fix - ---- - CMakeLists.txt | 14 ++++++++++++++ - winpr/libwinpr/synch/wait.c | 2 +- - winpr/libwinpr/sysinfo/sysinfo.c | 1 + - winpr/libwinpr/utils/CMakeLists.txt | 4 ++++ - 4 files changed, 20 insertions(+), 1 deletion(-) - ---- CMakeLists.txt.orig 2016-12-11 05:41:21 UTC -+++ CMakeLists.txt -@@ -319,6 +319,14 @@ if(APPLE) - endif() - endif(APPLE) - -+# BSD -+if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") -+ set(BSD TRUE) -+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ set(FREEBSD TRUE) -+ endif() -+endif() -+ - # Android - if(ANDROID) - set(WITH_LIBRARY_VERSIONING "OFF") -@@ -558,6 +566,12 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INST - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -+if(BSD) -+ if(IS_DIRECTORY /usr/local/include) -+ include_directories(/usr/local/include) -+ link_directories(/usr/local/lib) -+ endif() -+endif() - - # Configure files - add_definitions("-DHAVE_CONFIG_H") ---- winpr/libwinpr/sysinfo/sysinfo.c.orig 2014-09-11 22:46:32 UTC -+++ winpr/libwinpr/sysinfo/sysinfo.c -@@ -54,6 +54,7 @@ - #ifndef _WIN32 - - #include <time.h> -+#include <sys/time.h> - - #ifdef HAVE_UNISTD_H - #include <unistd.h> ---- winpr/libwinpr/utils/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC -+++ winpr/libwinpr/utils/CMakeLists.txt -@@ -105,6 +105,10 @@ if(UNIX) - winpr_library_add(m) - endif() - -+if(BSD) -+ winpr_library_add(execinfo) -+endif() -+ - if(BUILD_TESTING) - add_subdirectory(test) - endif() diff --git a/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h b/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h deleted file mode 100644 index 1f5d4495e524..000000000000 --- a/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h +++ /dev/null @@ -1,23 +0,0 @@ ---- include/freerdp/crypto/crypto.h.orig 2018-11-06 02:55:10 UTC -+++ include/freerdp/crypto/crypto.h -@@ -61,12 +61,20 @@ struct crypto_rc4_struct - - struct crypto_des3_struct - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX *des3_ctx; -+#else - EVP_CIPHER_CTX des3_ctx; -+#endif - }; - - struct crypto_hmac_struct - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_CTX *hmac_ctx; -+#else - HMAC_CTX hmac_ctx; -+#endif - }; - - struct crypto_cert_struct diff --git a/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt b/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt deleted file mode 100644 index 0a1c34df46af..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- libfreerdp/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC -+++ libfreerdp/CMakeLists.txt -@@ -15,7 +15,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --set(MODULE_NAME "freerdp") -+set(MODULE_NAME "freerdp1") - set(MODULE_PREFIX "FREERDP") - - # Create imported targets for Intel IPP libraries -@@ -284,6 +284,6 @@ if (WITH_LIBRARY_VERSIONING) - endif() - set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "lib") - --target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr) -+target_link_libraries(${MODULE_NAME} ${LIBFREERDP_LIBS} winpr1) - install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets) - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp") diff --git a/net/freerdp1/files/patch-libfreerdp_common_assistance.c b/net/freerdp1/files/patch-libfreerdp_common_assistance.c deleted file mode 100644 index 3db652d46915..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_common_assistance.c +++ /dev/null @@ -1,156 +0,0 @@ ---- libfreerdp/common/assistance.c.orig 2018-11-06 05:10:45 UTC -+++ libfreerdp/common/assistance.c -@@ -478,7 +478,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* - int cbPassStubW; - int EncryptedSize; - BYTE PasswordHash[16]; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX *rc4Ctx; -+#else - EVP_CIPHER_CTX rc4Ctx; -+#endif - BYTE *pbIn, *pbOut; - int cbOut, cbIn, cbFinal; - WCHAR* PasswordW = NULL; -@@ -516,9 +520,16 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* - *((UINT32*) pbIn) = cbPassStubW; - CopyMemory(&pbIn[4], PassStubW, cbPassStubW); - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ rc4Ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(rc4Ctx); -+ -+ status = EVP_EncryptInit_ex(rc4Ctx, EVP_rc4(), NULL, NULL, NULL); -+#else - EVP_CIPHER_CTX_init(&rc4Ctx); - - status = EVP_EncryptInit_ex(&rc4Ctx, EVP_rc4(), NULL, NULL, NULL); -+#endif - - if (!status) - { -@@ -526,7 +537,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* - return NULL; - } - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ status = EVP_EncryptInit_ex(rc4Ctx, NULL, NULL, PasswordHash, NULL); -+#else - status = EVP_EncryptInit_ex(&rc4Ctx, NULL, NULL, PasswordHash, NULL); -+#endif - - if (!status) - { -@@ -537,7 +552,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* - cbOut = cbFinal = 0; - cbIn = EncryptedSize; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ status = EVP_EncryptUpdate(rc4Ctx, pbOut, &cbOut, pbIn, cbIn); -+#else - status = EVP_EncryptUpdate(&rc4Ctx, pbOut, &cbOut, pbIn, cbIn); -+#endif - - if (!status) - { -@@ -545,7 +564,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* - return NULL; - } - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ status = EVP_EncryptFinal_ex(rc4Ctx, pbOut + cbOut, &cbFinal); -+#else - status = EVP_EncryptFinal_ex(&rc4Ctx, pbOut + cbOut, &cbFinal); -+#endif - - if (!status) - { -@@ -553,7 +576,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* - return NULL; - } - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX_free(rc4Ctx); -+#else - EVP_CIPHER_CTX_cleanup(&rc4Ctx); -+#endif - - free(pbIn); - free(PasswordW); -@@ -571,7 +598,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil - int cbPasswordW; - int cchOutW = 0; - WCHAR* pbOutW = NULL; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX *aesDec; -+#else - EVP_CIPHER_CTX aesDec; -+#endif - WCHAR* PasswordW = NULL; - BYTE *pbIn, *pbOut; - int cbOut, cbIn, cbFinal; -@@ -598,17 +629,31 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil - - ZeroMemory(InitializationVector, sizeof(InitializationVector)); - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ aesDec = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(aesDec); -+ -+ status = EVP_DecryptInit_ex(aesDec, EVP_aes_128_cbc(), NULL, NULL, NULL); -+#else - EVP_CIPHER_CTX_init(&aesDec); - - status = EVP_DecryptInit_ex(&aesDec, EVP_aes_128_cbc(), NULL, NULL, NULL); -+#endif - - if (status != 1) - return -1; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX_set_key_length(aesDec, (128 / 8)); -+ EVP_CIPHER_CTX_set_padding(aesDec, 0); -+ -+ status = EVP_DecryptInit_ex(aesDec, EVP_aes_128_cbc(), NULL, DerivedKey, InitializationVector); -+#else - EVP_CIPHER_CTX_set_key_length(&aesDec, (128 / 8)); - EVP_CIPHER_CTX_set_padding(&aesDec, 0); - - status = EVP_DecryptInit_ex(&aesDec, EVP_aes_128_cbc(), NULL, DerivedKey, InitializationVector); -+#endif - - if (status != 1) - return -1; -@@ -621,12 +666,20 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil - if (!pbOut) - return -1; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ status = EVP_DecryptUpdate(aesDec, pbOut, &cbOut, pbIn, cbIn); -+#else - status = EVP_DecryptUpdate(&aesDec, pbOut, &cbOut, pbIn, cbIn); -+#endif - - if (status != 1) - return -1; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ status = EVP_DecryptFinal_ex(aesDec, pbOut + cbOut, &cbFinal); -+#else - status = EVP_DecryptFinal_ex(&aesDec, pbOut + cbOut, &cbFinal); -+#endif - - if (status != 1) - { -@@ -634,7 +687,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil - return -1; - } - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX_free(aesDec); -+#else - EVP_CIPHER_CTX_cleanup(&aesDec); -+#endif - - cbOut += cbFinal; - cbFinal = 0; diff --git a/net/freerdp1/files/patch-libfreerdp_core_certificate.c b/net/freerdp1/files/patch-libfreerdp_core_certificate.c deleted file mode 100644 index 2ff354296410..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_core_certificate.c +++ /dev/null @@ -1,59 +0,0 @@ ---- libfreerdp/core/certificate.c.orig 2014-09-11 22:46:32 UTC -+++ libfreerdp/core/certificate.c -@@ -32,6 +32,7 @@ - #include <openssl/rsa.h> - - #include "certificate.h" -+#include "../crypto/opensslcompat.h" - - #define TAG "com.freerdp.core" - -@@ -652,6 +653,9 @@ rdpRsaKey* key_new(const char* keyfile) - FILE* fp; - RSA* rsa; - rdpRsaKey* key; -+ const BIGNUM *rsa_e = NULL; -+ const BIGNUM *rsa_n = NULL; -+ const BIGNUM *rsa_d = NULL; - key = (rdpRsaKey*)calloc(1, sizeof(rdpRsaKey)); - - if (!key) -@@ -692,31 +696,31 @@ rdpRsaKey* key_new(const char* keyfile) - ERR_print_errors_fp(stderr); - goto out_free_rsa; - } -- -- if (BN_num_bytes(rsa->e) > 4) -+ RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d); -+ if (BN_num_bytes(rsa_e) > 4) - { - DEBUG_WARN("%s: RSA public exponent too large in %s\n", __FUNCTION__, keyfile); - goto out_free_rsa; - } - -- key->ModulusLength = BN_num_bytes(rsa->n); -+ key->ModulusLength = BN_num_bytes(rsa_n); - key->Modulus = (BYTE*)malloc(key->ModulusLength); - - if (!key->Modulus) - goto out_free_rsa; - -- BN_bn2bin(rsa->n, key->Modulus); -+ BN_bn2bin(rsa_n, key->Modulus); - crypto_reverse(key->Modulus, key->ModulusLength); -- key->PrivateExponentLength = BN_num_bytes(rsa->d); -+ key->PrivateExponentLength = BN_num_bytes(rsa_d); - key->PrivateExponent = (BYTE*)malloc(key->PrivateExponentLength); - - if (!key->PrivateExponent) - goto out_free_modulus; - -- BN_bn2bin(rsa->d, key->PrivateExponent); -+ BN_bn2bin(rsa_d, key->PrivateExponent); - crypto_reverse(key->PrivateExponent, key->PrivateExponentLength); - memset(key->exponent, 0, sizeof(key->exponent)); -- BN_bn2bin(rsa->e, key->exponent + sizeof(key->exponent) - BN_num_bytes(rsa->e)); -+ BN_bn2bin(rsa_e, key->exponent + sizeof(key->exponent) - BN_num_bytes(rsa_e)); - crypto_reverse(key->exponent, sizeof(key->exponent)); - RSA_free(rsa); - return key; diff --git a/net/freerdp1/files/patch-libfreerdp_core_tcp.c b/net/freerdp1/files/patch-libfreerdp_core_tcp.c deleted file mode 100644 index 8dc04bf8cdda..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_core_tcp.c +++ /dev/null @@ -1,338 +0,0 @@ ---- libfreerdp/core/tcp.c.orig 2014-09-11 22:46:32 UTC -+++ libfreerdp/core/tcp.c -@@ -71,6 +71,7 @@ - #include <winpr/stream.h> - - #include "tcp.h" -+#include "../crypto/opensslcompat.h" - - /* Simple Socket BIO */ - -@@ -86,13 +87,14 @@ static int transport_bio_simple_write(BIO* bio, const - { - int error; - int status = 0; -+ int socket = (int)BIO_get_data(bio); - - if (!buf) - return 0; - - BIO_clear_flags(bio, BIO_FLAGS_WRITE); - -- status = _send((SOCKET) bio->num, buf, size, 0); -+ status = _send(socket, buf, size, 0); - - if (status <= 0) - { -@@ -116,13 +118,14 @@ static int transport_bio_simple_read(BIO* bio, char* b - { - int error; - int status = 0; -+ int socket = (int)BIO_get_data(bio); - - if (!buf) - return 0; - - BIO_clear_flags(bio, BIO_FLAGS_READ); - -- status = _recv((SOCKET) bio->num, buf, size, 0); -+ status = _recv(socket, buf, size, 0); - if (status > 0) - return status; - -@@ -160,6 +163,7 @@ static int transport_bio_simple_gets(BIO* bio, char* s - static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) - { - int status = -1; -+ int socket = (int)BIO_get_data(bio); - - switch (cmd) - { -@@ -167,29 +171,29 @@ static long transport_bio_simple_ctrl(BIO* bio, int cm - if (arg2) - { - transport_bio_simple_free(bio); -- bio->flags = BIO_FLAGS_SHOULD_RETRY; -- bio->num = *((int*) arg2); -- bio->shutdown = (int) arg1; -- bio->init = 1; -+ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); -+ BIO_set_data(bio, *((int *) arg2)); -+ BIO_set_shutdown(bio, (int) arg1); -+ BIO_set_init(bio, 1); - status = 1; - } - break; - - case BIO_C_GET_FD: -- if (bio->init) -+ if (BIO_get_init(bio)) - { - if (arg2) -- *((int*) arg2) = bio->num; -- status = bio->num; -+ *((int*) arg2) = socket; -+ status = socket; - } - break; - - case BIO_CTRL_GET_CLOSE: -- status = bio->shutdown; -+ status = BIO_get_shutdown(bio); - break; - - case BIO_CTRL_SET_CLOSE: -- bio->shutdown = (int) arg1; -+ BIO_set_shutdown(bio, (int) arg1); - status = 1; - break; - -@@ -211,47 +215,49 @@ static long transport_bio_simple_ctrl(BIO* bio, int cm - - static int transport_bio_simple_new(BIO* bio) - { -- bio->init = 0; -- bio->num = 0; -- bio->ptr = NULL; -- bio->flags = BIO_FLAGS_SHOULD_RETRY; -+ -+ BIO_set_init(bio, 0); -+ BIO_set_data(bio, 0); -+ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); - return 1; - } - - static int transport_bio_simple_free(BIO* bio) - { -+ int socket = (int)BIO_get_data(bio); - if (!bio) - return 0; - -- if (bio->shutdown) -+ if (BIO_get_shutdown(bio)) - { -- if (bio->init) -- closesocket((SOCKET) bio->num); -+ if (BIO_get_init(bio)) -+ closesocket(socket); - -- bio->init = 0; -- bio->flags = 0; -+ BIO_set_init(bio, 0); -+ BIO_set_flags(bio, 0); -+ BIO_set_data(bio, 0); - } - - return 1; - } - --static BIO_METHOD transport_bio_simple_socket_methods = --{ -- BIO_TYPE_SIMPLE, -- "SimpleSocket", -- transport_bio_simple_write, -- transport_bio_simple_read, -- transport_bio_simple_puts, -- transport_bio_simple_gets, -- transport_bio_simple_ctrl, -- transport_bio_simple_new, -- transport_bio_simple_free, -- NULL, --}; -- - BIO_METHOD* BIO_s_simple_socket(void) - { -- return &transport_bio_simple_socket_methods; -+ static BIO_METHOD* bio_methods = NULL; -+ -+ if (bio_methods == NULL) -+ { -+ if (!(bio_methods = BIO_meth_new(BIO_TYPE_SIMPLE, "SimpleSocket"))) -+ return NULL; -+ BIO_meth_set_write(bio_methods, transport_bio_simple_write); -+ BIO_meth_set_read(bio_methods, transport_bio_simple_read); -+ BIO_meth_set_puts(bio_methods, transport_bio_simple_puts); -+ BIO_meth_set_gets(bio_methods, transport_bio_simple_gets); -+ BIO_meth_set_ctrl(bio_methods, transport_bio_simple_ctrl); -+ BIO_meth_set_create(bio_methods, transport_bio_simple_new); -+ BIO_meth_set_destroy(bio_methods, transport_bio_simple_free); -+ } -+ return bio_methods; - } - - /* Buffered Socket BIO */ -@@ -264,7 +270,8 @@ long transport_bio_buffered_callback(BIO* bio, int mod - static int transport_bio_buffered_write(BIO* bio, const char* buf, int num) - { - int status, ret; -- rdpTcp* tcp = (rdpTcp*) bio->ptr; -+ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); -+ BIO *next_bio = NULL; - int nchunks, committedBytes, i; - DataChunk chunks[2]; - -@@ -283,23 +290,24 @@ static int transport_bio_buffered_write(BIO* bio, cons - - committedBytes = 0; - nchunks = ringbuffer_peek(&tcp->xmitBuffer, chunks, ringbuffer_used(&tcp->xmitBuffer)); -+ next_bio = BIO_next(bio); - - for (i = 0; i < nchunks; i++) - { - while (chunks[i].size) - { -- status = BIO_write(bio->next_bio, chunks[i].data, chunks[i].size); -+ status = BIO_write(next_bio, chunks[i].data, chunks[i].size); - - if (status <= 0) - { -- if (!BIO_should_retry(bio->next_bio)) -+ if (!BIO_should_retry(next_bio)) - { - BIO_clear_flags(bio, BIO_FLAGS_SHOULD_RETRY); - ret = -1; /* fatal error */ - goto out; - } - -- if (BIO_should_write(bio->next_bio)) -+ if (BIO_should_write(next_bio)) - { - BIO_set_flags(bio, BIO_FLAGS_WRITE); - tcp->writeBlocked = TRUE; -@@ -321,16 +329,17 @@ out: - static int transport_bio_buffered_read(BIO* bio, char* buf, int size) - { - int status; -- rdpTcp* tcp = (rdpTcp*) bio->ptr; -+ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); -+ BIO* next_bio = BIO_next(bio); - - tcp->readBlocked = FALSE; - BIO_clear_flags(bio, BIO_FLAGS_READ); - -- status = BIO_read(bio->next_bio, buf, size); -+ status = BIO_read(next_bio, buf, size); - - if (status <= 0) - { -- if (!BIO_should_retry(bio->next_bio)) -+ if (!BIO_should_retry(next_bio)) - { - BIO_clear_flags(bio, BIO_FLAGS_SHOULD_RETRY); - goto out; -@@ -338,7 +347,7 @@ static int transport_bio_buffered_read(BIO* bio, char* - - BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); - -- if (BIO_should_read(bio->next_bio)) -+ if (BIO_should_read(next_bio)) - { - BIO_set_flags(bio, BIO_FLAGS_READ); - tcp->readBlocked = TRUE; -@@ -362,7 +371,7 @@ static int transport_bio_buffered_gets(BIO* bio, char* - - static long transport_bio_buffered_ctrl(BIO* bio, int cmd, long arg1, void* arg2) - { -- rdpTcp* tcp = (rdpTcp*) bio->ptr; -+ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); - - switch (cmd) - { -@@ -376,7 +385,7 @@ static long transport_bio_buffered_ctrl(BIO* bio, int - return 0; - - default: -- return BIO_ctrl(bio->next_bio, cmd, arg1, arg2); -+ return BIO_ctrl(BIO_next(bio), cmd, arg1, arg2); - } - - return 0; -@@ -384,10 +393,9 @@ static long transport_bio_buffered_ctrl(BIO* bio, int - - static int transport_bio_buffered_new(BIO* bio) - { -- bio->init = 1; -- bio->num = 0; -- bio->ptr = NULL; -- bio->flags = BIO_FLAGS_SHOULD_RETRY; -+ BIO_set_init(bio, 1); -+ BIO_set_data(bio, 0); -+ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); - return 1; - } - -@@ -396,29 +404,28 @@ static int transport_bio_buffered_free(BIO* bio) - return 1; - } - --static BIO_METHOD transport_bio_buffered_socket_methods = --{ -- BIO_TYPE_BUFFERED, -- "BufferedSocket", -- transport_bio_buffered_write, -- transport_bio_buffered_read, -- transport_bio_buffered_puts, -- transport_bio_buffered_gets, -- transport_bio_buffered_ctrl, -- transport_bio_buffered_new, -- transport_bio_buffered_free, -- NULL, --}; -- - BIO_METHOD* BIO_s_buffered_socket(void) - { -- return &transport_bio_buffered_socket_methods; -+ static BIO_METHOD* bio_methods = NULL; -+ if (bio_methods == NULL) -+ { -+ if (!(bio_methods = BIO_meth_new(BIO_TYPE_BUFFERED, "BufferedSocket"))) -+ return NULL; -+ BIO_meth_set_write(bio_methods, transport_bio_buffered_write); -+ BIO_meth_set_read(bio_methods, transport_bio_buffered_read); -+ BIO_meth_set_puts(bio_methods, transport_bio_buffered_puts); -+ BIO_meth_set_gets(bio_methods, transport_bio_buffered_gets); -+ BIO_meth_set_ctrl(bio_methods, transport_bio_buffered_ctrl); -+ BIO_meth_set_create(bio_methods, transport_bio_buffered_new); -+ BIO_meth_set_destroy(bio_methods, transport_bio_buffered_free); -+ } -+ return bio_methods; - } - - BOOL transport_bio_buffered_drain(BIO *bio) - { - int status; -- rdpTcp* tcp = (rdpTcp*) bio->ptr; -+ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); - - if (!ringbuffer_used(&tcp->xmitBuffer)) - return 1; -@@ -527,7 +534,10 @@ BOOL tcp_connect(rdpTcp* tcp, const char* hostname, in - if (!tcp->socketBio) - return FALSE; - -- if (BIO_set_conn_hostname(tcp->socketBio, hostname) < 0 || BIO_set_conn_int_port(tcp->socketBio, &port) < 0) -+ char strport[10]; -+ /* XXX HACK */ -+ snprintf(strport, 10, "%d", port); -+ if (BIO_set_conn_hostname(tcp->socketBio, hostname) < 0 || BIO_set_conn_port(tcp->socketBio, strport) < 0) - return FALSE; - - BIO_set_nbio(tcp->socketBio, 1); -@@ -620,7 +630,7 @@ BOOL tcp_connect(rdpTcp* tcp, const char* hostname, in - if (!tcp->bufferedBio) - return FALSE; - -- tcp->bufferedBio->ptr = tcp; -+ BIO_set_data(tcp->bufferedBio, tcp); - - tcp->bufferedBio = BIO_push(tcp->bufferedBio, tcp->socketBio); - -@@ -771,7 +781,7 @@ int tcp_attach(rdpTcp* tcp, int sockfd) - if (!tcp->bufferedBio) - return FALSE; - -- tcp->bufferedBio->ptr = tcp; -+ BIO_set_data(tcp->bufferedBio, tcp); - - tcp->bufferedBio = BIO_push(tcp->bufferedBio, tcp->socketBio); - } diff --git a/net/freerdp1/files/patch-libfreerdp_core_transport.c b/net/freerdp1/files/patch-libfreerdp_core_transport.c deleted file mode 100644 index 6aec41b8d367..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_core_transport.c +++ /dev/null @@ -1,92 +0,0 @@ ---- libfreerdp/core/transport.c.orig 2014-09-11 22:46:32 UTC -+++ libfreerdp/core/transport.c -@@ -54,6 +54,7 @@ - #include "fastpath.h" - #include "transport.h" - #include "rdp.h" -+#include "../crypto/opensslcompat.h" - - #define TAG FREERDP_TAG("core") - -@@ -122,7 +123,7 @@ static int transport_bio_tsg_write(BIO* bio, const cha - { - int status; - rdpTsg* tsg; -- tsg = (rdpTsg*) bio->ptr; -+ tsg = (rdpTsg*) BIO_get_data(bio); - BIO_clear_flags(bio, BIO_FLAGS_WRITE); - status = tsg_write(tsg, (BYTE*) buf, num); - -@@ -142,9 +143,9 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, - { - int status; - rdpTsg* tsg; -- tsg = (rdpTsg*) bio->ptr; -+ tsg = (rdpTsg*) BIO_get_data(bio); - BIO_clear_flags(bio, BIO_FLAGS_READ); -- status = tsg_read(bio->ptr, (BYTE*) buf, size); -+ status = tsg_read(tsg, (BYTE*) buf, size); - - if (status < 0) - { -@@ -180,10 +181,9 @@ static long transport_bio_tsg_ctrl(BIO* bio, int cmd, - - static int transport_bio_tsg_new(BIO* bio) - { -- bio->init = 1; -- bio->num = 0; -- bio->ptr = NULL; -- bio->flags = BIO_FLAGS_SHOULD_RETRY; -+ BIO_set_init(bio, 1); -+ BIO_set_data(bio, 0); -+ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); - return 1; - } - -@@ -194,23 +194,22 @@ static int transport_bio_tsg_free(BIO* bio) - - #define BIO_TYPE_TSG 65 - --static BIO_METHOD transport_bio_tsg_methods = --{ -- BIO_TYPE_TSG, -- "TSGateway", -- transport_bio_tsg_write, -- transport_bio_tsg_read, -- transport_bio_tsg_puts, -- transport_bio_tsg_gets, -- transport_bio_tsg_ctrl, -- transport_bio_tsg_new, -- transport_bio_tsg_free, -- NULL, --}; -- - BIO_METHOD* BIO_s_tsg(void) - { -- return &transport_bio_tsg_methods; -+ static BIO_METHOD* bio_methods = NULL; -+ if (bio_methods == NULL) -+ { -+ if (!(bio_methods = BIO_meth_new(BIO_TYPE_TSG, "TSGateway"))) -+ return NULL; -+ BIO_meth_set_write(bio_methods, transport_bio_tsg_write); -+ BIO_meth_set_read(bio_methods, transport_bio_tsg_read); -+ BIO_meth_set_puts(bio_methods, transport_bio_tsg_puts); -+ BIO_meth_set_gets(bio_methods, transport_bio_tsg_gets); -+ BIO_meth_set_ctrl(bio_methods, transport_bio_tsg_ctrl); -+ BIO_meth_set_create(bio_methods, transport_bio_tsg_new); -+ BIO_meth_set_destroy(bio_methods, transport_bio_tsg_free); -+ } -+ return bio_methods; - } - - BOOL transport_connect_tls(rdpTransport* transport) -@@ -426,7 +425,7 @@ BOOL transport_tsg_connect(rdpTransport* transport, co - return FALSE; - - transport->frontBio = BIO_new(BIO_s_tsg()); -- transport->frontBio->ptr = tsg; -+ BIO_set_data(transport->frontBio, tsg); - return TRUE; - } - diff --git a/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt b/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt deleted file mode 100644 index 784fd0bccdbc..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- libfreerdp/crypto/CMakeLists.txt.orig 2018-11-15 22:43:06 UTC -+++ libfreerdp/crypto/CMakeLists.txt -@@ -26,7 +26,8 @@ freerdp_module_add( - base64.c - certificate.c - crypto.c -- tls.c) -+ tls.c -+ opensslcompat.c) - - freerdp_include_directory_add(${OPENSSL_INCLUDE_DIR}) - freerdp_include_directory_add(${ZLIB_INCLUDE_DIRS}) diff --git a/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c b/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c deleted file mode 100644 index 7ae6e5e1c3d6..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c +++ /dev/null @@ -1,189 +0,0 @@ ---- libfreerdp/crypto/crypto.c.orig 2018-11-06 02:56:44 UTC -+++ libfreerdp/crypto/crypto.c -@@ -92,9 +92,16 @@ CryptoDes3 crypto_des3_encrypt_init(const BYTE* key, c - if (!des3) - return NULL; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ des3->des3_ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(des3->des3_ctx); -+ EVP_EncryptInit_ex(des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); -+ EVP_CIPHER_CTX_set_padding(des3->des3_ctx, 0); -+#else - EVP_CIPHER_CTX_init(&des3->des3_ctx); - EVP_EncryptInit_ex(&des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); - EVP_CIPHER_CTX_set_padding(&des3->des3_ctx, 0); -+#endif - return des3; - } - -@@ -103,23 +110,37 @@ CryptoDes3 crypto_des3_decrypt_init(const BYTE* key, c - CryptoDes3 des3 = malloc(sizeof(*des3)); - if (!des3) - return NULL; -- -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ des3->des3_ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(des3->des3_ctx); -+ EVP_DecryptInit_ex(des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); -+ EVP_CIPHER_CTX_set_padding(des3->des3_ctx, 0); -+#else - EVP_CIPHER_CTX_init(&des3->des3_ctx); - EVP_DecryptInit_ex(&des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); - EVP_CIPHER_CTX_set_padding(&des3->des3_ctx, 0); -+#endif - return des3; - } - - void crypto_des3_encrypt(CryptoDes3 des3, UINT32 length, const BYTE* in_data, BYTE* out_data) - { - int len; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_EncryptUpdate(des3->des3_ctx, out_data, &len, in_data, length); -+#else - EVP_EncryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); -+#endif - } - - void crypto_des3_decrypt(CryptoDes3 des3, UINT32 length, const BYTE* in_data, BYTE* out_data) - { - int len; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_DecryptUpdate(des3->des3_ctx, out_data, &len, in_data, length); -+#else - EVP_DecryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); -+#endif - - if (length != len) - abort(); /* TODO */ -@@ -129,7 +150,12 @@ void crypto_des3_free(CryptoDes3 des3) - { - if (des3 == NULL) - return; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX_cleanup(des3->des3_ctx); -+ EVP_CIPHER_CTX_free(des3->des3_ctx); -+#else - EVP_CIPHER_CTX_cleanup(&des3->des3_ctx); -+#endif - free(des3); - } - -@@ -139,28 +165,48 @@ CryptoHmac crypto_hmac_new(void) - if (!hmac) - return NULL; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ hmac->hmac_ctx = HMAC_CTX_new(); -+#else - HMAC_CTX_init(&hmac->hmac_ctx); -+#endif - return hmac; - } - - void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE* data, UINT32 length) - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_Init_ex(hmac->hmac_ctx, data, length, EVP_sha1(), NULL); -+#else - HMAC_Init_ex(&hmac->hmac_ctx, data, length, EVP_sha1(), NULL); -+#endif - } - - void crypto_hmac_md5_init(CryptoHmac hmac, const BYTE* data, UINT32 length) - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_Init_ex(hmac->hmac_ctx, data, length, EVP_md5(), NULL); -+#else - HMAC_Init_ex(&hmac->hmac_ctx, data, length, EVP_md5(), NULL); -+#endif - } - - void crypto_hmac_update(CryptoHmac hmac, const BYTE* data, UINT32 length) - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_Update(hmac->hmac_ctx, data, length); -+#else - HMAC_Update(&hmac->hmac_ctx, data, length); -+#endif - } - - void crypto_hmac_final(CryptoHmac hmac, BYTE* out_data, UINT32 length) - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_Final(hmac->hmac_ctx, out_data, &length); -+#else - HMAC_Final(&hmac->hmac_ctx, out_data, &length); -+#endif - } - - void crypto_hmac_free(CryptoHmac hmac) -@@ -168,7 +214,11 @@ void crypto_hmac_free(CryptoHmac hmac) - if (hmac == NULL) - return; - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_CTX_free(hmac->hmac_ctx); -+#else - HMAC_CTX_cleanup(&hmac->hmac_ctx); -+#endif - free(hmac); - } - -@@ -236,7 +286,11 @@ static int crypto_rsa_common(const BYTE* input, int le - BYTE* input_reverse; - BYTE* modulus_reverse; - BYTE* exponent_reverse; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ BIGNUM *mod, *exp, *x, *y; -+#else - BIGNUM mod, exp, x, y; -+#endif - - input_reverse = (BYTE*) malloc(2 * key_length + exponent_size); - if (!input_reverse) -@@ -254,6 +308,18 @@ static int crypto_rsa_common(const BYTE* input, int le - ctx = BN_CTX_new(); - if (!ctx) - goto out_free_input_reverse; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ mod = BN_new(); -+ exp = BN_new(); -+ x = BN_new(); -+ y = BN_new(); -+ -+ BN_bin2bn(modulus_reverse, key_length, mod); -+ BN_bin2bn(exponent_reverse, exponent_size, exp); -+ BN_bin2bn(input_reverse, length, x); -+ BN_mod_exp(y, x, exp, mod, ctx); -+ output_length = BN_bn2bin(y, output); -+#else - BN_init(&mod); - BN_init(&exp); - BN_init(&x); -@@ -263,17 +329,24 @@ static int crypto_rsa_common(const BYTE* input, int le - BN_bin2bn(exponent_reverse, exponent_size, &exp); - BN_bin2bn(input_reverse, length, &x); - BN_mod_exp(&y, &x, &exp, &mod, ctx); -- - output_length = BN_bn2bin(&y, output); -+#endif - crypto_reverse(output, output_length); - - if (output_length < (int) key_length) - memset(output + output_length, 0, key_length - output_length); - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ BN_free(y); -+ BN_clear_free(x); -+ BN_free(exp); -+ BN_free(mod); -+#else - BN_free(&y); - BN_clear_free(&x); - BN_free(&exp); - BN_free(&mod); -+#endif - BN_CTX_free(ctx); - - out_free_input_reverse: diff --git a/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c b/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c deleted file mode 100644 index 544f0ab3064c..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c +++ /dev/null @@ -1,47 +0,0 @@ ---- libfreerdp/crypto/opensslcompat.c.orig 2018-11-15 22:42:44 UTC -+++ libfreerdp/crypto/opensslcompat.c -@@ -0,0 +1,44 @@ -+/** -+ * FreeRDP: A Remote Desktop Protocol Implementation -+ * OpenSSL Compatibility -+ * -+ * Copyright (C) 2016 Norbert Federa <norbert.federa@thincast.com> -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "opensslcompat.h" -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+BIO_METHOD* BIO_meth_new(int type, const char* name) -+{ -+ BIO_METHOD* m; -+ if (!(m = calloc(1, sizeof(BIO_METHOD)))) -+ return NULL; -+ m->type = type; -+ m->name = name; -+ return m; -+} -+ -+void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d) -+{ -+ if (n != NULL) -+ *n = r->n; -+ if (e != NULL) -+ *e = r->e; -+ if (d != NULL) -+ *d = r->d; -+} -+ -+#endif /* OPENSSL < 1.1.0 */ diff --git a/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h b/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h deleted file mode 100644 index f2ddc9e9a6b7..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h +++ /dev/null @@ -1,64 +0,0 @@ ---- libfreerdp/crypto/opensslcompat.h.orig 2018-11-15 22:42:46 UTC -+++ libfreerdp/crypto/opensslcompat.h -@@ -0,0 +1,61 @@ -+/** -+ * FreeRDP: A Remote Desktop Protocol Implementation -+ * OpenSSL Compatibility -+ * -+ * Copyright (C) 2016 Norbert Federa <norbert.federa@thincast.com> -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef FREERDP_CRYPTO_OPENSSLCOMPAT_H -+#define FREERDP_CRYPTO_OPENSSLCOMPAT_H -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include <freerdp/api.h> -+ -+#include <openssl/opensslv.h> -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include <openssl/bio.h> -+#include <openssl/rsa.h> -+#include <openssl/bn.h> -+ -+#define BIO_get_data(b) (b)->ptr -+#define BIO_set_data(b,v) (b)->ptr = v -+#define BIO_get_init(b) (b)->init -+#define BIO_set_init(b,v) (b)->init = v -+#define BIO_get_next(b,v) (b)->next_bio -+#define BIO_set_next(b,v) (b)->next_bio = v -+#define BIO_get_shutdown(b) (b)->shutdown -+#define BIO_set_shutdown(b,v) (b)->shutdown = v -+#define BIO_get_retry_reason(b) (b)->retry_reason -+#define BIO_set_retry_reason(b,v) (b)->retry_reason = v -+ -+#define BIO_meth_set_write(b,f) (b)->bwrite = (f) -+#define BIO_meth_set_read(b,f) (b)->bread = (f) -+#define BIO_meth_set_puts(b,f) (b)->bputs = (f) -+#define BIO_meth_set_gets(b,f) (b)->bgets = (f) -+#define BIO_meth_set_ctrl(b,f) (b)->ctrl = (f) -+#define BIO_meth_set_create(b,f) (b)->create = (f) -+#define BIO_meth_set_destroy(b,f) (b)->destroy = (f) -+#define BIO_meth_set_callback_ctrl(b,f) (b)->callback_ctrl = (f) -+ -+BIO_METHOD* BIO_meth_new(int type, const char* name); -+void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d); -+ -+#endif /* OPENSSL < 1.1.0 */ -+#endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */ diff --git a/net/freerdp1/files/patch-libfreerdp_crypto_tls.c b/net/freerdp1/files/patch-libfreerdp_crypto_tls.c deleted file mode 100644 index 12340a8ae2d6..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_crypto_tls.c +++ /dev/null @@ -1,396 +0,0 @@ ---- libfreerdp/crypto/tls.c.orig 2014-09-11 22:46:32 UTC -+++ libfreerdp/crypto/tls.c -@@ -34,6 +34,7 @@ - #include <freerdp/utils/debug.h> - #include <freerdp/crypto/tls.h> - #include "../core/tcp.h" -+#include "opensslcompat.h" - - #ifdef HAVE_POLL_H - #include <poll.h> -@@ -55,7 +56,7 @@ static int bio_rdp_tls_write(BIO* bio, const char* buf - { - int error; - int status; -- BIO_RDP_TLS* tls = (BIO_RDP_TLS*) bio->ptr; -+ BIO_RDP_TLS* tls = (BIO_RDP_TLS*) BIO_get_data(bio); - - if (!buf || !tls) - return 0; -@@ -82,12 +83,12 @@ static int bio_rdp_tls_write(BIO* bio, const char* buf - - case SSL_ERROR_WANT_X509_LOOKUP: - BIO_set_flags(bio, BIO_FLAGS_IO_SPECIAL); -- bio->retry_reason = BIO_RR_SSL_X509_LOOKUP; -+ BIO_set_retry_reason(bio, BIO_RR_SSL_X509_LOOKUP); - break; - - case SSL_ERROR_WANT_CONNECT: - BIO_set_flags(bio, BIO_FLAGS_IO_SPECIAL); -- bio->retry_reason = BIO_RR_CONNECT; -+ BIO_set_retry_reason(bio, BIO_RR_CONNECT); - break; - - case SSL_ERROR_SYSCALL: -@@ -116,7 +117,7 @@ static int bio_rdp_tls_read(BIO* bio, char* buf, int s - { - int error; - int status; -- BIO_RDP_TLS* tls = (BIO_RDP_TLS*) bio->ptr; -+ BIO_RDP_TLS* tls = (BIO_RDP_TLS*) BIO_get_data(bio); - - if (!buf || !tls) - return 0; -@@ -143,17 +144,17 @@ static int bio_rdp_tls_read(BIO* bio, char* buf, int s - - case SSL_ERROR_WANT_X509_LOOKUP: - BIO_set_flags(bio, BIO_FLAGS_IO_SPECIAL); -- bio->retry_reason = BIO_RR_SSL_X509_LOOKUP; -+ BIO_set_retry_reason(bio, BIO_RR_SSL_X509_LOOKUP); - break; - - case SSL_ERROR_WANT_ACCEPT: - BIO_set_flags(bio, BIO_FLAGS_IO_SPECIAL); -- bio->retry_reason = BIO_RR_ACCEPT; -+ BIO_set_retry_reason(bio, BIO_RR_ACCEPT); - break; - - case SSL_ERROR_WANT_CONNECT: - BIO_set_flags(bio, BIO_FLAGS_IO_SPECIAL); -- bio->retry_reason = BIO_RR_CONNECT; -+ BIO_set_retry_reason(bio, BIO_RR_CONNECT); - break; - - case SSL_ERROR_SSL: -@@ -203,9 +204,11 @@ static int bio_rdp_tls_gets(BIO* bio, char* str, int s - - static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr) - { -- BIO* rbio; -+ BIO* ssl_rbio; -+ BIO* ssl_wbio; -+ BIO* next_bio; - int status = -1; -- BIO_RDP_TLS* tls = (BIO_RDP_TLS*) bio->ptr; -+ BIO_RDP_TLS* tls = (BIO_RDP_TLS*) BIO_get_data(bio); - - if (!tls) - return 0; -@@ -213,28 +216,32 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n - if (!tls->ssl && (cmd != BIO_C_SET_SSL)) - return 0; - -+ next_bio = BIO_next(bio); -+ ssl_rbio = tls->ssl ? SSL_get_rbio(tls->ssl) : NULL; -+ ssl_wbio = tls->ssl ? SSL_get_wbio(tls->ssl) : NULL; -+ - switch (cmd) - { - case BIO_CTRL_RESET: - SSL_shutdown(tls->ssl); - -- if (tls->ssl->handshake_func == tls->ssl->method->ssl_connect) -+ if (SSL_in_connect_init(tls->ssl)) - SSL_set_connect_state(tls->ssl); -- else if (tls->ssl->handshake_func == tls->ssl->method->ssl_accept) -+ else if (SSL_in_accept_init(tls->ssl)) - SSL_set_accept_state(tls->ssl); - - SSL_clear(tls->ssl); - -- if (bio->next_bio) -- status = BIO_ctrl(bio->next_bio, cmd, num, ptr); -- else if (tls->ssl->rbio) -- status = BIO_ctrl(tls->ssl->rbio, cmd, num, ptr); -+ if (next_bio) -+ status = BIO_ctrl(next_bio, cmd, num, ptr); -+ else if (ssl_rbio) -+ status = BIO_ctrl(ssl_rbio, cmd, num, ptr); - else - status = 1; - break; - - case BIO_C_GET_FD: -- status = BIO_ctrl(tls->ssl->rbio, cmd, num, ptr); -+ status = BIO_ctrl(ssl_rbio, cmd, num, ptr); - break; - - case BIO_CTRL_INFO: -@@ -259,36 +266,41 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n - break; - - case BIO_CTRL_GET_CLOSE: -- status = bio->shutdown; -+ status = BIO_get_shutdown(bio); - break; - - case BIO_CTRL_SET_CLOSE: -- bio->shutdown = (int) num; -+ BIO_set_shutdown(bio, (int) num); - status = 1; - break; - - case BIO_CTRL_WPENDING: -- status = BIO_ctrl(tls->ssl->wbio, cmd, num, ptr); -+ status = BIO_ctrl(ssl_wbio, cmd, num, ptr); - break; - - case BIO_CTRL_PENDING: - status = SSL_pending(tls->ssl); - if (status == 0) -- status = BIO_pending(tls->ssl->rbio); -+ status = BIO_pending(ssl_rbio); - break; - - case BIO_CTRL_FLUSH: - BIO_clear_retry_flags(bio); -- status = BIO_ctrl(tls->ssl->wbio, cmd, num, ptr); -+ status = BIO_ctrl(ssl_wbio, cmd, num, ptr); - BIO_copy_next_retry(bio); - status = 1; - break; - - case BIO_CTRL_PUSH: -- if (bio->next_bio && (bio->next_bio != tls->ssl->rbio)) -+ if (next_bio && (next_bio != ssl_rbio)) - { -- SSL_set_bio(tls->ssl, bio->next_bio, bio->next_bio); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ SSL_set_bio(tls->ssl, next_bio, next_bio); - CRYPTO_add(&(bio->next_bio->references), 1, CRYPTO_LOCK_BIO); -+#else -+ BIO_up_ref(next_bio); -+ SSL_set_bio(tls->ssl, next_bio, next_bio); -+#endif - } - status = 1; - break; -@@ -296,13 +308,17 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n - case BIO_CTRL_POP: - if (bio == ptr) - { -- if (tls->ssl->rbio != tls->ssl->wbio) -- BIO_free_all(tls->ssl->wbio); -+ if (ssl_rbio != ssl_wbio) -+ BIO_free_all(ssl_wbio); - -- if (bio->next_bio) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ if (next_bio) - CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO); - - tls->ssl->wbio = tls->ssl->rbio = NULL; -+#else -+ SSL_set_bio(tls->ssl, NULL, NULL); -+#endif - } - status = 1; - break; -@@ -316,29 +332,34 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n - break; - - case BIO_C_SET_SSL: -- bio->shutdown = (int) num; -+ BIO_set_shutdown(bio, (int) num); - -- if (ptr) -+ if (ptr) { - tls->ssl = (SSL*) ptr; -+ ssl_rbio = SSL_get_rbio(tls->ssl); -+ ssl_wbio = SSL_get_wbio(tls->ssl); -+ } - -- rbio = SSL_get_rbio(tls->ssl); -- -- if (rbio) -+ if (ssl_rbio) - { -- if (bio->next_bio) -- BIO_push(rbio, bio->next_bio); -+ if (next_bio) -+ BIO_push(ssl_rbio, next_bio); - -- bio->next_bio = rbio; -- CRYPTO_add(&(rbio->references), 1, CRYPTO_LOCK_BIO); -+ BIO_set_next(bio, ssl_rbio); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ CRYPTO_add(&(ssl_rbio->references), 1, CRYPTO_LOCK_BIO); -+#else -+ BIO_up_ref(ssl_rbio); -+#endif - } - -- bio->init = 1; -+ BIO_set_init(bio, 1); - status = 1; - break; - - case BIO_C_DO_STATE_MACHINE: - BIO_clear_flags(bio, BIO_FLAGS_READ | BIO_FLAGS_WRITE | BIO_FLAGS_IO_SPECIAL); -- bio->retry_reason = 0; -+ BIO_set_retry_reason(bio, 0); - - status = SSL_do_handshake(tls->ssl); - -@@ -356,7 +377,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n - - case SSL_ERROR_WANT_CONNECT: - BIO_set_flags(bio, BIO_FLAGS_IO_SPECIAL | BIO_FLAGS_SHOULD_RETRY); -- bio->retry_reason = bio->next_bio->retry_reason; -+ BIO_set_retry_reason(bio, BIO_get_retry_reason(next_bio)); - break; - - default: -@@ -367,7 +388,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long n - break; - - default: -- status = BIO_ctrl(tls->ssl->rbio, cmd, num, ptr); -+ status = BIO_ctrl(ssl_rbio, cmd, num, ptr); - break; - } - -@@ -378,17 +399,16 @@ static int bio_rdp_tls_new(BIO* bio) - { - BIO_RDP_TLS* tls; - -- bio->init = 0; -- bio->num = 0; -- bio->flags = BIO_FLAGS_SHOULD_RETRY; -- bio->next_bio = NULL; -+ BIO_set_init(bio, 0); -+ BIO_set_data(bio, 0); -+ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); - - tls = calloc(1, sizeof(BIO_RDP_TLS)); - - if (!tls) - return 0; - -- bio->ptr = (void*) tls; -+ BIO_set_data(bio, (void*) tls); - - return 1; - } -@@ -400,21 +420,21 @@ static int bio_rdp_tls_free(BIO* bio) - if (!bio) - return 0; - -- tls = (BIO_RDP_TLS*) bio->ptr; -+ tls = (BIO_RDP_TLS*) BIO_get_data(bio); - - if (!tls) - return 0; - -- if (bio->shutdown) -+ if (BIO_get_shutdown(bio)) - { -- if (bio->init && tls->ssl) -+ if (BIO_get_init(bio) && tls->ssl) - { - SSL_shutdown(tls->ssl); - SSL_free(tls->ssl); - } - -- bio->init = 0; -- bio->flags = 0; -+ BIO_set_init(bio, 0); -+ BIO_set_flags(bio, 0); - } - - free(tls); -@@ -430,7 +450,7 @@ static long bio_rdp_tls_callback_ctrl(BIO* bio, int cm - if (!bio) - return 0; - -- tls = (BIO_RDP_TLS*) bio->ptr; -+ tls = (BIO_RDP_TLS*) BIO_get_data(bio); - - if (!tls) - return 0; -@@ -443,7 +463,7 @@ static long bio_rdp_tls_callback_ctrl(BIO* bio, int cm - break; - - default: -- status = BIO_callback_ctrl(tls->ssl->rbio, cmd, fp); -+ status = BIO_callback_ctrl(SSL_get_rbio(tls->ssl), cmd, fp); - break; - } - -@@ -452,23 +472,26 @@ static long bio_rdp_tls_callback_ctrl(BIO* bio, int cm - - #define BIO_TYPE_RDP_TLS 68 - --static BIO_METHOD bio_rdp_tls_methods = --{ -- BIO_TYPE_RDP_TLS, -- "RdpTls", -- bio_rdp_tls_write, -- bio_rdp_tls_read, -- bio_rdp_tls_puts, -- bio_rdp_tls_gets, -- bio_rdp_tls_ctrl, -- bio_rdp_tls_new, -- bio_rdp_tls_free, -- bio_rdp_tls_callback_ctrl, --}; -- - BIO_METHOD* BIO_s_rdp_tls(void) - { -- return &bio_rdp_tls_methods; -+ static BIO_METHOD* bio_methods = NULL; -+ -+ if (bio_methods == NULL) -+ { -+ if (!(bio_methods = BIO_meth_new(BIO_TYPE_RDP_TLS, "RdpTls"))) -+ return NULL; -+ -+ BIO_meth_set_write(bio_methods, bio_rdp_tls_write); -+ BIO_meth_set_read(bio_methods, bio_rdp_tls_read); -+ BIO_meth_set_puts(bio_methods, bio_rdp_tls_puts); -+ BIO_meth_set_gets(bio_methods, bio_rdp_tls_gets); -+ BIO_meth_set_ctrl(bio_methods, bio_rdp_tls_ctrl); -+ BIO_meth_set_create(bio_methods, bio_rdp_tls_new); -+ BIO_meth_set_destroy(bio_methods, bio_rdp_tls_free); -+ BIO_meth_set_callback_ctrl(bio_methods, bio_rdp_tls_callback_ctrl); -+ } -+ -+ return bio_methods; - } - - BIO* BIO_new_rdp_tls(SSL_CTX* ctx, int client) -@@ -825,6 +848,8 @@ BOOL tls_disconnect(rdpTls* tls) - if (!tls->ssl) - return TRUE; - -+ /* Not functional with newer OpenSSL */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY) - { - /** -@@ -855,6 +880,7 @@ BOOL tls_disconnect(rdpTls* tls) - { - SSL_shutdown(tls->ssl); - } -+#endif - - return TRUE; - } -@@ -868,7 +894,7 @@ BIO *findBufferedBio(BIO *front) - { - if (BIO_method_type(ret) == BIO_TYPE_BUFFERED) - return ret; -- ret = ret->next_bio; -+ ret = BIO_next(ret); - } - - return ret; -@@ -896,7 +922,7 @@ int tls_write_all(rdpTls* tls, const BYTE* data, int l - return -1; - } - -- tcp = (rdpTcp*) bufferedBio->ptr; -+ tcp = (rdpTcp*) BIO_get_data(bufferedBio); - - do - { diff --git a/net/freerdp1/files/patch-libfreerdp_locale_timezone.c b/net/freerdp1/files/patch-libfreerdp_locale_timezone.c deleted file mode 100644 index c0d3ddfeac05..000000000000 --- a/net/freerdp1/files/patch-libfreerdp_locale_timezone.c +++ /dev/null @@ -1,33 +0,0 @@ -From f5dbe2c9a5fe050c1d7e014d3c1529befb8eea3b Mon Sep 17 00:00:00 2001 -From: ivan-83 <rozhuk.im@gmail.com> -Date: Tue, 10 Mar 2015 04:40:47 +0300 -Subject: [PATCH] * FreeBSD timezone detection patch - ---- libfreerdp/locale/timezone.c.orig 2014-09-11 22:46:32 UTC -+++ libfreerdp/locale/timezone.c -@@ -1507,8 +1507,11 @@ char* freerdp_get_unix_timezone_identifi - return tzid; - } - -+#ifdef __FreeBSD__ -+ fp = fopen("/var/db/zoneinfo", "r"); -+#else - fp = fopen("/etc/timezone", "r"); -- -+#endif - if (fp != NULL) - { - fseek(fp, 0, SEEK_END); -@@ -1664,8 +1667,10 @@ void freerdp_time_zone_detect(TIME_ZONE_ - - #ifdef HAVE_TM_GMTOFF - #if defined(__FreeBSD__) -- /*not the best solution, but could not get the right tyepcast*/ -- clientTimeZone->bias = 0; -+ if (local_time->tm_gmtoff >= 0) -+ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60); -+ else -+ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60)); - #else - clientTimeZone->bias = timezone / 60; - #endif diff --git a/net/freerdp1/files/patch-winpr.pc.in b/net/freerdp1/files/patch-winpr.pc.in deleted file mode 100644 index 167fdcf83f74..000000000000 --- a/net/freerdp1/files/patch-winpr.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -Index: winpr.pc.in ---- winpr.pc.in.orig 2014-09-11 22:46:32 UTC -+++ winpr.pc.in -@@ -9,7 +9,7 @@ Description: WinPR: Windows Portable Run - URL: http://www.freerdp.com/ - Version: @WINPR_VERSION_FULL@ - Requires: --Requires.private: zlib libssl -+Requires.private: zlib - Libs: -L${libdir} ${libs} - Libs.private: -ldl -lrt -lm -lpthread - Cflags: -I${includedir} diff --git a/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.c b/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.c deleted file mode 100644 index e95843135763..000000000000 --- a/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.c +++ /dev/null @@ -1,57 +0,0 @@ ---- winpr/libwinpr/crypto/crypto.c.orig 2018-11-06 02:41:23 UTC -+++ winpr/libwinpr/crypto/crypto.c -@@ -177,20 +177,37 @@ BOOL CryptProtectMemory(LPVOID pData, DWORD cbData, DW - - SecureZeroMemory(randomKey, sizeof(randomKey)); - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ pMemBlock->enc = EVP_CIPHER_CTX_new(); -+ pMemBlock->dec = EVP_CIPHER_CTX_new(); -+ -+ EVP_CIPHER_CTX_init(pMemBlock->enc); -+ EVP_EncryptInit_ex(pMemBlock->enc, EVP_aes_256_cbc(), NULL, pMemBlock->key, pMemBlock->iv); -+ -+ EVP_CIPHER_CTX_init(pMemBlock->dec); -+ EVP_DecryptInit_ex(pMemBlock->dec, EVP_aes_256_cbc(), NULL, pMemBlock->key, pMemBlock->iv); -+#else - EVP_CIPHER_CTX_init(&(pMemBlock->enc)); - EVP_EncryptInit_ex(&(pMemBlock->enc), EVP_aes_256_cbc(), NULL, pMemBlock->key, pMemBlock->iv); - - EVP_CIPHER_CTX_init(&(pMemBlock->dec)); - EVP_DecryptInit_ex(&(pMemBlock->dec), EVP_aes_256_cbc(), NULL, pMemBlock->key, pMemBlock->iv); -+#endif - - /* AES Encryption */ - - cbOut = pMemBlock->cbData + AES_BLOCK_SIZE - 1; - pCipherText = (BYTE*) malloc(cbOut); - -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_EncryptInit_ex(pMemBlock->enc, NULL, NULL, NULL, NULL); -+ EVP_EncryptUpdate(pMemBlock->enc, pCipherText, &cbOut, pMemBlock->pData, pMemBlock->cbData); -+ EVP_EncryptFinal_ex(pMemBlock->enc, pCipherText + cbOut, &cbFinal); -+#else - EVP_EncryptInit_ex(&(pMemBlock->enc), NULL, NULL, NULL, NULL); - EVP_EncryptUpdate(&(pMemBlock->enc), pCipherText, &cbOut, pMemBlock->pData, pMemBlock->cbData); - EVP_EncryptFinal_ex(&(pMemBlock->enc), pCipherText + cbOut, &cbFinal); -+#endif - - CopyMemory(pMemBlock->pData, pCipherText, pMemBlock->cbData); - free(pCipherText); -@@ -233,9 +250,15 @@ BOOL CryptUnprotectMemory(LPVOID pData, DWORD cbData, - ListDictionary_Remove(g_ProtectedMemoryBlocks, pData); - - /* AES Cleanup */ -- -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX_cleanup(pMemBlock->enc); -+ EVP_CIPHER_CTX_cleanup(pMemBlock->dec); -+ EVP_CIPHER_CTX_free(pMemBlock->enc); -+ EVP_CIPHER_CTX_free(pMemBlock->dec); -+#else - EVP_CIPHER_CTX_cleanup(&(pMemBlock->enc)); - EVP_CIPHER_CTX_cleanup(&(pMemBlock->dec)); -+#endif - - free(pMemBlock); - diff --git a/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.h b/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.h deleted file mode 100644 index 4130effdd5cc..000000000000 --- a/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.h +++ /dev/null @@ -1,16 +0,0 @@ ---- winpr/libwinpr/crypto/crypto.h.orig 2018-11-06 02:39:40 UTC -+++ winpr/libwinpr/crypto/crypto.h -@@ -41,8 +41,13 @@ struct _WINPR_PROTECTED_MEMORY_BLOCK - BYTE key[32]; - BYTE iv[32]; - BYTE salt[8]; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ EVP_CIPHER_CTX *enc; -+ EVP_CIPHER_CTX *dec; -+#else - EVP_CIPHER_CTX enc; - EVP_CIPHER_CTX dec; -+#endif - }; - typedef struct _WINPR_PROTECTED_MEMORY_BLOCK WINPR_PROTECTED_MEMORY_BLOCK; - diff --git a/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm.c b/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm.c deleted file mode 100644 index 30fcadc2ba11..000000000000 --- a/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm.c +++ /dev/null @@ -1,70 +0,0 @@ ---- winpr/libwinpr/sspi/NTLM/ntlm.c.orig 2014-09-11 22:46:32 UTC -+++ winpr/libwinpr/sspi/NTLM/ntlm.c -@@ -793,7 +793,11 @@ SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHan - int length; - void* data; - UINT32 SeqNo; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_CTX *hmac; -+#else - HMAC_CTX hmac; -+#endif - BYTE digest[16]; - BYTE checksum[8]; - BYTE* signature; -@@ -827,12 +831,21 @@ SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHan - - CopyMemory(data, data_buffer->pvBuffer, length); - /* Compute the HMAC-MD5 hash of ConcatenationOf(seq_num,data) using the client signing key */ -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ hmac = HMAC_CTX_new(); -+ HMAC_Init_ex(hmac, context->SendSigningKey, 16, EVP_md5(), NULL); -+ HMAC_Update(hmac, (void*) &(SeqNo), 4); -+ HMAC_Update(hmac, (void*) data, length); -+ HMAC_Final(hmac, digest, NULL); -+ HMAC_CTX_free(hmac); -+#else - HMAC_CTX_init(&hmac); - HMAC_Init_ex(&hmac, context->SendSigningKey, 16, EVP_md5(), NULL); - HMAC_Update(&hmac, (void*) &(SeqNo), 4); - HMAC_Update(&hmac, (void*) data, length); - HMAC_Final(&hmac, digest, NULL); - HMAC_CTX_cleanup(&hmac); -+#endif - - /* Encrypt message using with RC4, result overwrites original buffer */ - -@@ -869,7 +882,11 @@ SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHan - int length; - void* data; - UINT32 SeqNo; -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_CTX *hmac; -+#else - HMAC_CTX hmac; -+#endif - BYTE digest[16]; - BYTE checksum[8]; - UINT32 version = 1; -@@ -911,12 +928,21 @@ SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHan - CopyMemory(data_buffer->pvBuffer, data, length); - - /* Compute the HMAC-MD5 hash of ConcatenationOf(seq_num,data) using the client signing key */ -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ hmac = HMAC_CTX_new(); -+ HMAC_Init_ex(hmac, context->RecvSigningKey, 16, EVP_md5(), NULL); -+ HMAC_Update(hmac, (void*) &(SeqNo), 4); -+ HMAC_Update(hmac, (void*) data_buffer->pvBuffer, data_buffer->cbBuffer); -+ HMAC_Final(hmac, digest, NULL); -+ HMAC_CTX_free(hmac); -+#else - HMAC_CTX_init(&hmac); - HMAC_Init_ex(&hmac, context->RecvSigningKey, 16, EVP_md5(), NULL); - HMAC_Update(&hmac, (void*) &(SeqNo), 4); - HMAC_Update(&hmac, (void*) data_buffer->pvBuffer, data_buffer->cbBuffer); - HMAC_Final(&hmac, digest, NULL); - HMAC_CTX_cleanup(&hmac); -+#endif - #ifdef WITH_DEBUG_NTLM - WLog_DBG(TAG, "Encrypted Data Buffer (length = %d)", length); - winpr_HexDump(TAG, WLOG_DEBUG, data, length); diff --git a/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm__compute.c b/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm__compute.c deleted file mode 100644 index 1929176be9dc..000000000000 --- a/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm__compute.c +++ /dev/null @@ -1,34 +0,0 @@ ---- winpr/libwinpr/sspi/NTLM/ntlm_compute.c.orig 2014-09-11 22:46:32 UTC -+++ winpr/libwinpr/sspi/NTLM/ntlm_compute.c -@@ -673,11 +673,24 @@ void ntlm_init_rc4_seal_states(NTLM_CONTEXT* context) - - void ntlm_compute_message_integrity_check(NTLM_CONTEXT* context) - { -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ HMAC_CTX *hmac_ctx; -+#else - HMAC_CTX hmac_ctx; -+#endif - /* - * Compute the HMAC-MD5 hash of ConcatenationOf(NEGOTIATE_MESSAGE, - * CHALLENGE_MESSAGE, AUTHENTICATE_MESSAGE) using the ExportedSessionKey - */ -+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL -+ hmac_ctx = HMAC_CTX_new(); -+ HMAC_Init_ex(hmac_ctx, context->ExportedSessionKey, 16, EVP_md5(), NULL); -+ HMAC_Update(hmac_ctx, (BYTE*) context->NegotiateMessage.pvBuffer, context->NegotiateMessage.cbBuffer); -+ HMAC_Update(hmac_ctx, (BYTE*) context->ChallengeMessage.pvBuffer, context->ChallengeMessage.cbBuffer); -+ HMAC_Update(hmac_ctx, (BYTE*) context->AuthenticateMessage.pvBuffer, context->AuthenticateMessage.cbBuffer); -+ HMAC_Final(hmac_ctx, context->MessageIntegrityCheck, NULL); -+ HMAC_CTX_free(hmac_ctx); -+#else - HMAC_CTX_init(&hmac_ctx); - HMAC_Init_ex(&hmac_ctx, context->ExportedSessionKey, 16, EVP_md5(), NULL); - HMAC_Update(&hmac_ctx, (BYTE*) context->NegotiateMessage.pvBuffer, context->NegotiateMessage.cbBuffer); -@@ -685,5 +698,6 @@ void ntlm_compute_message_integrity_check(NTLM_CONTEXT - HMAC_Update(&hmac_ctx, (BYTE*) context->AuthenticateMessage.pvBuffer, context->AuthenticateMessage.cbBuffer); - HMAC_Final(&hmac_ctx, context->MessageIntegrityCheck, NULL); - HMAC_CTX_cleanup(&hmac_ctx); -+#endif - } - diff --git a/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt b/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt deleted file mode 100644 index eab2a404c7e7..000000000000 --- a/net/freerdp1/files/patch-winpr_tools_hash_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- winpr/tools/hash/CMakeLists.txt.orig 2016-12-04 14:51:44 UTC -+++ winpr/tools/hash/CMakeLists.txt -@@ -29,7 +29,7 @@ add_executable(${MODULE_NAME} ${${MODULE - set(${MODULE_PREFIX}_LIBS - ${ZLIB_LIBRARIES} - ${OPENSSL_LIBRARIES} -- winpr) -+ winpr1) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - diff --git a/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt b/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt deleted file mode 100644 index 358a324fe39e..000000000000 --- a/net/freerdp1/files/patch-winpr_tools_makecert_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- winpr/tools/makecert/CMakeLists.txt.orig 2016-12-04 14:56:48 UTC -+++ winpr/tools/makecert/CMakeLists.txt -@@ -28,7 +28,7 @@ add_library(${MODULE_NAME} STATIC ${${MO - set(${MODULE_PREFIX}_LIBS - ${ZLIB_LIBRARIES} - ${OPENSSL_LIBRARIES} -- winpr) -+ winpr1) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - diff --git a/net/freerdp1/files/patch-winpr_tools_makecert_makecert.c b/net/freerdp1/files/patch-winpr_tools_makecert_makecert.c deleted file mode 100644 index e479fa8ef071..000000000000 --- a/net/freerdp1/files/patch-winpr_tools_makecert_makecert.c +++ /dev/null @@ -1,18 +0,0 @@ ---- winpr/tools/makecert/makecert.c.orig 2018-11-06 05:00:05 UTC -+++ winpr/tools/makecert/makecert.c -@@ -27,6 +27,7 @@ - #include <winpr/cmdline.h> - #include <winpr/sysinfo.h> - -+#include <openssl/crypto.h> - #include <openssl/conf.h> - #include <openssl/pem.h> - #include <openssl/err.h> -@@ -757,7 +758,6 @@ void makecert_context_free(MAKECERT_CONTEXT* context) - - CRYPTO_cleanup_all_ex_data(); - -- CRYPTO_mem_leaks(context->bio); - BIO_free(context->bio); - - free(context); diff --git a/net/freerdp1/pkg-descr b/net/freerdp1/pkg-descr deleted file mode 100644 index c40b0cc19a5c..000000000000 --- a/net/freerdp1/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), -released under the Apache license. Enjoy the freedom of using your -software wherever you want, the way you want it, in a world where -interoperability can finally liberate your computing experience. - -WWW: http://www.freerdp.com/ diff --git a/net/freerdp1/pkg-plist b/net/freerdp1/pkg-plist deleted file mode 100644 index 9f65d19515c9..000000000000 --- a/net/freerdp1/pkg-plist +++ /dev/null @@ -1,247 +0,0 @@ -%%X11%%bin/xfreerdp1 -include/freerdp/addin.h -include/freerdp/altsec.h -include/freerdp/api.h -include/freerdp/assistance.h -include/freerdp/cache/bitmap.h -include/freerdp/cache/brush.h -include/freerdp/cache/cache.h -include/freerdp/cache/glyph.h -include/freerdp/cache/nine_grid.h -include/freerdp/cache/offscreen.h -include/freerdp/cache/palette.h -include/freerdp/cache/pointer.h -include/freerdp/channels/audin.h -include/freerdp/channels/channels.h -include/freerdp/channels/cliprdr.h -include/freerdp/channels/encomsp.h -include/freerdp/channels/log.h -include/freerdp/channels/rail.h -include/freerdp/channels/rdpdr.h -include/freerdp/channels/rdpgfx.h -include/freerdp/channels/rdpsnd.h -include/freerdp/channels/remdesk.h -include/freerdp/channels/tsmf.h -include/freerdp/channels/wtsvc.h -include/freerdp/client.h -include/freerdp/client/audin.h -include/freerdp/client/channels.h -include/freerdp/client/cliprdr.h -include/freerdp/client/cmdline.h -include/freerdp/client/disp.h -include/freerdp/client/drdynvc.h -include/freerdp/client/encomsp.h -include/freerdp/client/file.h -include/freerdp/client/rail.h -include/freerdp/client/rdpei.h -include/freerdp/client/rdpgfx.h -include/freerdp/client/rdpsnd.h -include/freerdp/client/remdesk.h -include/freerdp/client/tsmf.h -include/freerdp/codec/audio.h -include/freerdp/codec/bitmap.h -include/freerdp/codec/bulk.h -include/freerdp/codec/clear.h -include/freerdp/codec/color.h -include/freerdp/codec/dsp.h -include/freerdp/codec/h264.h -include/freerdp/codec/interleaved.h -include/freerdp/codec/jpeg.h -include/freerdp/codec/mppc.h -include/freerdp/codec/ncrush.h -include/freerdp/codec/nsc.h -include/freerdp/codec/planar.h -include/freerdp/codec/progressive.h -include/freerdp/codec/region.h -include/freerdp/codec/rfx.h -include/freerdp/codec/xcrush.h -include/freerdp/codec/zgfx.h -include/freerdp/codecs.h -include/freerdp/constants.h -include/freerdp/crypto/ber.h -include/freerdp/crypto/certificate.h -include/freerdp/crypto/crypto.h -include/freerdp/crypto/der.h -include/freerdp/crypto/er.h -include/freerdp/crypto/per.h -include/freerdp/crypto/tls.h -include/freerdp/dvc.h -include/freerdp/error.h -include/freerdp/event.h -include/freerdp/extension.h -include/freerdp/freerdp.h -include/freerdp/gdi/16bpp.h -include/freerdp/gdi/32bpp.h -include/freerdp/gdi/8bpp.h -include/freerdp/gdi/bitmap.h -include/freerdp/gdi/brush.h -include/freerdp/gdi/clipping.h -include/freerdp/gdi/dc.h -include/freerdp/gdi/drawing.h -include/freerdp/gdi/gdi.h -include/freerdp/gdi/line.h -include/freerdp/gdi/palette.h -include/freerdp/gdi/pen.h -include/freerdp/gdi/region.h -include/freerdp/gdi/shape.h -include/freerdp/graphics.h -include/freerdp/input.h -include/freerdp/listener.h -include/freerdp/locale/keyboard.h -include/freerdp/locale/locale.h -include/freerdp/locale/timezone.h -include/freerdp/log.h -include/freerdp/message.h -include/freerdp/metrics.h -include/freerdp/peer.h -include/freerdp/pointer.h -include/freerdp/primary.h -include/freerdp/primitives.h -include/freerdp/rail.h -include/freerdp/rail/icon.h -include/freerdp/rail/rail.h -include/freerdp/rail/window.h -include/freerdp/rail/window_list.h -include/freerdp/scancode.h -include/freerdp/secondary.h -include/freerdp/server/audin.h -include/freerdp/server/channels.h -include/freerdp/server/cliprdr.h -include/freerdp/server/drdynvc.h -include/freerdp/server/echo.h -include/freerdp/server/encomsp.h -include/freerdp/server/rdpdr.h -include/freerdp/server/rdpsnd.h -include/freerdp/server/remdesk.h -include/freerdp/server/shadow.h -include/freerdp/settings.h -include/freerdp/svc.h -include/freerdp/types.h -include/freerdp/update.h -include/freerdp/utils/debug.h -include/freerdp/utils/event.h -include/freerdp/utils/msusb.h -include/freerdp/utils/passphrase.h -include/freerdp/utils/pcap.h -include/freerdp/utils/profiler.h -include/freerdp/utils/rail.h -include/freerdp/utils/ringbuffer.h -include/freerdp/utils/signal.h -include/freerdp/utils/stopwatch.h -include/freerdp/utils/svc_plugin.h -include/freerdp/utils/tcp.h -include/freerdp/utils/time.h -include/freerdp/utils/uds.h -include/freerdp/version.h -include/freerdp/window.h -include/winpr/asn1.h -include/winpr/bcrypt.h -include/winpr/bitstream.h -include/winpr/cmdline.h -include/winpr/collections.h -include/winpr/comm.h -include/winpr/credentials.h -include/winpr/credui.h -include/winpr/crt.h -include/winpr/crypto.h -include/winpr/debug.h -include/winpr/dsparse.h -include/winpr/endian.h -include/winpr/environment.h -include/winpr/error.h -include/winpr/file.h -include/winpr/handle.h -include/winpr/heap.h -include/winpr/image.h -include/winpr/ini.h -include/winpr/input.h -include/winpr/interlocked.h -include/winpr/io.h -include/winpr/library.h -include/winpr/locale.h -include/winpr/memory.h -include/winpr/midl.h -include/winpr/ndr.h -include/winpr/nt.h -include/winpr/ntlm.h -include/winpr/path.h -include/winpr/pipe.h -include/winpr/platform.h -include/winpr/pool.h -include/winpr/print.h -include/winpr/registry.h -include/winpr/rpc.h -include/winpr/sam.h -include/winpr/schannel.h -include/winpr/security.h -include/winpr/smartcard.h -include/winpr/spec.h -include/winpr/ssl.h -include/winpr/sspi.h -include/winpr/sspicli.h -include/winpr/stream.h -include/winpr/string.h -include/winpr/synch.h -include/winpr/sysinfo.h -include/winpr/tchar.h -include/winpr/thread.h -include/winpr/timezone.h -include/winpr/tools/makecert.h -include/winpr/windows.h -include/winpr/winhttp.h -include/winpr/winpr.h -include/winpr/winsock.h -include/winpr/wlog.h -include/winpr/wnd.h -include/winpr/wtsapi.h -include/winpr/wtypes.h -%%ALSA%%lib/freerdp/audin-client-alsa.a -%%PULSEAUDIO%%lib/freerdp/audin-client-pulse.a -lib/freerdp/audin-client.a -lib/freerdp/cliprdr-client.a -lib/freerdp/disp-client.a -lib/freerdp/drdynvc-client.a -lib/freerdp/drive-client.a -lib/freerdp/echo-client.a -lib/freerdp/encomsp-client.a -lib/freerdp/parallel-client.a -%%CUPS%%lib/freerdp/printer-client.a -lib/freerdp/rail-client.a -lib/freerdp/rdpdr-client.a -lib/freerdp/rdpei-client.a -lib/freerdp/rdpgfx-client.a -%%ALSA%%lib/freerdp/rdpsnd-client-alsa.a -%%PULSEAUDIO%%lib/freerdp/rdpsnd-client-pulse.a -lib/freerdp/rdpsnd-client.a -lib/freerdp/remdesk-client.a -lib/freerdp/serial-client.a -lib/freerdp/smartcard-client.a -%%ALSA%%lib/freerdp/tsmf-client-alsa-audio.a -%%FFMPEG%%lib/freerdp/tsmf-client-ffmpeg-decoder.a -%%GSTREAMER%%lib/freerdp/tsmf-client-gstreamer-decoder.a -%%PULSEAUDIO%%lib/freerdp/tsmf-client-pulse-audio.a -lib/freerdp/tsmf-client.a -lib/libfreerdp1.so -lib/libfreerdp1.so.1.2 -lib/libfreerdp1.so.1.2.0 -lib/libfreerdp1-client.so -lib/libfreerdp1-client.so.1.2 -lib/libfreerdp1-client.so.1.2.0 -lib/libwinpr1.so -lib/libwinpr1.so.1.1 -lib/libwinpr1.so.1.1.0 -lib/libwinpr-makecert-tool.a -%%X11%%lib/libxfreerdp1-client.so -%%X11%%lib/libxfreerdp1-client.so.1.2 -%%X11%%lib/libxfreerdp1-client.so.1.2.0 -libdata/pkgconfig/freerdp.pc -libdata/pkgconfig/winpr.pc -%%X11%%man/man1/xfreerdp1.1.gz -share/cmake/Modules/FreeRDP/FreeRDPConfig.cmake -share/cmake/Modules/FreeRDP/FreeRDPConfigVersion.cmake -share/cmake/Modules/FreeRDP/FreeRDPTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/Modules/FreeRDP/FreeRDPTargets.cmake -share/cmake/Modules/WinPR/WinPRConfig.cmake -share/cmake/Modules/WinPR/WinPRConfigVersion.cmake -share/cmake/Modules/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/Modules/WinPR/WinPRTargets.cmake |