From 1be801afbb6710e7b80e9008eddc5e092ed441a2 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 27 May 2013 22:12:41 +0200 Subject: net-misc/openvpn-gui: commit last work upstream has released --- net-misc/openvpn-gui/Manifest | 4 +- .../files/openvpn-gui-BJA-StringFileInfo.diff | 55 ++++++++++++++++++++++ .../files/openvpn-gui-BJA-empty-passphrase.diff | 29 ++++++++++++ net-misc/openvpn-gui/openvpn-gui-9999.ebuild | 48 ++++++++++++++----- 4 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 net-misc/openvpn-gui/files/openvpn-gui-BJA-StringFileInfo.diff create mode 100644 net-misc/openvpn-gui/files/openvpn-gui-BJA-empty-passphrase.diff (limited to 'net-misc') diff --git a/net-misc/openvpn-gui/Manifest b/net-misc/openvpn-gui/Manifest index 7386face..9e64d9a4 100644 --- a/net-misc/openvpn-gui/Manifest +++ b/net-misc/openvpn-gui/Manifest @@ -1 +1,3 @@ -EBUILD openvpn-gui-9999.ebuild 1147 RMD160 6fb2d48512cf550a3e89ed4df46789bdd2b45099 SHA1 615f20259d8ab3a838ce40d3fecbf8a2b6d89b08 SHA256 a0335b59fd8f12d950c5014c8b2c1f09995aeefe0f786b862dc947ca01a9b5f7 +AUX openvpn-gui-BJA-StringFileInfo.diff 2404 RMD160 b597a222c8fc5fdc692d8ccc1223349af496ea4f SHA1 4c0524b2b5ddda48cad2fb824a1f22381708319f SHA256 8e0f10313b207d4d27a58ee55458a1cfd8177d70974dc3b3225a221bc44ee272 +AUX openvpn-gui-BJA-empty-passphrase.diff 846 RMD160 ad235cf162ed4fa81c22d33260adf992b2a27105 SHA1 46d761fa28bc1db0ac3984e658c30e439580832c SHA256 2a99407a0d0d394a218a41a984f486c6412e63848f3784d7039790e0b9f3f299 +EBUILD openvpn-gui-9999.ebuild 1565 RMD160 525e1c4426a679154e49f7d12852fecddaab2c05 SHA1 6f26fa2419e76d4e494f995be0aa728faad9bb82 SHA256 884303b379d90bbf6e06a82824d5ea0ed5eff2dd7b77aba38544b12a37e374d6 diff --git a/net-misc/openvpn-gui/files/openvpn-gui-BJA-StringFileInfo.diff b/net-misc/openvpn-gui/files/openvpn-gui-BJA-StringFileInfo.diff new file mode 100644 index 00000000..526fcc37 --- /dev/null +++ b/net-misc/openvpn-gui/files/openvpn-gui-BJA-StringFileInfo.diff @@ -0,0 +1,55 @@ +--- openvpn-gui-res.rc 2011-08-06 12:34:24.000000000 +0200 ++++ openvpn-gui-res.rc 2011-08-06 13:14:16.000000000 +0200 +@@ -46,27 +46,35 @@ + #include "openvpn-gui-res-se.rc" + + /* Version information and such */ +-VS_VERSION_INFO VERSIONINFO +-FILEVERSION PACKAGE_MAJOR_VERSION,PACKAGE_MINOR_VERSION,PACKAGE_RELEASE,0 +-FILEOS VOS_NT +-FILETYPE VFT_APP ++1 VERSIONINFO ++ FILEVERSION PACKAGE_MAJOR_VERSION,PACKAGE_MINOR_VERSION,PACKAGE_RELEASE,0 ++ PRODUCTVERSION PACKAGE_MAJOR_VERSION,PACKAGE_MINOR_VERSION,PACKAGE_RELEASE,0 ++ FILEOS VOS__WINDOWS32 ++ FILETYPE VFT_APP ++ + BEGIN + BLOCK "StringFileInfo" + BEGIN +- BLOCK "040904B0" /* en_US, Unicode */ ++ BLOCK "040904b0" /* en_US, Unicode */ + BEGIN +- VALUE "FileDescription", PACKAGE_NAME " for Windows" +- VALUE "FileVersion", PACKAGE_VERSION +- VALUE "InternalName", PACKAGE_TARNAME +- VALUE "OriginalFilename", PACKAGE_TARNAME ".exe" +- VALUE "ProductName", PACKAGE_NAME +- VALUE "ProductVersion", PACKAGE_VERSION +- VALUE "Website", PACKAGE_URL +- VALUE "LegalCopyright", "The " PACKAGE_NAME " developers" +- VALUE "CompanyName", PACKAGE_NAME " is developed by these individuals:\r\n\r\n" \ +- "Mathias Sundman (retired)\r\n\r\n" \ +- "Heiko Hund\r\n" \ +- "" ++ // required ++ VALUE "CompanyName", PACKAGE_NAME " is developed by these individuals:\r\n" \ ++ "Mathias Sundman (retired)\r\n" \ ++ "Heiko Hund \0" ++ VALUE "FileDescription", PACKAGE_NAME " for Windows\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", "The " PACKAGE_NAME " developers\0" ++ // personnal ++ VALUE "Website", PACKAGE_URL "\0" + END + END ++ BLOCK "VarFileInfo" ++ BEGIN ++ VALUE "Translation", 0x409, 0x4b0 ++ END + END diff --git a/net-misc/openvpn-gui/files/openvpn-gui-BJA-empty-passphrase.diff b/net-misc/openvpn-gui/files/openvpn-gui-BJA-empty-passphrase.diff new file mode 100644 index 00000000..cb4610d0 --- /dev/null +++ b/net-misc/openvpn-gui/files/openvpn-gui-BJA-empty-passphrase.diff @@ -0,0 +1,29 @@ +--- passphrase.c.ori 2011-09-26 18:04:09.018134945 +0200 ++++ passphrase.c 2011-09-26 18:06:24.291792425 +0200 +@@ -71,8 +71,10 @@ + + const int KEYFILE_FORMAT_PKCS12 = 1; + const int KEYFILE_FORMAT_PEM = 2; +-const int MIN_PASSWORD_LEN = 8; + ++#ifndef ALLOW_EMPTY_PASSWORD ++const int MIN_PASSWORD_LEN = 8; ++#endif /* ALLOW_EMPTY_PASSWORD */ + + /* + * Return TRUE if new passwords match +@@ -367,12 +369,14 @@ + break; + } + ++#ifndef ALLOW_EMPTY_PASSWORD + /* Check minimum length of password */ + if (NewPasswordLengh(hwndDlg) < MIN_PASSWORD_LEN) + { + ShowLocalizedMsg(IDS_ERR_PWD_TO_SHORT, MIN_PASSWORD_LEN); + break; + } ++#endif /* ALLOW_EMPTY_PASSWORD */ + + /* Check if the new password is empty. */ + if (NewPasswordLengh(hwndDlg) == 0) diff --git a/net-misc/openvpn-gui/openvpn-gui-9999.ebuild b/net-misc/openvpn-gui/openvpn-gui-9999.ebuild index 01a9e65c..f3058584 100644 --- a/net-misc/openvpn-gui/openvpn-gui-9999.ebuild +++ b/net-misc/openvpn-gui/openvpn-gui-9999.ebuild @@ -3,38 +3,64 @@ # $Header: $ EAPI=4 -inherit eutils git autotools +inherit eutils flag-o-matic git-2 autotools DESCRIPTION="OpenVPN GUI is a graphical frontend for OpenVPN running on Windows 2000/XP/Vista/7" HOMEPAGE="https://sourceforge.net/projects/openvpn-gui" -IUSE="" +IUSE="empty-password" -ILANG="de dk en es fi fr it nl no pl pt se" +ILANG=( + de GERMAN + dk DANISH + en ENGLISH + es SPANISH + fi FINNISH + fr FRENCH + it ITALIAN + jp JAPANESE + nl DUTCH + no NORWEGIAN + pl POLISH + pt PORTUGUESE + se SWEDISH + tr TURKISH +) EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" -for l in ${ILANG} ; do +for l in "${ILANG[@]}" ; do + [ -z "${l//[A-Z]/}" ] && continue IUSE="${IUSE} linguas_${l}" done LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" DEPEND="dev-libs/openssl" RDEPEND="${DEPEND} net-misc/openvpn" src_prepare () { - strip-linguas ${ILANG} + strip-linguas ${ILANG[@]} [ -z "${LINGUAS}" ] && LINGUAS="en" - for l in ${ILANG} ; do - has ${l} ${LINGUAS} \ - || sed -i -e "/^#include/ {/${PN}-res-${l}.rc/d}" \ - ${S}/openvpn-gui-res.rc + set -- ${ILANG[@]} + while [ $# -ge 2 ] ; do + l=$1 ; wl=$2 + shift 2 + + if ! has ${l} ${LINGUAS} ; then + sed -i \ + -e "/^#include/ {/${PN}-res-${l}.rc/d}" \ + -e "/LANG_${wl}/d" \ + ${S}/res/openvpn-gui-res.rc + fi done + epatch ${FILESDIR}/${PN}-BJA-empty-passphrase.diff + use empty-password && append-flags "-DALLOW_EMPTY_PASSWORD" + eautoreconf || die "eautoreconf fail" } @@ -56,5 +82,5 @@ src_install () dodoc "OpenVPN GUI ReadMe.txt" insinto usr/share/${PN}/images - doins *.ico + doins res/*.ico } -- cgit v1.2.3