Replace xmlto --skip-validation patch with app-text/docbook-xml-dtd:4.1.2 dependency atom (#237132).

(Portage version: 2.1.4.5)

5 files changed, 18 insertions, 297 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 9d4591bd7e59..6ee1a2ad1597 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openswan
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.56 2008/12/06 00:17:30 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.57 2009/01/11 11:01:51 mrness Exp $
+
+  11 Jan 2009; Alin Năstac <mrness@gentoo.org>
+  -files/openswan-2.6.18-gentoo.patch, files/openswan-2.6.19-gentoo.patch,
+  -openswan-2.6.18.ebuild, openswan-2.6.19.ebuild:
+  Replace xmlto --skip-validation patch with app-text/docbook-xml-dtd:4.1.2
+  dependency atom (#237132).
 
   06 Dec 2008; Alin Năstac <mrness@gentoo.org> Manifest:
   Fix checksums of the openswan-2.6.18.tar.gz file (#249867).
diff --git a/net-misc/openswan/files/openswan-2.6.18-gentoo.patch b/net-misc/openswan/files/openswan-2.6.18-gentoo.patch
deleted file mode 100644
index fe493b3dc38a..000000000000
--- a/net-misc/openswan/files/openswan-2.6.18-gentoo.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nru openswan-2.6.18.orig/Makefile.inc openswan-2.6.18/Makefile.inc
---- openswan-2.6.18.orig/Makefile.inc	2008-10-12 16:30:24.000000000 +0000
-+++ openswan-2.6.18/Makefile.inc	2008-10-12 16:27:49.000000000 +0000
-@@ -49,7 +49,7 @@
- DESTDIR?=
- 
- # "local" part of tree, used in building other pathnames
--INC_USRLOCAL=/usr/local
-+INC_USRLOCAL?=/usr
- 
- # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
- # settings which are assumed to include it (or at least, to include *some*
-@@ -94,7 +94,7 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
- FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-diff -Nru openswan-2.6.18.orig/programs/Makefile openswan-2.6.18/programs/Makefile
---- openswan-2.6.18.orig/programs/Makefile	2008-10-12 16:30:24.000000000 +0000
-+++ openswan-2.6.18/programs/Makefile	2008-10-12 16:27:49.000000000 +0000
-@@ -42,7 +42,7 @@
- SUBDIRS+=_realsetup _secretcensor _startklips _updown _updown.klips _updown.mast
- SUBDIRS+=auto barf verify ipsec look newhostkey ranbits secrets
- SUBDIRS+=rsasigkey setup showdefaults showhostkey 
--SUBDIRS+=ikeping examples livetest
-+SUBDIRS+=ikeping examples
- ifeq ($(USE_KLIPS),true)
- SUBDIRS+= _startklips _updown.klips 
- endif
-diff -Nru openswan-2.6.18.orig/programs/Makefile.manpages openswan-2.6.18/programs/Makefile.manpages
---- openswan-2.6.18.orig/programs/Makefile.manpages	2008-10-06 16:52:49.000000000 +0000
-+++ openswan-2.6.18/programs/Makefile.manpages	2008-10-12 16:30:42.000000000 +0000
-@@ -1,15 +1,15 @@
- # xmlto is from http://cyberelk.net/tim/xmlto/
- ifneq ($(strip $(XMLTO)),)
- %.8: %.8.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
- 
- %.5: %.5.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
- 
- %.1: %.1.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
- endif
- 
-diff -Nru openswan-2.6.18.orig/programs/setup/Makefile openswan-2.6.18/programs/setup/Makefile
---- openswan-2.6.18.orig/programs/setup/Makefile	2008-10-12 16:30:24.000000000 +0000
-+++ openswan-2.6.18/programs/setup/Makefile	2008-10-12 16:27:49.000000000 +0000
-@@ -18,7 +18,6 @@
- 
- # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
- # not as /etc/rc.d/init.d/setup.
--PROGRAMDIR=$(RCDIR)
- PROGRAM=setup
- EXTRA8MAN=setup.8
- 
-@@ -29,32 +28,6 @@
- # into the $BINDIR.
- #
- # the priorities match those in setup's chkconfig line
--doinstall:: setup
--	@rm -f $(BINDIR)/setup
--	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
--	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
--
--install_file_list::
--	@echo $(RCDIR)/ipsec
--	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K76ipsec
--	@echo $(RCDIR)/../rc1.d/K76ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K76ipsec
--
--cleanall::
--	@rm -f setup
- 
- #
- # $Log: openswan-2.6.18-gentoo.patch,v $
- # Revision 1.1  2008/10/12 16:39:14  mrness
- # Remove livetest script wrt security bug #238574.
- # Skip xml validation (#237132).
- # (Portage version: 2.1.4.4, RepoMan options: --force)
- #
diff --git a/net-misc/openswan/files/openswan-2.6.19-gentoo.patch b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
index 45fa706a7f1b..608acf230d7d 100644
--- a/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
@@ -19,33 +19,6 @@ diff -Nru openswan-2.6.19.orig/Makefile.inc openswan-2.6.19/Makefile.inc
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
  FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-diff -Nru openswan-2.6.19.orig/programs/Makefile.manpages openswan-2.6.19/programs/Makefile.manpages
---- openswan-2.6.19.orig/programs/Makefile.manpages	2008-11-25 01:24:56.000000000 +0000
-+++ openswan-2.6.19/programs/Makefile.manpages	2008-12-03 23:09:27.000000000 +0000
-@@ -1,19 +1,19 @@
- # xmlto is from http://cyberelk.net/tim/xmlto/
- ifneq ($(strip $(XMLTO)),)
- %.8: %.8.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
- 
- %.5: %.5.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
- 
- %.2: %.2.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.3; do if [ -f $$m ]; then mv $$m $@; fi; done
- 
- %.1: %.1.xml
--	${XMLTO} man $< 
-+	${XMLTO} --skip-validation man $< 
- 	@for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
- endif
- 
 diff -Nru openswan-2.6.19.orig/programs/setup/Makefile openswan-2.6.19/programs/setup/Makefile
 --- openswan-2.6.19.orig/programs/setup/Makefile	2008-11-25 01:24:56.000000000 +0000
 +++ openswan-2.6.19/programs/setup/Makefile	2008-12-03 23:06:52.000000000 +0000
@@ -90,6 +63,10 @@ diff -Nru openswan-2.6.19.orig/programs/setup/Makefile openswan-2.6.19/programs/
  
  #
  # $Log: openswan-2.6.19-gentoo.patch,v $
+ # Revision 1.2  2009/01/11 11:01:51  mrness
+ # Replace xmlto --skip-validation patch with app-text/docbook-xml-dtd:4.1.2 dependency atom (#237132).
+ # (Portage version: 2.1.4.5)
+ #
  # Revision 1.1  2008/12/03 23:30:28  mrness
  # Remove obsolete versions.
  # Correct doc install path (#241976).
diff --git a/net-misc/openswan/openswan-2.6.18.ebuild b/net-misc/openswan/openswan-2.6.18.ebuild
deleted file mode 100644
index 6bf80fa8fb2d..000000000000
--- a/net-misc/openswan/openswan-2.6.18.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild,v 1.2 2008/12/03 23:30:28 mrness Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	app-text/xmlto"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use nocrypto-algorithms && ! use weak-algorithms; then
-		ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
-		ewarn "weak-algorithms USE flag is disabled"
-	fi
-
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			eerror "You need to have an IPsec enabled 2.4.x kernel."
-			eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	find . -regex '.*[.][1-8]' -exec sed -i \
-	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in xml docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF}/html \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	else
-		echo USE_EXTRACRYPTO=false
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-		if use nocrypto-algorithms; then
-			echo USE_NOCRYPTO=true
-		fi
-	fi
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_preinst() {
-	if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
-		ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
-		local i err=0
-		if [ -h "../ipsec.d" ]; then
-			rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
-		fi
-		for i in *; do
-			if [ -e "../$i" ]; then
-				eerror "  $i NOT MOVED, ../$i already exists!"
-				err=1
-			elif [ -d "$i" ]; then
-				mv "$i" .. || die "failed to move $i directory"
-				ewarn "  directory $i"
-			elif [ -f "$i" ]; then
-				sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
-					mv "$i" .. && ewarn "  file $i" || \
-					die "failed to move $i file"
-			else
-				eerror "  $i NOT MOVED, it is not a file nor a directory!"
-				err=1
-			fi
-		done
-		popd
-		if [ $err -eq 0 ]; then
-			rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
-		else
-			ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.6.19.ebuild b/net-misc/openswan/openswan-2.6.19.ebuild
index 66a3d4f34da4..084fbf29938d 100644
--- a/net-misc/openswan/openswan-2.6.19.ebuild
+++ b/net-misc/openswan/openswan-2.6.19.ebuild
@@ -1,6 +1,8 @@
-# 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/net-misc/openswan/openswan-2.6.19.ebuild,v 1.1 2008/12/03 23:30:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.19.ebuild,v 1.2 2009/01/11 11:01:51 mrness Exp $
+
+EAPI=1
 
 inherit eutils linux-info
 
@@ -21,7 +23,8 @@ COMMON_DEPEND="!net-misc/strongswan
 	ldap? ( net-nds/openldap )"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
-	app-text/xmlto"
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.1.2" # see bug 237132
 RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	sys-apps/iproute2"