From 1a125a1c98ae29ec92b338c5f3e0d6ec05f93528 Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Mon, 10 Feb 2020 23:36:06 +0300 Subject: [PATCH] net-fs: drop winexe (See: https://github.com/pentoo/pentoo-overlay/issues/550) --- net-fs/winexe/Manifest | 1 - net-fs/winexe/files/winexe-getoptstd.patch | 23 ---- net-fs/winexe/files/winexe-gnutlslowat.patch | 23 ---- net-fs/winexe/files/winexe-passthrough.patch | 120 ------------------ net-fs/winexe/winexe-1.0.0-r1.ebuild | 48 ------- net-fs/winexe/winexe-9999.ebuild | 61 --------- .../arch/arm/package.accept_keywords/exploit | 1 - profiles/pentoo/base/package.mask | 3 - 8 files changed, 280 deletions(-) delete mode 100644 net-fs/winexe/Manifest delete mode 100644 net-fs/winexe/files/winexe-getoptstd.patch delete mode 100644 net-fs/winexe/files/winexe-gnutlslowat.patch delete mode 100644 net-fs/winexe/files/winexe-passthrough.patch delete mode 100644 net-fs/winexe/winexe-1.0.0-r1.ebuild delete mode 100644 net-fs/winexe/winexe-9999.ebuild diff --git a/net-fs/winexe/Manifest b/net-fs/winexe/Manifest deleted file mode 100644 index 882f880cf..000000000 --- a/net-fs/winexe/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST winexe-1.00.tar.gz 21931368 SHA256 99238bd3e1c0637041c737c86a05bd73a9375abc9794dca71d2765e22d87537e SHA512 c640c547b7298e7b4835290b747b9086444c5c51bc25db80522f96021f1e3e86905f890ff79f13f3e1a9bf573c9df39f3c15436bc3a0fd123ed6cd615eae7696 WHIRLPOOL 84fc03e1e683dbf7272f9362acd59649643389cbe535d0d00eae4a472326fe49268f2ac7e3c2d3f307ea62b09113d5212540a89adcdcd4b17d42a3461d9bca0b diff --git a/net-fs/winexe/files/winexe-getoptstd.patch b/net-fs/winexe/files/winexe-getoptstd.patch deleted file mode 100644 index fe19b8213..000000000 --- a/net-fs/winexe/files/winexe-getoptstd.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naurp winexe-9999/source4/heimdal/cf/make-proto.pl winexe-9999/source4/heimdal/cf/make-proto.pl ---- winexe-9999/source4/heimdal/cf/make-proto.pl 2013-10-21 10:53:59.000000000 +0200 -+++ winexe-9999/source4/heimdal/cf/make-proto.pl 2013-10-21 10:55:34.000000000 +0200 -@@ -1,8 +1,8 @@ - # Make prototypes from .c files - # $Id$ - --##use Getopt::Std; --require 'getopts.pl'; -+use Getopt::Std; -+#require 'getopts.pl'; - - my $comment = 0; - my $if_0 = 0; -@@ -12,7 +12,7 @@ my $debug = 0; - my $oproto = 1; - my $private_func_re = "^_"; - --do Getopts('x:m:o:p:dqE:R:P:') || die "foo"; -+do getopts('x:m:o:p:dqE:R:P:') || die "foo"; - - if($opt_d) { - $debug = 1; diff --git a/net-fs/winexe/files/winexe-gnutlslowat.patch b/net-fs/winexe/files/winexe-gnutlslowat.patch deleted file mode 100644 index be59e3ead..000000000 --- a/net-fs/winexe/files/winexe-gnutlslowat.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naurp winexe-9999/source4/lib/tls/tls.c winexe-9999/source4/lib/tls/tls.c ---- winexe-9999/source4/lib/tls/tls.c 2013-10-21 10:53:59.000000000 +0200 -+++ winexe-9999/source4/lib/tls/tls.c 2013-10-21 10:55:45.000000000 +0200 -@@ -505,7 +505,9 @@ struct socket_context *tls_init_server(s - gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr)tls); - gnutls_transport_set_pull_function(tls->session, (gnutls_pull_func)tls_pull); - gnutls_transport_set_push_function(tls->session, (gnutls_push_func)tls_push); -+#if GNUTLS_VERSION_NUMBER < 0x020c00 - gnutls_transport_set_lowat(tls->session, 0); -+#endif - - tls->plain_chars = plain_chars; - if (plain_chars) { -@@ -574,7 +576,9 @@ struct socket_context *tls_init_client(s - gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr)tls); - gnutls_transport_set_pull_function(tls->session, (gnutls_pull_func)tls_pull); - gnutls_transport_set_push_function(tls->session, (gnutls_push_func)tls_push); -+#if GNUTLS_VERSION_NUMBER < 0x020c00 - gnutls_transport_set_lowat(tls->session, 0); -+#endif - tls->tls_detect = false; - - tls->output_pending = false; diff --git a/net-fs/winexe/files/winexe-passthrough.patch b/net-fs/winexe/files/winexe-passthrough.patch deleted file mode 100644 index ade56f463..000000000 --- a/net-fs/winexe/files/winexe-passthrough.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c -index a3182cd..cba10a0 100644 ---- a/libcli/auth/smbencrypt.c -+++ b/libcli/auth/smbencrypt.c -@@ -45,6 +45,9 @@ void SMBencrypt_hash(const uint8_t lm_hash[16], const uint8_t *c8, uint8_t p24[2 - #endif - } - -+#define SMB_HASH_LM 1 -+#define SMB_HASH_NTLM 2 -+ - /* - This implements the X/Open SMB password encryption - It takes a password ('unix' string), a 8 byte "crypt key" -@@ -63,6 +66,64 @@ bool SMBencrypt(const char *passwd, const uint8_t *c8, uint8_t p24[24]) - return ret; - } - -+/* -+ Support for using LM/NTLM hashes -- jmk@foofus.net 10/2006 -+ Greets: Foofus, Phenfen, Omi, Fizzgig, pMonkey -+*/ -+void E_set_hash(int type, unsigned char hash[16]) -+{ -+ uint l; -+ char p[1024]; -+ int i, j; -+ char HexChar; -+ int HexValue; -+ -+ if ( (getenv("SMBHASH")) && (strlen(getenv("SMBHASH")) == 65) ) -+ { -+ memset(p, 0, 1024); -+ strncpy(p, getenv("SMBHASH"), 1024); -+ -+ /* Replace "NO PASSWORD*********************" */ -+ if ((type == SMB_HASH_LM) && (strncmp(p, "N", 1) == 0)) -+ strncpy(p, "AAD3B435B51404EEAAD3B435B51404EE", 32); -+ else if ((type == SMB_HASH_NTLM) && (strncmp(p+33, "N", 1) == 0)) -+ strncpy(p+33, "31D6CFE0D16AE931B73C59D7E0C089C0", 32); -+ -+ for (i=0; i<16; i++) { -+ HexValue = 0x0; -+ for (j=0; j<2; j++) { -+ if (type == SMB_HASH_LM) -+ HexChar = (char)p[2*i+j]; -+ else -+ HexChar = (char)p[2*i+j+33]; -+ -+ if (HexChar > 0x39) -+ HexChar = HexChar | 0x20; /* convert upper case to lower */ -+ -+ if (!(((HexChar >= 0x30) && (HexChar <= 0x39))|| /* 0 - 9 */ -+ ((HexChar >= 0x61) && (HexChar <= 0x66)))) { /* a - f */ -+ fprintf(stderr, "Error invalid char (%c) for hash.\n", HexChar); -+ exit(1); -+ } -+ -+ HexChar -= 0x30; -+ if (HexChar > 0x09) /* HexChar is "a" - "f" */ -+ HexChar -= 0x27; -+ -+ HexValue = (HexValue << 4) | (char)HexChar; -+ } -+ hash[i] = (unsigned char)HexValue; -+ } -+ } -+ else -+ { -+ fprintf(stderr, "Error reading SMB HASH.\n"); -+ fprintf(stderr, "\tEx: export SMBHASH=\"_LM_HASH_:_NTLM_HASH_\"\n"); -+ exit(1); -+ } -+} -+/* jmk */ -+ - /** - * Creates the MD4 Hash of the users password in NT UNICODE. - * @param passwd password in 'unix' charset. -@@ -75,6 +136,11 @@ bool E_md4hash(const char *passwd, uint8_t p16[16]) - smb_ucs2_t *wpwd; - bool ret; - -+ /* Support for using NTLM hashes -- jmk@foofus.net 10/2006 */ -+ if ( getenv("SMBHASH") ) { -+ fprintf(stderr, "HASH PASS: Substituting user supplied NTLM HASH...\n"); -+ E_set_hash(SMB_HASH_NTLM, p16); -+ } else { - ret = push_ucs2_talloc(NULL, &wpwd, passwd, &len); - if (!ret || len < 2) { - /* We don't want to return fixed data, as most callers -@@ -88,6 +154,7 @@ bool E_md4hash(const char *passwd, uint8_t p16[16]) - - talloc_free(wpwd); - return true; -+ } - } - - /** -@@ -123,6 +190,11 @@ bool E_deshash(const char *passwd, uint8_t p16[16]) - bool ret = true; - char dospwd[256]; - ZERO_STRUCT(dospwd); -+ /* Support for using LM hashes -- jmk@foofus.net 10/2006 */ -+ if ( getenv("SMBHASH") ) { -+ fprintf(stderr, "HASH PASS: Substituting user supplied LM HASH...\n"); -+ E_set_hash(SMB_HASH_LM, p16); -+ } else { - - /* Password must be converted to DOS charset - null terminated, uppercase. */ - push_string(dospwd, passwd, sizeof(dospwd), STR_ASCII|STR_UPPER|STR_TERMINATE); -@@ -135,7 +207,7 @@ bool E_deshash(const char *passwd, uint8_t p16[16]) - } - - ZERO_STRUCT(dospwd); -- -+ } - return ret; - } - diff --git a/net-fs/winexe/winexe-1.0.0-r1.ebuild b/net-fs/winexe/winexe-1.0.0-r1.ebuild deleted file mode 100644 index 1773af92b..000000000 --- a/net-fs/winexe/winexe-1.0.0-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 - -DESCRIPTION="remotely execute commands on Windows NT/2000/XP/2003 systems, with lmhash passthrough support" -HOMEPAGE="http://sourceforge.net/projects/winexe/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}-1.00.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -DEPEND="net-libs/gnutls - dev-libs/popt - dev-libs/cyrus-sasl - sys-libs/tdb - sys-libs/zlib - sys-libs/talloc - dev-libs/libgcrypt:=" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN}-1.00 - -src_prepare() { - epatch "${FILESDIR}"/winexe-passthrough.patch - epatch "${FILESDIR}"/winexe-getoptstd.patch - epatch "${FILESDIR}"/winexe-gnutlslowat.patch -} - -src_configure() { - cd source4 - ./autogen.sh # should we be using eautoreconf really? - econf \ - --enable-fhs -} -src_compile() { - cd source4 - emake || die "compile failed" -} -src_install() { - dobin "${S}"/source4/bin/winexe -} diff --git a/net-fs/winexe/winexe-9999.ebuild b/net-fs/winexe/winexe-9999.ebuild deleted file mode 100644 index 8fc419d33..000000000 --- a/net-fs/winexe/winexe-9999.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit git-2 eutils python-single-r1 - -DESCRIPTION="remotely execute commands on Windows NT/2000/XP/2003 systems, with lmhash passthrough support" -HOMEPAGE="http://sourceforge.net/projects/winexe/" -EGIT_REPO_1="git://git.code.sf.net/p/winexe/winexe-waf" -EGIT_REPO_2="git://git.samba.org/samba.git" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE="+static" - -DEPEND="net-libs/gnutls - dev-libs/popt - dev-libs/cyrus-sasl - dev-util/mingw64-runtime - dev-libs/libbsd - !static? ( >=net-fs/samba-4.0.0 )" -RDEPEND="${DEPEND}" - -# a nasty hack to get Samba sources for the static option -src_unpack() { - EGIT_REPO_URI="${EGIT_REPO_1}" - git-2_src_unpack - - if use static; then - EGIT_SOURCEDIR="${S}/samba" - EGIT_REPO_URI="${EGIT_REPO_2}" - git-2_src_unpack - fi -} - -src_configure() { - cd source - - local myconf - if use static; then - myconf = "--samba-dir=../samba" - else - #--samba-inc-dirs=... --samba-lib-dirs=... - myconf = "--enable-shared" - fi - - ./waf configure ${myconf} -} - -src_compile() { - cd source - ./waf build -} - -src_install() { - dobin "${S}"/build/winexe-static -} diff --git a/profiles/pentoo/arch/arm/package.accept_keywords/exploit b/profiles/pentoo/arch/arm/package.accept_keywords/exploit index 3303253ce..204749f6b 100644 --- a/profiles/pentoo/arch/arm/package.accept_keywords/exploit +++ b/profiles/pentoo/arch/arm/package.accept_keywords/exploit @@ -59,7 +59,6 @@ www-apps/beef ~amd64 =dev-ruby/em-websocket-0.3.8 ** =dev-ruby/dm-core-1.2.1 ** =dev-ruby/twitter-4.8.0 ** -net-fs/winexe =net-misc/raccess-0.7 ** =www-servers/thin-1.5.1-r1 ** =dev-ruby/daemons-1.1.9 ~arm diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index 385169b08..fb405f741 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -23,9 +23,6 @@ net-wireless/madwifi-ng-tools #hopefully easy upgrade/downgrade as the gnome guys removed the middle version... =gnome-base/libgnome-keyring-3.4.1 -#the ebuild is broken and needs some love -=net-fs/winexe-9999 - #Systemd is unsupported by Pentoo sys-apps/systemd