winexe: move away from 9999 to stable, issue #204

2026-04-26 08:40:57 +02:00 · 2013-12-22 07:22:16 +00:00 · 2013-12-22 07:22:16 +00:00 · e33a48b026
commit e33a48b026
parent bd132a89d9
5 changed files with 132 additions and 22 deletions
--- a/net-fs/winexe/Manifest
+++ b/net-fs/winexe/Manifest
@ -1,2 +1,6 @@
+AUX winexe-getoptstd.patch 657 SHA256 6cea4c6611e62c6809f4773bc1444459f331b923a647c57435ef1a33e67b23ed SHA512 36fbf28c5388406133bdb2a828f5d6439a37c8f48a519bb7952a0e8288faf8658a5d0bd5e4502512d5c2c617f802c08eaf0fb888d0e34538242a387da1d22964 WHIRLPOOL c8d6f805fe25e5d35747661ae843a6e1da740c45ea6a73b73f01c1720043feea69172abaf718253119cb099b37e5c52aea8d413844ad554d5ee5fbab36cc39be
+AUX winexe-gnutlslowat.patch 1112 SHA256 40f0ce053e7e71c903bb1d0180a18929c8f1730d782181ea63a9379c8c86c8c2 SHA512 0438a444c9575d2e54f209cac9a3b3db44598956acb8fd855dd1bdd8f69e04a47eda32fa8e1aac0b1baa9a55d84a5f0144668838d433b2d311f932371a9d631e WHIRLPOOL b69f3a83393afab9ac2aa879aa6236f1f3244e56d2c6956e003a53cb4fbc8acf5b516e7d86aecdaf45640a9ef897d98636f8d2204f7eb0f9dde3dd2860d5d70c
 AUX winexe-passthrough.patch 4225 SHA256 d861e50104bb694dbf36d54c1d54e28bad9d6cc65e5f43e0f65e7ada13a1c9b8 SHA512 3f6969cd3818a6c5981f5f9b1cbe7303d45e8c4d98ae214ac35460443b3ae51db4d7db94bc0b67ca523a91268138fcf9b904a6ab01ca78a5175f6886eda86846 WHIRLPOOL ba0833258926f656a1be867f1e96de6689a8263f8107f103d70f869b093841b52065fa4f0d1a6bb4dbce1d01b0233f3f09145cd9dd1a4a61394b72975823983e
-EBUILD winexe-9999.ebuild 944 SHA256 6a5259e76b5627f757ab2d9d504655489d32a2eabdf1e77f4f124280cac91b36 SHA512 807c3961a291d8311e30742d8c3ab4adb73925465a24b0f7b30866b328ec78c059e7b3ad6dbcb93c78f08cf0e6aa54e06c879fa47d65550430dd500531cb1d9b WHIRLPOOL 18b9b99eb112caf2a0c498838b4ae39f6ff1ff7cafc4e36fb187afa95057fa7bbd35c6fe79df19d33ede697823b9970f9f745df6e55307995993c163b3226dc7
+DIST winexe-1.00.tar.gz 21931368 SHA256 99238bd3e1c0637041c737c86a05bd73a9375abc9794dca71d2765e22d87537e SHA512 c640c547b7298e7b4835290b747b9086444c5c51bc25db80522f96021f1e3e86905f890ff79f13f3e1a9bf573c9df39f3c15436bc3a0fd123ed6cd615eae7696 WHIRLPOOL 84fc03e1e683dbf7272f9362acd59649643389cbe535d0d00eae4a472326fe49268f2ac7e3c2d3f307ea62b09113d5212540a89adcdcd4b17d42a3461d9bca0b
+EBUILD winexe-1.0.0.ebuild 953 SHA256 4325b7ce2910f2da69f1b9e17a191307d8866551f145665c1f509cbec6274c65 SHA512 27bf14515373bb7b954fafd5c992a05b8a84c307ba2cc7a6333408704993c43b0c1fe44c76f6852b4f632d429a44818470d80a15c255ae20221c200e1d9b0dad WHIRLPOOL 1c52457ecf232f8854dfe9fd5e727ede47323245f3cf2c9df7056bf7c7409cf2562016d2d2e2b868af85823bd09319e2e87251875aae26248275962d96877f78
+EBUILD winexe-9999.ebuild 1208 SHA256 61fb69d7583def186d2897ccec1e87a4317a40d2f4f78ec6a121090fb2abe02e SHA512 723d82a0c2700f78156dd1789c812065585ab7f8875a750b5d2a0c45ebfe53fc825f85dcb27a21dcd2714c7db4bcdbe3497e0cbe952e6c638efb9f3d9e230c16 WHIRLPOOL 904cc3ed1112188cebe9672d1d50d5ad3be2194570502521f4d939a6bbcea9b98191df7541b5d79147635f01e71873ca0cd40ba16834b84cb644dbc6b904ee3a
--- a/net-fs/winexe/files/winexe-getoptstd.patch
+++ b/net-fs/winexe/files/winexe-getoptstd.patch
@ -0,0 +1,23 @@
+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;
--- a/net-fs/winexe/files/winexe-gnutlslowat.patch
+++ b/net-fs/winexe/files/winexe-gnutlslowat.patch
@ -0,0 +1,23 @@
+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;
--- a/net-fs/winexe/winexe-1.0.0.ebuild
+++ b/net-fs/winexe/winexe-1.0.0.ebuild
@ -0,0 +1,44 @@
+# 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-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"
+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
+}
--- a/net-fs/winexe/winexe-9999.ebuild
+++ b/net-fs/winexe/winexe-9999.ebuild
@ -1,45 +1,61 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $

-EAPI=4
+EAPI=5

-inherit git-2 eutils python
+PYTHON_COMPAT=( python2_7 )
+inherit git-2 eutils python-r1

 DESCRIPTION="remotely execute commands on Windows NT/2000/XP/2003 systems, with lmhash passthrough support"
 HOMEPAGE="http://sourceforge.net/projects/winexe/"
-EGIT_REPO_URI="http://git.code.sf.net/p/winexe/code"
+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="~amd64 ~x86"
-IUSE=""
+KEYWORDS=""
+IUSE="+static"

 DEPEND="net-libs/gnutls
 	dev-libs/popt
-	dev-libs/cyrus-sasl"
+	dev-libs/cyrus-sasl
+	dev-util/mingw64-runtime
+	dev-libs/libbsd
+	!static? ( >=net-fs/samba-4.0.0 )"
 RDEPEND="${DEPEND}"

-#This probably should be merged into the samba ebuild on a useflag
+# a nasty hack to get Samba sources for the static option
+src_unpack() {
+	EGIT_REPO_URI="${EGIT_REPO_1}"
+	git-2_src_unpack

-pkg_setup() {
-        python_set_active_version 2
-        python_pkg_setup
+	if use static; then
+		EGIT_SOURCEDIR="${S}/samba"
+		EGIT_REPO_URI="${EGIT_REPO_2}"
+		git-2_src_unpack
+	fi
 }

-src_prepare() {
-	epatch "${FILESDIR}"/winexe-passthrough.patch
-}
 src_configure() {
-	cd source4
-	./autogen.sh # should we be using eautoreconf really?
-	econf \
-		--enable-fhs
+	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 source4
-	emake || die "compile failed"
+	cd source
+	./waf build
 }
+
 src_install() {
-	dobin "${S}"/source4/bin/winexe
+	dobin "${S}"/build/winexe-static
 }