updated scrollkeeper to the latest version, fixes the tempfile vuln upstream, made some changes to the patch.

4 files changed, 116 insertions, 1 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 8d8a566325f7..3ddf3ca50ee3 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for app-text/scrollkeeper
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.20 2002/12/13 10:56:20 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.21 2003/01/24 06:41:45 spider Exp $
 
+*scrollkeeper-0.3.12 (24 Jan 2003)
+  
+  24 Jan 2003; Spider <spider@gentoo.org> : scrollkeeper-0.3.12.ebuild: 
+  First official release in ages, now fixes the tempfile vulnerability and 
+  other bugs from previous version. I had to remake the install-data patch due 
+  to some slight changes to the Makefile.in. nothing big here.
+  
+  
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *scrollkeeper-0.3.11-r1 (04 Sep 2002)
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.12 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.12
new file mode 100644
index 000000000000..c09b70568ec8
--- /dev/null
+++ b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.12
@@ -0,0 +1 @@
+MD5 7d8eb0717345f09281d52e2523ae4f94 scrollkeeper-0.3.12.tar.gz 541937
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.12-gentoo.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.12-gentoo.diff
new file mode 100644
index 000000000000..fb483cbd1906
--- /dev/null
+++ b/app-text/scrollkeeper/files/scrollkeeper-0.3.12-gentoo.diff
@@ -0,0 +1,10 @@
+--- extract/dtds/Makefile.in.old	2003-01-24 06:52:13.000000000 +0100
++++ extract/dtds/Makefile.in	2003-01-24 06:52:39.000000000 +0100
+@@ -297,7 +297,6 @@
+ 
+ install-data-am: install-dtdsHEADERS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-exec-am:
+ 
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
new file mode 100644
index 000000000000..00c2caffd584
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild,v 1.1 2003/01/24 06:41:45 spider Exp $
+
+IUSE="nls"
+
+inherit libtool
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Scrollkeeper"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://scrollkeeper.sourceforge.net"
+
+SLOT="0"
+LICENSE="FDL-1.1 LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+RDEPEND=">=dev-libs/libxml2-2.4.19
+	>=dev-libs/libxslt-1.0.14
+	>=sys-libs/zlib-1.1.3
+	>=app-text/docbook-xml-dtd-4.1.2-r2
+	>=app-text/docbook-sgml-utils-0.6.6"
+
+DEPEND="${RDEPEND}
+	 >=dev-util/intltool-0.17
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	patch -p0< ${FILESDIR}/${P}-gentoo.diff || die
+}
+	
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+
+	use nls || {
+		myconf="${myconf} --disable-nls"
+		# Not existing can cause ./configure to fail in some cases.
+		touch ${S}/intl/libintl.h
+	}
+
+	# hack around some to make sure we find the libxml2 includes. odd bug.
+	#CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
+				
+	econf \
+		--localstatedir=/var \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS INSTALL TODO COPYING* ChangeLog README NEWS
+}
+
+pkg_preinst() {
+	if [ -d ${ROOT}/usr/share/scrollkeeper/Templates ]
+	then
+		rm -rf ${ROOT}/usr/share/scrollkeeper/Templates
+	fi
+}
+
+pkg_postinst() {
+	echo ">>> Installing catalog..."
+	${ROOT}/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+		"`echo "${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" |sed -e "s://:/:g"`" \
+		${ROOT}/etc/xml/catalog
+	echo ">>> Rebuilding Scrollkeeper database..."	
+	scrollkeeper-rebuilddb -q -p ${ROOT}/var/lib/scrollkeeper
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update -v &>${T}/foo
+}
+
+pkg_postrm() {
+	if [ ! -x ${ROOT}/usr/bin/scrollkeeper-config ]
+	then
+		# SK is being removed, not upgraded.
+		# Remove all generated files
+		einfo ">>> Cleaning up ${ROOT}/var/lib/scrollkeeper..."
+		rm -rf ${ROOT}/var/lib/scrollkeeper
+		rm -rf ${ROOT}/var/log/scrollkeeper.log
+		rm -rf ${ROOT}/var/log/scrollkeeper.log.1
+		${ROOT}/usr/bin/xmlcatalog --noout --del \
+			"${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
+			${ROOT}/etc/xml/catalog
+
+		einfo ">>> Scrollkeeper ${PV} unmerged, if you removed the package"
+		einfo ">>> you might want to clean up /var/lib/scrollkeeper."
+	fi
+}