bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x34C2808A

5 files changed, 168 insertions, 8 deletions

diff --git a/media-plugins/vdr-vdrmanager/ChangeLog b/media-plugins/vdr-vdrmanager/ChangeLog
index 2af22f47f7e8..38aa5ba75b8f 100644
--- a/media-plugins/vdr-vdrmanager/ChangeLog
+++ b/media-plugins/vdr-vdrmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-vdrmanager
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/ChangeLog,v 1.10 2013/12/27 17:18:28 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/ChangeLog,v 1.11 2014/06/01 17:09:08 hd_brummy Exp $
+
+*vdr-vdrmanager-0.12 (01 Jun 2014)
+
+  01 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-vdrmanager-0.12.ebuild, +files/confd-0.12, +files/rc-addon-0.12.sh:
+  bump
 
 *vdr-vdrmanager-0.10 (27 Dec 2013)
 
diff --git a/media-plugins/vdr-vdrmanager/Manifest b/media-plugins/vdr-vdrmanager/Manifest
index eff718a3e7c3..48b0bdabd5d1 100644
--- a/media-plugins/vdr-vdrmanager/Manifest
+++ b/media-plugins/vdr-vdrmanager/Manifest
@@ -2,21 +2,25 @@
 Hash: SHA256
 
 AUX confd 718 SHA256 fee20b480faa68d59c35e2d26bcdd582ca464f29465eab6d8009262d5859ac5c SHA512 5afdd3064651971a1abaf36712cb4477feaf54cd7a5d732d7c7b65a51274a5759d6e4c2dc469f2bc2a8aa505703c3e7235315b84ba9ff891647520fa3ff9fae5 WHIRLPOOL f8af1431214116d837c04bdb8141c4e676ed5cb188d667fd9100de8108f4a793f0bd193d9c7342e892d4dd2fc1759bbd4292a665e4580911480628ca4e1cc40e
+AUX confd-0.12 1279 SHA256 c037e061f0a4aea22e03c592be7d417b9124b90e3121949c5780d631b2296934 SHA512 c5f6561295f3eb570de4353e64dd51a0e50bc56920f1c0b283b670b4a55db7a3d5a8fb2e1bbb3fa43db56386db588858b41c3e73017993adbd90f797daf7e4f5 WHIRLPOOL 70850593ce74bfaa62cb37fbb08fc78152970554391252e58080b51155cc4aa63c88cb9f802982bc35081834fd3eb49660aa88ef70ab9218483448b3f4674da6
+AUX rc-addon-0.12.sh 815 SHA256 618d4758d2d3f26aafcff1535e1997ab56324266bca0058112164c5ae062adfd SHA512 3a0297ed31da679bb39ba503f04aeef72abe5f2962931ff9588aacac8a29985f391479b1c937b37766f568644a6bffaad225e8145184f5e8cc3e76224f6d6595 WHIRLPOOL 2fecd7505096d1dc35b65d53330a541e77d8ae54667ee4117597507dc0d7b528d817586611c45f45673e15ebdd7b77bc1e236d5b1909ec8a6a5fa0471a654404
 AUX rc-addon.sh 546 SHA256 591b4ffa6f86b813e084a3dba38df0cac88480b3e0d801361cb6b8ceb99b18d9 SHA512 591d549975807d416dd19449299590b979b1cf17082726c3d754aac3afccc51e254e935c63e1cc5e595a99698660cf1115f0a7cf3c69ca046ea632c4de13363c WHIRLPOOL 8483eced499e6f4a057c4351c657c0189ae68979f8e2e1a8c3936b916872be90bc15af520196b54fe4ecf87245b246ae0675dadf6821c25416905ec9aa60827a
 AUX vdr-vdrmanager-0.9_vdr-2.1.2.diff 1084 SHA256 53df16c52608ef27a0aa81b9b9d1d9a8177c0bad252a0b9cfe15c177e6a095b3 SHA512 92a6f8e6c0fe20f3de10ec33c192afe00dc8bbc6879b12a0fc44546f1e5d5d68d344691829f5610f3178b068b8d7786a7a026ba506205015b6e4cda8b27b02ff WHIRLPOOL cb72d5491e7c91c097aaef40ca3058e11dc5457f306ab8564869fe73577b36ffd86cc1f9d7ea555962afa07a6002018c258dc269893940bb14930d557726288a
 DIST vdr-vdrmanager-0.10.tar.gz 30169 SHA256 2b325aaaf85059c46ad3094629feb40fd22e895975ac24f4a80d333d3863e370 SHA512 4be7cb16c479eb19f80bd5466313c6e71295491712ecc7bd98a122ab7d18e173ed2e19a0b2b04ed9035b93cb8463b59aadc60dbc48039a5f1b1ceec071b546b1 WHIRLPOOL 889bf4723a95e3713e0897469a1089a3b3f22e3a43ce3c3912a093e8cb7c79efeb17ce3f05feef0d23f49f12b9d6fc7e0dcd8e527dfd03dca1ffff092d4b0fab
