chown/symlink fixed, see bug 63492

5 files changed, 138 insertions, 13 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 868373a6b31e..e263f4271f14 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.2 2004/09/05 09:48:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.3 2004/09/10 12:21:07 axxo Exp $
+
+*resin-3.0.8-r1 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/3.0.8/21resin,
+  +resin-3.0.8-r1.ebuild:
+  fixed the symlink and the conf chown also added a check if /opt/resin/conf is
+  a dir (from 2.* ebuilds), and if it is, i move the files too
+  /etc/resin/conf.old. So that portage can created the symlink.
+  closes bug 63492
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index e1d3f02145b8..c17990bb9c70 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,30 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 c6ac8b0afe779cda1df12ee7b473dad0 resin-3.0.8.ebuild 3014
+MD5 ae2b03bae733ba6d0a59302875cf23a3 resin-3.0.8-r1.ebuild 3362
+MD5 3b641df3d2e748435a72e9f308a28ad4 ChangeLog 2378
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 7b1f9d3091643f8aaaa19772551aacf3 resin-2.1.14.ebuild 3052
 MD5 34a8e54526d21c5cc6b31c7613e70846 resin-2.1.9.ebuild 3122
-MD5 c6ac8b0afe779cda1df12ee7b473dad0 resin-3.0.8.ebuild 3014
-MD5 dab83cd279b9bdeca47f77d65931c011 ChangeLog 2028
 MD5 0e0d2bb7422b3b0f88fe7bb4302738a1 files/digest-resin-2.1.14 65
 MD5 5837c42d665786c9555b544428725ff6 files/digest-resin-2.1.9 64
 MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8 64
-MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.14/21resin 53
-MD5 94a0740742735629f269e776256d09bf files/2.1.14/resin.conf 1178
-MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.14/resin.diff 504
-MD5 fdd22c5f252db48ef11406b278e267be files/2.1.14/resin.init 751
-MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.9/21resin 53
+MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8-r1 64
 MD5 85812327677476a68fcf9739e9617191 files/2.1.9/resin.conf 1238
 MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.9/resin.diff 504
 MD5 d528c215693863001ba2ddd1c002c61e files/2.1.9/resin.init 750
-MD5 a810be4b68e920ebc5d2cf8160a5642a files/3.0.8/21resin 53
+MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.9/21resin 53
 MD5 033efd80975c8c86d388f3389eb352c8 files/3.0.8/resin.conf 1126
 MD5 4aee09a4e9a32217579c5cf7e73f2c71 files/3.0.8/resin.init 545
+MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.8/21resin 22
 MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.8/wrapper.pl.diff 526
+MD5 94a0740742735629f269e776256d09bf files/2.1.14/resin.conf 1178
+MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.14/resin.diff 504
+MD5 fdd22c5f252db48ef11406b278e267be files/2.1.14/resin.init 751
+MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.14/21resin 53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBOuD7I1lqEGTUzyQRAmzqAJ0fHh64EqkJCVGarho1v+3TAxzhvgCgsBI7
-5S4xcdd3NZsgPfRkZWf0WcQ=
-=gSTX
+iD8DBQFBQZyQ/rLF9B432nYRAo0yAJ9R2SFz0GErFfdNK7LeJ9NBT75NYQCeO9kZ
++IuBDGQzRUuMfZiC9w5CJfk=
+=UT3o
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.8/21resin b/www-servers/resin/files/3.0.8/21resin
index 5a3ecc5b6e96..8ebed2d0a4f8 100644
--- a/www-servers/resin/files/3.0.8/21resin
+++ b/www-servers/resin/files/3.0.8/21resin
@@ -1,2 +1 @@
 RESIN_HOME=/opt/resin
