diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-20 04:16:16 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-20 04:16:16 +0000 |
commit | 033e1b3232b3c83c4033ed16c7d4dce1fb95ce75 (patch) | |
tree | c4f12e8acf4741abcb9c4b19381276a48543115e /app-cdr | |
parent | Patch added for CVE-2009-2369. Bug #277722. (diff) | |
download | gentoo-2-033e1b3232b3c83c4033ed16c7d4dce1fb95ce75.tar.gz gentoo-2-033e1b3232b3c83c4033ed16c7d4dce1fb95ce75.tar.bz2 gentoo-2-033e1b3232b3c83c4033ed16c7d4dce1fb95ce75.zip |
old
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r-- | app-cdr/webcdwriter/files/2.8.0-javac-flags.patch | 70 | ||||
-rw-r--r-- | app-cdr/webcdwriter/files/config-root.patch | 10 | ||||
-rw-r--r-- | app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild | 184 | ||||
-rw-r--r-- | app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild | 4 |
4 files changed, 2 insertions, 266 deletions
diff --git a/app-cdr/webcdwriter/files/2.8.0-javac-flags.patch b/app-cdr/webcdwriter/files/2.8.0-javac-flags.patch deleted file mode 100644 index e8f6432b3554..000000000000 --- a/app-cdr/webcdwriter/files/2.8.0-javac-flags.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Naur webCDwriter-2.8.0.orig/configure webCDwriter-2.8.0/configure ---- webCDwriter-2.8.0.orig/configure 2007-04-29 23:23:42.000000000 +1200 -+++ webCDwriter-2.8.0/configure 2007-04-30 18:43:42.000000000 +1200 -@@ -47,6 +47,9 @@ - --destDir=*) - DESTDIR=`echo $1 | sed "s:--destDir=::g"` - ;; -+ --javac-flags=*) -+ JAVACFLAGS=`echo $1 | sed "s:--javac-flags=::g"` -+ ;; - --doNotCompileCDWserver) - doNotCompileCDWserver="on" - ;; -@@ -105,6 +108,8 @@ - - --destDir use a prefix invisible to the installed files - -+--javac-flags Flags to pass to javac -+ - --doNotCompileCDWserver if you want to install CDWserver Pro - - --doNotCompileWebCDcreator use the precompiled and signed webCDcreator -@@ -152,7 +157,8 @@ - } - } - EOF --javac Test.java 2> /dev/null \ -+#2> /dev/null -+javac ${JAVACFLAGS} Test.java Test0.java \ - && webCDcreator="webCDcreator.jar $webCDcreator" \ - && echo " OK -> will build webCDcreator.jar" \ - || echo " not found -> will use precompiled webCDcreator.jar" -@@ -284,13 +290,17 @@ - forPluginRSA="" - fi - -+echo "JAVACFLAGS=${JAVACFLAGS}" -+ - cat webCDcreator/Makefile.in \ - | sed s/@nosCert@/"$nosCert"/g \ - | sed s/@sunCert@/"$sunCert"/g \ - | sed s/@all@/"$webCDcreator"/g \ - | sed s/@4pi@/"$forPlugin"/g \ - | sed s/@4ns@/"$forPluginRSA"/g \ -+ | sed s_@JAVACFLAGS@_"$JAVACFLAGS"_g \ - > webCDcreator/Makefile -+#| sed s_@JAVACFLAGS@_"\"$JAVACFLAGS\""_g \ - - - echo "Creating config" -diff -Naur webCDwriter-2.8.0.orig/webCDcreator/Makefile.in webCDwriter-2.8.0/webCDcreator/Makefile.in ---- webCDwriter-2.8.0.orig/webCDcreator/Makefile.in 2007-04-29 23:23:42.000000000 +1200 -+++ webCDwriter-2.8.0/webCDcreator/Makefile.in 2007-04-30 20:16:01.000000000 +1200 -@@ -14,6 +14,7 @@ - - nosCert=@nosCert@ - sunCert=@sunCert@ -+JAVACFLAGS=@JAVACFLAGS@ - - all: @all@ - -@@ -21,7 +22,7 @@ - $(MAKE) -C icons - - webCDcreator.jar: *.java icons/up.jpg -- javac -target 1.4 *.java -+ javac ${JAVACFLAGS} *.java netscape/security/*.java - jar cfm webCDcreator.jar Manifest \ - gpl.html \ - *.class \ diff --git a/app-cdr/webcdwriter/files/config-root.patch b/app-cdr/webcdwriter/files/config-root.patch deleted file mode 100644 index e13f5c8bc79a..000000000000 --- a/app-cdr/webcdwriter/files/config-root.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CDWserver/config/config-root.old 2004-02-08 00:31:09.000000000 +0100 -+++ CDWserver/config/config-root 2004-09-27 09:54:51.383252256 +0200 -@@ -3,5 +3,5 @@ - # /etc/init.d/CDWserver restart - # - --user=cdwserve --group=cdwserve -+#user=cdwserve -+#group=cdwserve diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild deleted file mode 100644 index c7fb984d6d72..000000000000 --- a/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild,v 1.4 2008/06/15 12:14:37 drac Exp $ - -inherit eutils java-pkg-2 - -MY_P="${P/cd/CD}" -DESCRIPTION="Make CD-writer(s) available to all users in your network" -HOMEPAGE="http://joerghaeger.de/webCDwriter/index.html" -SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="pam mp3 sox vorbis" - -RDEPEND=" - app-cdr/cdrdao - virtual/cdrtools - mp3? ( virtual/mpg123 ) - sox? ( media-sound/sox ) - vorbis? ( media-sound/vorbis-tools ) - >=virtual/jre-1.4 - app-misc/openjnlp" -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - rm -v "${S}"/MD5Verify/*.jar "${S}"/webCDcreator/4plugin/*.jar || die -} - -src_compile() { - epatch "${FILESDIR}/configure.patch" "${FILESDIR}/2.8.0-javac-flags.patch" - - local myconf - - local java_conf="$(java-pkg_javac-args) -classpath $(java-pkg_getjar openjnlp jnlp.jar)" - java_conf="${java_conf} -encoding ISO-8859-1" - use pam || myconf="--pam" - myconf="${myconf} --user=root --group=root" - ./configure ${myconf} --javac-flags="${java_conf}" || die "configure failed" - make || die "make failed" -} - -src_install() { - - newinitd "${FILESDIR}/${PN}.rc" CDWserver - - diropts -m700 - dodir /etc/CDWserver - keepdir /var/CDWserver/bin - dodir /var/CDWserver/export/Server/tools - dodir /var/CDWserver/http/rcdrecord - keepdir /var/CDWserver/projects - keepdir /var/log/CDWserver - keepdir /var/spool/CDWserver - - insinto /etc/CDWserver - - PORT="12411" - if use mp3 - then - MP3="on" - else - MP3="off" - fi - if use vorbis - then - OGG="on" - else - OGG="off" - fi - if use sox - then - AUDIO="on" - else - AUDIO="off" - fi - - cd "${S}"/CDWserver/config - cat config.default \ - | sed s*#portNo=12411*portNo=${PORT}*g \ - | sed s*#MP3decoding=on*MP3decoding=${MP3}*g \ - | sed s*"# ogg123"*oggDecoding=${OGG}*g \ - | sed s*#audioCDSupport=on*audioCDSupport=${AUDIO}*g \ - > config - for name in `find -name '[!M]*' -type f` - do - doins ${name} - done - - cd "${S}"/CDWserver/http - for dirname in `find -type d` - do - cd "${S}"/CDWserver/http/${dirname} - dodir /var/CDWserver/http/${dirname} - insinto /var/CDWserver/http/${dirname} - for name in `find -name '[!M]*' -type f` - do - doins ${name} - done - done - - cd "${S}"/CDWserver/test - make || die "make -C CDWserver/test failed" - for name in `find -type f -perm -111` - do - dobin ${name} - done - - insinto /var/CDWserver/http/rcdrecord - - cd "${S}"/rcdrecord - for name in `find -name '*.html'` - do - doins ${name} - done - - cd "${S}"/webCDcreator - cp start.html index.html - for dirname in `find -type d` - do - cd "${S}"/webCDcreator/${dirname} - dodir /var/CDWserver/http/webCDcreator/${dirname} - insinto /var/CDWserver/http/webCDcreator/${dirname} - for name in `find -type f` - do - if test "${name}" != Makefile - then - doins ${name} - fi - done - done - - cd "${S}"/tools - make || die "make -C tools failed" - mv CDWconfig.sh.tmp "${S}"/CDWserver/CDWconfig.sh - - cd "${S}" - - dosbin "${S}"/CDWserver/CDWconfig.sh - dosbin "${S}"/CDWserver/CDWserver - dobin "${S}"/CDWserver/CDWrootGate - dobin "${S}"/CDWserver/CDWverify - dobin "${S}"/CDWserver/setScheduler - dobin "${S}"/rcdrecord/rcdrecord - - dosym /usr/sbin/CDWserver /usr/sbin/CDWpasswd - dosym /usr/sbin/CDWserver /usr/sbin/CDWuseradd - dosym /usr/bin/rcdrecord /usr/bin/files2cd - dosym /usr/bin/rcdrecord /usr/bin/image2cd - - # back to defaults from -m700 - diropts -m755 - java-pkg_regjar "${D}"/var/CDWserver/http/webCDcreator/*.jar - - java-pkg_jarinto /var/CDWserver/export/Server/tools - java-pkg_dojar "${S}/MD5Verify/MD5Verify.jar" - - dodoc ChangeLog README CREDITS || die - dohtml *.html || die -} - -pkg_postinst() { - # ripped from the makefile - local PORTEXT - if [ "${PORT}" == "80" ] - then - PORTEXT="" - else - PORTEXT=":${PORT}" - fi - elog "To do:" - elog "1. Enter \"/etc/init.d/CDWserver start\" to start your webCDwriter" - elog "2. Open your web browser and try" - elog " \"http://127.0.0.1${PORTEXT}\" or \"http://`hostname`${PORTEXT}\"" - elog "to check the status of your webCDwriter" -# elog "3. Run \"/usr/sbin/CDWconfig.sh\" to set the rights of CDWserver" - echo - ewarn "Remember to setup /etc/CDWserver/config" -} diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild index d3245a890ad5..1c82342372a6 100644 --- a/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild +++ b/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild,v 1.3 2009/03/28 18:12:03 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild,v 1.4 2009/07/20 04:16:16 ssuominen Exp $ inherit eutils java-pkg-2 pam |