+DIST vdr-vdrmanager-0.12.tar.gz 34404 SHA256 33afac8cc07b47ad3cd689ece82b086761eb57a27bb6084dfcef178ba40337ca SHA512 a5b962c53c636c899f2ce62a4f20bc123fb5d4603d506c51b6450fde86348bc5192697876e03bf22952197846f7cf828d743727de0c9903420a05c0c07172265 WHIRLPOOL 8e007ffc94cfc6fb32cda6dfbad7962f977dd3f8aff49860e7825d26c79bb02efa08729e4b1e53af2ed58c4b0c88490ffe38cb69d4d421a043945e626a73e93b
 DIST vdr-vdrmanager-0.8.tar.gz 33535 SHA256 3ab87199e1e931851e85ad3fa23f7f9faccffe529055bd845abd2999f34d4204 SHA512 a185a283e6f1bfd8917223d783eb7399e477bc572fe5a33cf51774498902a3a220f587190c345724585dee9c3fb9f0ffc709c48a8506979dc2739f89771bc091 WHIRLPOOL beeee169e4db8e1bdddfc02202df9af71717179a8b6bafd01c46b5db7286f5a3ff80df69133d1e62d392f9f7b1dcbc45010bfac0c05f9206eb8e4d657f3cb03a
 DIST vdr-vdrmanager-0.9.tar.gz 25201 SHA256 67a27059d6a92e75a78225189dc0bbdc7fd0fa75846293657f59f0ac70022e0b SHA512 6deaafeb63f820eaeb418b37ad66c69588f46c5bdb76191c60ce5d320ea230a1cf0e0c6b18463974b54d5ffe5206ecdce61ca23350c7df716b8016b34dc52238 WHIRLPOOL ed1e8f78d1706a76ca911d94235f299df238e89ce687e5da158f42a6a51b35f62e2df3802061846d666dfc42d766bca5954d49a9b930a1385d788881d63f16fa
 EBUILD vdr-vdrmanager-0.10.ebuild 821 SHA256 529b9e8d7edf2cc58e3860b90de6d0dad293d508ff2e1dcbbd0070e11f0d48c3 SHA512 3cdca726edecbbbd336937cafe7714a25ac40a805734912643971e00296184279671463260c051b01109099702a0c07a32b81b7a86cf49a964b496c3822d9f66 WHIRLPOOL 9adf41e9220f3bb7d45003c33daab8686e0e0c1fd8f0f58aae1ffddba4f41ecf6f3421b3584a2f980c2d018b85874fa95f59a103b1343702a972b65ca8b1d9c6
+EBUILD vdr-vdrmanager-0.12.ebuild 2345 SHA256 70c16c142a064647fc14b6d8f661f90b89c8f99f050a88b93a455a5360494704 SHA512 76905cea7f7727445d7fb42380fe61e033d31d58d8e2daf31b982abce7fe147108eb3454078e9655bb547f1025016d6d1f32e030948a5fac3e0e18c312674a60 WHIRLPOOL 0acf8fe648d2836c197832ecfa951d263a9bc2679234f8fd85b7306e60d38a19d414a5a781ee6b32b19d79102223d0b5b17f0a2396f3357264c1ef1c42ab3464
 EBUILD vdr-vdrmanager-0.8.ebuild 824 SHA256 c44e121e5736f93b92637ec00f1cc85b980551be008add4f5f111d26249ea86d SHA512 87b2deaf5156299a0f6f129478739bc3113051e2b4283beede4816bb83660d521b2376d80573b7e3003ab9f9b35194aa692ca6815f41f575e81ed0b4ab8dec0d WHIRLPOOL 53027e3d732c1c0fee962e27f2eaab65f71da16d865d52e089fedea71545dcd9e88edb70b3ca464b26f923d836b5d070e45616136298afb94025bb9e42cb4edd
 EBUILD vdr-vdrmanager-0.9.ebuild 872 SHA256 23e6732db8be71885aa004be063fa79d0da3d587f56492b80ab20dc5882617e4 SHA512 28bac4455bda721bef31808906141983107ad63c999c3a2377f33aa683803171307f1254ec086c312874f4aa4f010c06de4457921a2ea1b1db1b1e905e25ed23 WHIRLPOOL 6fab40fb375ef42e08d7dcae9d9067b3c5fa05dd2b4182144c5c756a4015a4468870fbd30d10d86a0f35693a7f1b301a042af937228d5248432201576d9a4afb