-CONFIG_PROTECT=/opt/resin/conf
diff --git a/www-servers/resin/files/digest-resin-3.0.8-r1 b/www-servers/resin/files/digest-resin-3.0.8-r1
new file mode 100644
index 000000000000..129da14e35e0
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.0.8-r1
@@ -0,0 +1 @@
+MD5 30498b230b287d45ce914befdeaa0fee resin-3.0.8.tar.gz 5757738
diff --git a/www-servers/resin/resin-3.0.8-r1.ebuild b/www-servers/resin/resin-3.0.8-r1.ebuild
new file mode 100644
index 000000000000..1e9b7e6141c3
--- /dev/null
+++ b/www-servers/resin/resin-3.0.8-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.8-r1.ebuild,v 1.1 2004/09/10 12:21:07 axxo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine with EJB and distributed session load balancing."
+SRC_URI="http://www.caucho.com/download/${P}.tar.gz"
+HOMEPAGE="http://www.caucho.com"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+LICENSE="CAUCHO"
+SLOT="0"
+DEPEND="!net-www/resin-ee"
+RDEPEND=">=virtual/jdk-1.3
+		dev-lang/perl"
+IUSE=""
+
+RESIN_HOME="/opt/resin"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/wrapper.pl.diff
+}
+
+pkg_preinst() {
+	enewgroup resin
+	enewuser resin -1 /bin/bash /opt/resin resin
+	chown -R resin:resin ${D}${RESIN_HOME}
+	chown -R resin:resin ${D}/var/log/${PN}
+	chown -R resin:resin ${D}/etc/resin
+	# when updating from resin 2, move things to there new location
+	if [ ! -L ${RESIN_HOME}/conf ]; then
+		if [ ! -d /etc/resin ]; then
+			mkdir /etc/resin
+			chown resin:resin /etc/resin
+		fi
+		mv ${RESIN_HOME}/conf/ /etc/resin/conf.old
+	fi
+}
+
+src_compile() {
+	./configure --prefix=${D}${RESIN_HOME}
+	make
+}
+
+src_install() {
+	dodir ${RESIN_HOME} /etc/resin
+	cp -r libexec bin webapps doc ${D}${RESIN_HOME}
+
+	dodir /etc/resin
+	cp -r conf/* ${D}/etc/resin/
+	dosym /etc/resin ${RESIN_HOME}/conf
+
+	dodir /var/log/${PN}
+	dosym /var/log/${PN} ${RESIN_HOME}/logs
+	keepdir /var/log/${PN}/
+
+	# INIT SCRIPTS AND ENV
+	insinto /etc/init.d ; insopts -m0750 ; newins ${FILESDIR}/${PV}/resin.init resin
+	insinto /etc/conf.d ; insopts -m0755 ; newins ${FILESDIR}/${PV}/resin.conf resin
+	insinto /etc/env.d  ; insopts -m0755 ; doins ${FILESDIR}/${PV}/21resin
+
+	dodoc LICENSE readme.txt
+	java-pkg_dojar ${S}/lib/*.jar
+
+	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
+}
+
+pkg_postinst() {
+	einfo
+	einfo " NOTICE!"
+	einfo " User and group 'resin' have been added."
+	einfo " "
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Resin home directory: ${RESIN_HOME}"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/resin"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Logs:  /var/log/resin/"
+	einfo " 4.  Executables, libraries:  /usr/share/resin/"
+	einfo
+	einfo "If you are updating from resin-2* your old configuration files"
+	einfo "have been moved to /etc/resin/conf.old"
+	einfo " "
+	einfo " STARTING AND STOPPING RESIN:"
+	einfo "   /etc/init.d/resin start"
+	einfo "   /etc/init.d/resin stop"
+	einfo "   /etc/init.d/resin restart"
+	einfo
+	einfo
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Resin runs on port 8080.  You can change this"
+	einfo " value by editing ${RESIN_HOME}/conf/resin.conf."
+	einfo
+	einfo " To test Resin while it's running, point your web browser to:"
+	einfo " http://localhost:8080/"
+	einfo
+	einfo " Resin cannot run on port 80 as non-root (as of this time)."
+	einfo " The best way to get Resin to respond on port 80 is via port"
+	einfo " forwarding -- by installing a firewall on the machine running"
+	einfo " Resin or the network gateway.  Simply redirect port 80 to"
+	einfo " port 8080."
+	einfo
+	einfo " BUGS:"
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo
+}
+
+pkg_postrm() {
+	einfo "You may want to remove the resin user and group"
+}
+