From: Matthias Schwarzott Date: Fri, 8 Dec 2006 12:25:23 +0000 (+0000) Subject: Version bumped. Added small comment about ports below 1024. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff4d1bf3f05f9e56734c91252276a6d08e211681;p=gentoo.git Version bumped. Added small comment about ports below 1024. Package-Manager: portage-2.1.2_rc2-r5 --- diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog index d9eefa0c5449..d86526b5bb81 100644 --- a/net-www/vdradmin-am/ChangeLog +++ b/net-www/vdradmin-am/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-www/vdradmin-am # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.7 2006/12/07 16:10:08 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.8 2006/12/08 12:25:23 zzam Exp $ + +*vdradmin-am-3.5.2 (08 Dec 2006) + + 08 Dec 2006; Matthias Schwarzott files/confd-2, + +vdradmin-am-3.5.2.ebuild: + Version bumped. Added small comment about ports below 1024. 07 Dec 2006; Matthias Schwarzott files/vdradmin-2: Let the init-script correct permission errors of the tmp-directory. diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest index d5643563a0e1..6b412d068553 100644 --- a/net-www/vdradmin-am/Manifest +++ b/net-www/vdradmin-am/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX confd-2 185 RMD160 20e71066ea1684ec41a717a48601586cd5619a22 SHA1 ec9f6fd352bc8d07afe8e70e8a58a52c5d769dfd SHA256 adb20ded4e29bf161a7fa85cfe37933d7c37d49f49e1db42a9377b412652e53e -MD5 77647d9be4b03259417400ccbf30fd75 files/confd-2 185 -RMD160 20e71066ea1684ec41a717a48601586cd5619a22 files/confd-2 185 -SHA256 adb20ded4e29bf161a7fa85cfe37933d7c37d49f49e1db42a9377b412652e53e files/confd-2 185 +AUX confd-2 295 RMD160 292ac9960158dc09b5c31adf85b49c29a5f2ca1b SHA1 07f5964bb3eaa0962d37ae7af0d049246cdb4ac5 SHA256 87d9c7449946c2724e0ddeb4de7c2eeee492b99f813131e47dafd9e860f8649f +MD5 20c9ed46c05f0fb515c41f6b9b7c8a76 files/confd-2 295 +RMD160 292ac9960158dc09b5c31adf85b49c29a5f2ca1b files/confd-2 295 +SHA256 87d9c7449946c2724e0ddeb4de7c2eeee492b99f813131e47dafd9e860f8649f files/confd-2 295 AUX vdradmin 516 RMD160 37c2c1b1fb68004bdb3f2f531177841216ef4486 SHA1 3c3181fa16a068d3634377de2564d45e71b39a7c SHA256 7c471799e98359a06124208bf91275d17c87f61d37f6b0c19408780c710c2312 MD5 3f3c0fb586ac36f9d7eb45fd07172e87 files/vdradmin 516 RMD160 37c2c1b1fb68004bdb3f2f531177841216ef4486 files/vdradmin 516 @@ -25,6 +25,7 @@ DIST vdradmin-am-3.4.6.tar.bz2 508340 RMD160 9a8039ebf5df52939720ec1d223937e6099 DIST vdradmin-am-3.4.7.tar.bz2 506628 RMD160 04413c1a767c668f0bb8d68dfe016fa449d06be6 SHA1 616b1e6d977fdcc20157030ab317e470cc5b2655 SHA256 46a07e9aed77d533a0e4045a733962db36beab025c7eb297eda0c0ec41d6f1c9 DIST vdradmin-am-3.5.0.tar.bz2 506174 RMD160 e2ec7300c83cd3749e275c2be3ef85286219c24f SHA1 d0f7e5a5d1b1a00f37064068d9874d04ef898a74 SHA256 638007f7c160b857edcef5368b7888948ead2571a2bf8882e4dc054b99ca7ab8 DIST vdradmin-am-3.5.1.tar.bz2 530000 RMD160 54e7d858173646208dc87da7ae2455f6da181ffc SHA1 80fffbd9650d776b335e73b6407ceb17b6e83982 SHA256 55481c6adba273874291b721f1c5d539d5d0cd34ed26c9498dc73f8e80f281ea +DIST vdradmin-am-3.5.2.tar.bz2 529968 RMD160 e1fdbc260f7b44eedda767dd8d383ea645321871 SHA1 e5e0a59dc8ca24ffbe40408ad191cf66313c016d SHA256 41aa6fcedb40bcc65c71660636871e09e3957892cf6ffd9a583969e680b8ca4e EBUILD vdradmin-am-3.4.6.ebuild 1369 RMD160 652fce28de3d5d8c8da1bc8c337c29eb64446dcd SHA1 bd2eb297fa6f03b9e51297f69e9264ff07fe9d09 SHA256 f48d8435a08b79d61a5b8540e2767073ad5507059bdd4f3ad1ebcb2055a14d72 MD5 72da23117758c63696c986b5d765e98e vdradmin-am-3.4.6.ebuild 1369 RMD160 652fce28de3d5d8c8da1bc8c337c29eb64446dcd vdradmin-am-3.4.6.ebuild 1369 @@ -45,10 +46,14 @@ EBUILD vdradmin-am-3.5.1.ebuild 4615 RMD160 a9cfe10d177814dfe6ac410466d9daa743d1 MD5 f3cd45315310db0c295e5227d6e9a8cc vdradmin-am-3.5.1.ebuild 4615 RMD160 a9cfe10d177814dfe6ac410466d9daa743d12b06 vdradmin-am-3.5.1.ebuild 4615 SHA256 f1cf3abb35e851416562e32c201ffe28acd70e312b9c55da3134842db46f506a vdradmin-am-3.5.1.ebuild 4615 -MISC ChangeLog 1567 RMD160 73ee24a728f191fb41cfc25a0a1c1869d2cd0a22 SHA1 d96d2fa18c08f757a0aebc1b7f9c7eb6fd2be462 SHA256 da0a5609b0cf2f39ef77c9b3049a44e8556ad166b58e7738c1c04b3ac208c3a6 -MD5 ed7b5ab21d1dde1391f50560ba562aef ChangeLog 1567 -RMD160 73ee24a728f191fb41cfc25a0a1c1869d2cd0a22 ChangeLog 1567 -SHA256 da0a5609b0cf2f39ef77c9b3049a44e8556ad166b58e7738c1c04b3ac208c3a6 ChangeLog 1567 +EBUILD vdradmin-am-3.5.2.ebuild 4610 RMD160 74542d576ef3fe6906a1df8b155eea34dcc652f0 SHA1 f86c062a660f3a9ce583d7b85d4f9bda32f817e9 SHA256 e9f34d213ddfd4c90871df6a82181b86881714ce851bc76ba2def516d2292d52 +MD5 b7e7940e9ae6289b880e81761f1ecba7 vdradmin-am-3.5.2.ebuild 4610 +RMD160 74542d576ef3fe6906a1df8b155eea34dcc652f0 vdradmin-am-3.5.2.ebuild 4610 +SHA256 e9f34d213ddfd4c90871df6a82181b86881714ce851bc76ba2def516d2292d52 vdradmin-am-3.5.2.ebuild 4610 +MISC ChangeLog 1761 RMD160 c9ec003ca0f197f3ca87fd9ee657d4e800177b99 SHA1 6da9570929d77ade622c39508d88828c27856252 SHA256 cd4171933be568f57b240b8ee066b90a633884640a22b1da20d6d5103a98d5af +MD5 9031344eba7da7b44ab4b7cdd064d113 ChangeLog 1761 +RMD160 c9ec003ca0f197f3ca87fd9ee657d4e800177b99 ChangeLog 1761 +SHA256 cd4171933be568f57b240b8ee066b90a633884640a22b1da20d6d5103a98d5af ChangeLog 1761 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502 @@ -68,10 +73,13 @@ SHA256 1fc2d6ab356d90f5cfddc7dc9b6831cf1960b2b29c8011c85293cf9f2b5ee2a3 files/di MD5 46bbca1ada218400524c7dab0913060e files/digest-vdradmin-am-3.5.1 256 RMD160 bea77b6c860a693678e789fcc68f891a34a54ae9 files/digest-vdradmin-am-3.5.1 256 SHA256 2554f0fecdc5261f0b409e5c7e495769580ea44d5364ca7f53c80228f4232e14 files/digest-vdradmin-am-3.5.1 256 +MD5 2dcc653f2dd21d9e521aec3c6c1bd5be files/digest-vdradmin-am-3.5.2 256 +RMD160 0405cd3bad1ec700e1f4570a7ac453f51377663e files/digest-vdradmin-am-3.5.2 256 +SHA256 04b08f6f57c6fe7c67a646d650043f25f58d3a68e20c30ca3f91235de5e8d22d files/digest-vdradmin-am-3.5.2 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFeD0Dt2vP6XvVdOcRAnP0AJ9MeIPFRoUQhKlgrEqNJSU2Cn3/cwCfQ1m/ -CtEzwHaDob2LDeoGCYrfUqQ= -=Vnb5 +iD8DBQFFeVm6t2vP6XvVdOcRAnl3AJ4kNzJTsKMsaY9orxnoGiRYD3a07QCdFLHT +zOO/ToMbe6g6b1XZ8V/pxAY= +=P7xU -----END PGP SIGNATURE----- diff --git a/net-www/vdradmin-am/files/confd-2 b/net-www/vdradmin-am/files/confd-2 index 5f79178a44c3..c77b6056db64 100644 --- a/net-www/vdradmin-am/files/confd-2 +++ b/net-www/vdradmin-am/files/confd-2 @@ -8,4 +8,7 @@ # Run vdradmin-am as this user: # +# If you want vdradmin to run on a port below 1024 you +# should nevertheless have vdradmin running as root. +# VDRADMIN_USER="vdradmin" diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2 new file mode 100644 index 000000000000..06034a01deed --- /dev/null +++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2 @@ -0,0 +1,3 @@ +MD5 7307c78bf9bf57c9f17311380423e6f4 vdradmin-am-3.5.2.tar.bz2 529968 +RMD160 e1fdbc260f7b44eedda767dd8d383ea645321871 vdradmin-am-3.5.2.tar.bz2 529968 +SHA256 41aa6fcedb40bcc65c71660636871e09e3957892cf6ffd9a583969e680b8ca4e vdradmin-am-3.5.2.tar.bz2 529968 diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild new file mode 100644 index 000000000000..49655d9a3857 --- /dev/null +++ b/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild,v 1.1 2006/12/08 12:25:23 zzam Exp $ + +inherit eutils + +RESTRICT="nostrip" + +DESCRIPTION="WWW Admin for the Video Disk Recorder" +HOMEPAGE="http://andreas.vdr-developer.org/" +SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2" + +KEYWORDS="~x86 ~amd64" +SLOT="0" +LICENSE="GPL-2" +IUSE="unicode" + +RDEPEND="dev-lang/perl + dev-perl/Template-Toolkit + >=dev-perl/Compress-Zlib-1.2.2 + media-video/vdr + dev-perl/Compress-Zlib + dev-perl/Locale-gettext + dev-perl/Authen-SASL + dev-perl/Digest-HMAC + unicode? ( sys-devel/gettext )" + +ETC_DIR="/etc/vdradmin" +LIB_DIR="/usr/share/vdradmin" +VDRADMIN_USER="vdradmin" +VDRADMIN_GROUP="vdradmin" +TMP_DIR=/var/tmp/vdradmin + +pkg_setup() { + enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR} +} + +src_unpack() { + + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-config-autoflush.diff + sed -i vdradmind.pl \ + -e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \ + -e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-" +} + + +src_compile() { + + if ! use unicode; then + einfo "no need to compile" + else + einfo "additionally generating utf8 locales" + ${S}/make.sh utf8add || die + ${S}/make.sh po || die + fi +} + +src_install() { + + newinitd ${FILESDIR}/vdradmin-2 vdradmin + newconfd ${FILESDIR}/confd-2 vdradmin + + dobin vdradmind.pl + + insinto ${LIB_DIR}/template + doins -r ${S}/template/* + + insinto ${LIB_DIR}/lib + doins -r ${S}/lib/* + + insinto /usr/share/locale/ + doins -r ${S}/locale/* + + exeinto ${LIB_DIR} + doexe autotimer2searchtimer.pl + + dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ + docinto contrib + dodoc ${S}/contrib/* + + diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}" + keepdir "${ETC_DIR}" + keepdir "${TMP_DIR}" + + dosed "s:FILES_IN_SYSTEM = 0;:FILES_IN_SYSTEM = 1;:g" /usr/bin/vdradmind.pl +} + +pkg_preinst() { + if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then + cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf + else + einfo "Creating a new config-file." + echo + + cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf + VDRCONFDIR = /etc/vdr + VIDEODIR = /var/vdr/video + EPG_FILENAME = /var/vdr/video/epg.data + EPGIMAGES = /var/vdr/video/epgimages + PASSWORD = gentoo-vdr + USERNAME = gentoo-vdr + EOF + # feed it with newlines + yes "" \ + | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \ + |sed -e 's/: /: \n/g' + + einfo + einfo "Created default user/password: gentoo-vdr/gentoo-vdr" + einfo + einfo "you can run \"emerge --config vdradmin-am\" if" + einfo "the default-values for vdr does not match your" + einfo "installation or change it in Setup-Menu of Web-Interface." + echo + fi + chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf +} + +pkg_postinst() { + if [[ -d ${ROOT}${ETC_DIR} ]]; then + local owner=$(stat ${ROOT}${ETC_DIR} -c "%U") + if [[ ${owner} != vdradmin ]]; then + einfo "Changing ownership of ${ETC_DIR}." + chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR} + fi + fi + + if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then + ewarn "You have a leftover directory of vdradmin." + ewarn "You can safely remove it with:" + ewarn "# rm -rf /tmp/usr/share/vdradmin/template" + ewarn "# rmdir -p /tmp/usr/share/vdradmin" + fi + + local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf + local SOURCE=${ETC_DIR}/vdradmind.at + if [[ -s ${ROOT}${SOURCE} ]]; then + ewarn "If you used the autotimer of vdradmin," + ewarn "it is a good idea to convert them now" + ewarn "to use with epgsearch." + ewarn + if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then + ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch" + fi + + local SIZE=0 + + [[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l) + + ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):" + local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}" + ewarn "# ${BASE_CMD} -s" + + ewarn + ewarn "Else you can use this:" + if [[ ${SIZE} == 0 ]]; then + ewarn "# ${BASE_CMD} -o ${DEST}" + else + ewarn "You already have some timers defined!." + ewarn "# ${BASE_CMD} -o ${DEST}.new" + ewarn + ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own." + ewarn + fi + ewarn "# chown vdr:vdr ${DEST}" + ewarn + ewarn "If you are sure that epgsearch has got all your timer," + ewarn "then you can delete vdradmin-autotimers." + ewarn "# rm ${SOURCE}" + fi +} + +pkg_config() { + /usr/bin/vdradmind.pl -c + chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf +} +