-MISC ChangeLog 2263 SHA256 132206688c3c6f9427b58ef41dbe1a468b145f92f5c336d2a74a0499069d216a SHA512 f9e917b931cfd70b636064a194274634ff8715074fb0bcf945c2b8406e590a753cdb99ab2658692e141d2659f117d93e77e428209ffb816d27563b11f0c9375d WHIRLPOOL a3001361eb39c2af1b77894b234daba95f8a21547a645211b8396591eebe592bedf963b555f0967dddbbb7f2cd08baed834e5c9bea73936b765ccece83bd37af
+MISC ChangeLog 2437 SHA256 00bdebcd9cd53716981d5ee93f41b8723be9feea16b1b80e7421e30df728f8d7 SHA512 96af66f8aea97bfcbf0564955e243d42b7d613a2943c529022ad70c05b93ac9ebee11fe88647857a15ef089371d9e5a3acdd6a7f1d9240c3c144925ab4d6cc21 WHIRLPOOL 2228506e986ef5fb155d7ff92df4da669d26411c965d7f67188c92a326b5c06f11c51113f9948b7cf078259abf32bc6aaf050544e95f9f1c3257e93676637b17
 MISC metadata.xml 352 SHA256 612bcc6151d03134e6c1259c77c8223b8e3503985089e6eddf8f9d28d4d7f092 SHA512 3efae187632d0d1913c7de149e53e7da0e725131204bf204295287b9b57b369aaafff27ee4c5462b67b5c85a329134d511ea60e6cd0a01ab449d200812a26622 WHIRLPOOL 2d18c55f7ae2807168ee1699e3aa592369b6c47f360ab7132340484a8bf9f114184a603ccc5dfcd426f11e36b310c060368cd7389286dbc2fc9daea4d015defc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: signed/commited by hd_brummy@gentoo.org
