net-misc/openvpn: commit windres support, need to rework for current

release

3 files changed, 104 insertions, 4 deletions

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index cab208fc..1d86481f 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -8,10 +8,11 @@ AUX openvpn-2.1_rc6-udp6.patch 76842 RMD160 533ca831972ec759b39b1d0f94380091d221
 AUX openvpn-2.1_rc7-tap.patch 1474 RMD160 a200e42f1fd224e9d0f02eb59ab6371224245715 SHA1 1453666b79208d528880b95e324900605172a420 SHA256 f26a2ccad67a23c863241ca64c110c36601d70a0e6e0d6d626c02d176c36a2db
 AUX openvpn-2.2.0-BJA-win-ipv6.diff 462 RMD160 eb07658005d562b07b9e628d5d03f455ea7e0ba2 SHA1 4871f078e5e5e16d4aa22ae80a7735326e9d2276 SHA256 560ea9753c05a1472b98ebee945b983d9040a92229318396645fef6a68d26df1
 AUX openvpn-2.2.0-BJA-win.diff 226 RMD160 430af04e6dae04c178da9811c10aa7c8feb95c59 SHA1 7ec90e1ca4cf5819686ea259d64cf773c7f509f9 SHA256 946449ae548c7a4b05214b063db5a6c3ee7e004f76a95c472e805a18106b9daa
+AUX openvpn-windres.diff 2522 RMD160 603baaa23f9f44398b70b7bc8dd28ac56b725386 SHA1 aac5b425fc046f84d2bec0261c0d3b476f374a04 SHA256 70a5f548074b96bcded005036afe18d293aeba04651d4991aa03c3f11a4fb0aa
 AUX openvpn.init 1486 RMD160 7005230b0dc3ea400aa22c9a01c2aa034d8baace SHA1 1670c08a2bec65c2e3529aec8d377bad6cb2e0e5 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf
 AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e857053f86ea886dec8e8e6f45174df774 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd
 DIST openvpn-2.1_rc7.tar.gz 787379 RMD160 67e80d7bfb554046c71c95ec15d478504057f903 SHA1 f9f57a8ef3af8ab51924784ad2aab5d5f5798581 SHA256 c07fcbc41465bf508caff70dcc4238b8c95e9b2f35bec7bf891f7164027ecbf8
 DIST openvpn-2.2.0.tar.gz 898381 RMD160 32aa52c886d98b6b92150dfc64d3a9c07f6e8b30 SHA1 97e3389814a1bcef5a6d22774534a30e41d48bff SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567
 DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b92399df7d801972e3ca SHA1 d7ce041c4e7f0186091e17a2d178bd12e7a4696d SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21
 EBUILD openvpn-2.1_rc7.ebuild 4472 RMD160 8305d69c254db1c55edaad7459169f31c5b5f7b3 SHA1 0868cf478f1ff2cf32f0354a72af6e1026ad6e53 SHA256 c513ac09ccf925b04c91609a1fe588f4c5bbebfb1dead66f0c22ea4f759b80f3
