diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-06-02 22:19:05 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-06-02 22:19:05 +0000 |
commit | 1da0191163e46e2bfaec1b8a5d53baf520b92ca0 (patch) | |
tree | ac2fea6dd3afe250f2ca336ab8e8874fcefcb920 /net-misc/cisco-vpnclient-3des | |
parent | Removing older ebuilds and marking 4.7.00.0640-r1 stable for the 4.7 series, ... (diff) | |
download | gentoo-2-1da0191163e46e2bfaec1b8a5d53baf520b92ca0.tar.gz gentoo-2-1da0191163e46e2bfaec1b8a5d53baf520b92ca0.tar.bz2 gentoo-2-1da0191163e46e2bfaec1b8a5d53baf520b92ca0.zip |
Fix a bug in the move code in pkg_postinst.
(Portage version: 2.1.5.3)
Diffstat (limited to 'net-misc/cisco-vpnclient-3des')
-rw-r--r-- | net-misc/cisco-vpnclient-3des/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog index 148d35099f9b..a153eea27995 100644 --- a/net-misc/cisco-vpnclient-3des/ChangeLog +++ b/net-misc/cisco-vpnclient-3des/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/cisco-vpnclient-3des # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.60 2008/06/02 22:16:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.61 2008/06/02 22:19:05 wolf31o2 Exp $ + + 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> + cisco-vpnclient-3des-4.8.01.0640.ebuild: + Fix a bug in the move code in pkg_postinst. 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> -cisco-vpnclient-3des-4.6.02.0030.ebuild, diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild index 00b961d00eb0..a12053a55573 100644 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild +++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild,v 1.2 2008/06/02 21:54:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.01.0640.ebuild,v 1.3 2008/06/02 22:19:05 wolf31o2 Exp $ inherit eutils linux-mod @@ -10,7 +10,6 @@ TARBALL="vpnclient-linux-x86_64-${MY_PV}.tar.gz" DESCRIPTION="Cisco VPN Client (3DES)" HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html" SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz" -#SRC_URI="http://tuxx-home.at/vpn/Linux/${TARBALL}" LICENSE="cisco-vpn-client" SLOT="0" @@ -49,11 +48,10 @@ src_unpack () { } src_install() { + local binaries="vpnclient ipseclog cisco_cert_mgr" linux-mod_src_install -# newinitd ${FILESDIR}/vpnclient.rc vpnclient # Binaries - binaries="vpnclient ipseclog cisco_cert_mgr" exeinto /opt/cisco-vpnclient/bin exeopts -m0111 doexe ${binaries} @@ -73,16 +71,16 @@ src_install() { doins *.pcf dodir ${CFGDIR}/Certificates - # Make sure we keep these, even if they're empty. - keepdir ${CFGDIR}/Certificates - keepdir ${CFGDIR}/Profiles - # Create some symlinks dodir /usr/bin for filename in ${binaries} do dosym ${VPNDIR}/bin/${filename} /usr/bin/${filename} done + + # Make sure we keep these, even if they're empty. + keepdir ${CFGDIR}/Certificates + keepdir ${CFGDIR}/Profiles } pkg_postinst() { @@ -91,7 +89,7 @@ pkg_postinst() { then elog "Found an old ${OLDCFG} configuration directory." elog "Moving ${OLDCFG} files to ${CFGDIR}." - cp -pPR ${OLDCFG}/* ${CFGDIR} && rm -f ${OLDCFG} + cp -pPR ${OLDCFG}/* ${CFGDIR} && rm -rf ${OLDCFG} fi if [ -e "/etc/init.d/vpnclient" ] then |