+Version: GnuPG v2.0.22 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFSvbZvdn07HTTCgIoRCFjBAJoCO5bstfVSNon+doSqBavpIezxKQCfZl91
-KAkRyPj9HhJf9RgqmrAqlHY=
-=qbXL
+iD8DBQFTi146dn07HTTCgIoRCOToAJ41krTSXocGSBv3wHn1XFAkOnPAoQCfUQ++
+tfiT8zXBZsyZe0BpvWFIfPY=
+=1uvA
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-vdrmanager/files/confd-0.12 b/media-plugins/vdr-vdrmanager/files/confd-0.12
new file mode 100644
index 000000000000..e37fdffcd26f
--- /dev/null
+++ b/media-plugins/vdr-vdrmanager/files/confd-0.12
@@ -0,0 +1,42 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/files/confd-0.12,v 1.1 2014/06/01 17:09:08 hd_brummy Exp $
+# /etc/conf.d/vdr.vdrmanager
+
+# Parameters for vdr-plugin-vdrmanager
+#
+#   For more details see:
+#   http://projects.vdr-developer.org/projects/vdr-manager/wiki
+
+# Set the port where the plugin is listen on
+#   allowed values: port number
+#   default: 6420
+#   default port on ssl connection is always VDRMANAGER_PORT +1
+#   this means, if you enable ssl support on your android vdrmanager app
+#   add +1 in the app port setup, else it will still the non ssl connection be used
+#   try to remember on this ;)
+#
+#VDRMANAGER_PORT="6420"
+
+# Set the password where the plugin/app is listen on
+#   allowed values: your_password
+#   default:
+#
+VDRMANAGER_PASS=""
+
+# Force check against svdrphosts.conf
+# change this to yes, if you have added a static IP
+# for access outside from your LAN
+#
+#	allowed values: yes | no
+#	default: no
+#
+#SVDRPHOSTS_CHECK="no"
+
+# Compressionsmode for data transfer
+# 'g' for gzip, if you has use-flag gzip enabled on plugin install
+# 'z' for zlib, if you has use-flag zlib enabled on plugin install
+# 'n' for none, if you would like to disable compression
+#
+#	allowed values: g | z | n
+#	default: unset
+#
+#VDRMANAGER_COMPRESSION=""
diff --git a/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh b/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh
new file mode 100644
index 000000000000..a7d8ce0bbfcd
--- /dev/null
+++ b/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh
@@ -0,0 +1,29 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/files/rc-addon-0.12.sh,v 1.1 2014/06/01 17:09:08 hd_brummy Exp $
+#
+# rc-addon plugin-startup-skript for vdr-vdrmanager
+#
+
+: ${VDRMANAGER_PORT:=6420}
+
+# default path from ebuild merge; no option in config file to overwrite
+: ${VDRMANAGER_CERTFILE:=/etc/vdr/plugins/vdrmanager/vdrmanager.pem}
+
+if [[ -z ${VDRMANAGER_PASS} ]]; then
+	eerror "Empty password in /etc/conf.d/vdr.vdrmanager"
+	logger -t vdr "ERROR: need password for plugin vdr-manager"
+fi
+
+plugin_pre_vdr_start() {
+
+	add_plugin_param "-p${VDRMANAGER_PORT}"
+	add_plugin_param "-P${VDRMANAGER_PASS}"
+
+	if yesno ${SVDRPHOSTS_CHECK:-no}; then
+		add_plugin_param "-s"
+	fi
+
+	add_plugin_param "-k ${VDRMANAGER_CERTFILE}"
+
+	# vdrmanager_compression
+	add_plugin_param "-c ${VDRMANAGER_COMPRESSION}"
+}
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild
new file mode 100644
index 000000000000..b362371dce6b
--- /dev/null
+++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild,v 1.1 2014/06/01 17:09:08 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2 ssl-cert
+
+VERSION="1747" # every bump, new version
+
+DESCRIPTION="VDR Plugin: allows remote programming VDR using VDR-Manager running on Android devices"
+HOMEPAGE="http://projects.vdr-developer.org/projects/vdr-manager/wiki"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gzip +ssl -stream zlib"
+
+DEPEND=">=media-video/vdr-2
+		ssl? ( dev-libs/openssl )"
+RDEPEND="stream? ( media-plugins/vdr-streamdev[server] )
+		zlib? ( sys-libs/zlib )"
+
+S="${WORKDIR}/${P}"
+
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.12.sh"
+VDR_CONFD_FILE="${FILESDIR}/confd-0.12"
+
+VDRMANAGER_SSL_KEY_DIR="/etc/vdr/plugins/vdrmanager"
+VDRMANAGER_SSL_KEY_FILE="${VDRMANAGER_SSL_KEY_DIR}/vdrmanager"
+
+make_vdrmanager_cert() {
+	SSL_COUNTRY="${SSL_COUNTRY:-}"
+	SSL_STATE="${SSL_STATE:-Unknown}"
+	SSL_LOCALITY="${VDRMANAGER_SSL_LOCALITY:-Unkown}"
+	SSL_ORGANIZATION="${VDRMNAGER_SSL_ORGANIZATION:-VDR-Manager Plugin}"
+	SSL_UNIT="${VDRMANAGER_SSL_UNIT:-VDR Server}"
+	SSL_COMMONNAME="${VDRMANAGER_SSL_COMMONNAME:-`hostname -f`}"
+	SSL_EMAIL="${VDRMANAGER_SSL_EMAIL:-Unknown}"
+	SSL_BITS="${VDRMANAGER_SSL_BITS:-1024}"
+	SSL_DAYS="${VDRMANAGER_SSL_DAYS:-720}"
+
+	rm -f "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.*
+
+	install_cert ${VDRMANAGER_SSL_KEY_FILE}
+
+	rm -f "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.{crt,csr,key}
+	chown vdr:vdr "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.pem
+	chmod 0400 "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.pem
+}
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	BUILD_PARAMS+=" VDRMANAGER_USE_GZIP=$(usex gzip 1 0)"
+	BUILD_PARAMS+=" VDRMANAGER_USE_SSL=$(usex ssl 1 0)"
+	BUILD_PARAMS+=" VDRMANAGER_USE_ZLIB=$(usex zlib 1 0)"
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	einfo "Add a password to /etc/conf.d/vdr.vdrmanager"
+
+	if use ssl ; then
+		if path_exists -a "${ROOT}${VDRMANAGER_SSL_KEY_FILE}.pem"; then
+			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
+			einfo "emerge --config ${PN}"
+		else
+			einfo "No SSL cert found, creating a default one now"
+			make_vdrmanager_cert
+		fi
+	fi
+}
+
+pkg_config() {
+	make_vdrmanager_cert
+}