-EBUILD openvpn-2.2.0-r1.ebuild 5764 RMD160 12f190d52f9949318f3c64485fd26a997d26dc85 SHA1 dcc83adbc5d05e318177a117181390a7991e4f38 SHA256 7bbe7eb942798bf5959c24ed3879b1986f56a2c0b9b88845829e661844b904be
+EBUILD openvpn-2.2.0-r1.ebuild 5781 RMD160 eacbb06ca6455cbb70a2627523abaaba19cc95b7 SHA1 c8f90a4babf655cc8ef5b8e53c9d4a802a9e7ed5 SHA256 a43ce89c299833564d05423a5620767e8a6e824511307158f743f7589c811964
diff --git a/net-misc/openvpn/files/openvpn-windres.diff b/net-misc/openvpn/files/openvpn-windres.diff
new file mode 100644
index 00000000..af509411
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-windres.diff
@@ -0,0 +1,100 @@
+--- /dev/null	2011-07-22 23:07:28.371976637 +0200
++++ openvpn-res.rc	2011-08-07 11:41:48.182392600 +0200
+@@ -0,0 +1,36 @@
++/*
++ * (c) 2011 Bertrand Jacquin <beber@meleeweb.net>
++ */
++
++#include <windows.h>
++#include "config.h"
++
++1 VERSIONINFO
++  FILEVERSION    _VERSION_
++  PRODUCTVERSION _VERSION_
++  FILEOS         VOS__WINDOWS32
++  FILETYPE       VFT_APP
++
++BEGIN
++  BLOCK "StringFileInfo"
++  BEGIN
++    BLOCK "040904b0"  /* en_US, Unicode */
++    BEGIN
++      // required
++      VALUE "CompanyName",      PACKAGE_NAME "\0"
++      VALUE "FileDescription",  PACKAGE_NAME "\0"
++      VALUE "FileVersion",      PACKAGE_VERSION "\0"
++      VALUE "InternalName",     PACKAGE_TARNAME "\0"
++      VALUE "OriginalFilename", PACKAGE_TARNAME ".exe\0"
++      VALUE "ProductName",      PACKAGE_NAME "\0"
++      VALUE "ProductVersion",   PACKAGE_VERSION "\0"
++      // optional
++      VALUE "LegalCopyright",   "(C) 2002-2010 " PACKAGE_NAME " Technologies, Inc.\0"
++    END
++  END
++  BLOCK "VarFileInfo"
++  BEGIN
++    VALUE "Translation", 0x409, 0x4b0
++  END
++END
++
+diff --git a/Makefile.am b/Makefile.am
+index 32b40bb..d5d620d 100644
+--- Makefile.am
++++ Makefile.am
+@@ -146,6 +146,13 @@ openvpn_SOURCES = \
+ 	win32.h win32.c \
+ 	cryptoapi.h cryptoapi.c
+ 
++if WIN32
++openvpn_SOURCES += openvpn-res.rc
++
++openvpn_LDADD = openvpn-res.o
++endif
++
++
+ nodist_openvpn_SOURCES = configure.h
+ options.$(OBJEXT): configure.h
+ 
+@@ -161,6 +168,11 @@ dist_noinst_DATA += openvpn.8
+ nodist_html_DATA = openvpn.8.html
+ openvpn.8.html: $(srcdir)/openvpn.8
+ 	$(MAN2HTML) < $(srcdir)/openvpn.8 > openvpn.8.html
++
++comma = ,
++
++%.o: %.rc
++	$(WINDRES) -D _VERSION_=$(subst .,$(comma),$(VERSION)),0 -i $< -o $@
+ else
+ dist_man_MANS = openvpn.8
+ endif
+diff --git a/configure.ac b/configure.ac
+index a3789d9..2edb05e 100644
+--- configure.ac
++++ configure.ac
+@@ -356,6 +356,7 @@ if test "${WIN32}" = "yes"; then
+ 	AC_ARG_VAR([MAN2HTML], [man2html utility])
+ 	AC_CHECK_PROGS([MAN2HTML], [man2html])
+ 	test -z "${MAN2HTML}" && AC_MSG_ERROR([man2html is required for win32])
++	AC_CHECK_TOOL(WINDRES, windres)
+ fi
+ 
+ dnl Checks for header files.
+diff --git a/service-win32/Makefile.am b/service-win32/Makefile.am
+index 4e4f55e..bb7b993 100644
+--- service-win32/Makefile.am
++++ service-win32/Makefile.am
+@@ -32,6 +32,14 @@ openvpnserv_SOURCES = \
+ 	openvpnserv.c \
+ 	service.h service.c
+ 
++openvpnserv_LDADD = \
++	../openvpn-res.o
++
++comma = ,
++
++%.o: %.rc
++	$(WINDRES) -D _VERSION_=$(subst .,$(comma),$(VERSION)),0 -i $< -o $@
++
+ else
+ 
+ dist_noinst_DATA = \
diff --git a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
index c362eb79..a483b330 100644
--- a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${CDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
+	epatch "${FILESDIR}/${PN}-windres.diff"
 	use ipv6 && {
 	  epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch" ;
 	  epatch  "${FILESDIR}/openvpn-2.2.0-BJA-win-ipv6.diff" ;
@@ -44,9 +45,7 @@ src_prepare() {
 		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
 		-e "s/-shared/-shared \${LDFLAGS}/" \
 		plugin/*/Makefile || die "sed failed"
-	if use ipv6; then
-		eautoreconf
-	fi
+	eautoreconf
 }
 
 src_configure() {