version bump + security fix

4 files changed, 59 insertions, 31 deletions

diff --git a/net-www/links/ChangeLog b/net-www/links/ChangeLog
index 6a43bd47bbfb..bc97b3c0efde 100644
--- a/net-www/links/ChangeLog
+++ b/net-www/links/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-www/links
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/links/ChangeLog,v 1.14 2002/09/11 15:57:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/ChangeLog,v 1.15 2002/10/01 03:45:00 seemant Exp $
+
+*links-2.1_pre3 (30 Sep 2002)
+
+  30 Sep 2002; Seemant Kulleen <seemant@gentoo.org> links-2.1_pre3.ebuild
+  files/digest-links-2.1_pre3 :
+
+  Version bump + security fix.  If the user wishes to run links2 in svga
+  mode, they must now enable the suid bit themselves.  Closes bug #8556 by
+  vapier@gentoo.org
 
 *links-2.1_pre2 (11 Sep 2002)
 
diff --git a/net-www/links/files/digest-links-2.1_pre2-r1 b/net-www/links/files/digest-links-2.1_pre3
index d3dda5e8d4bb..95a20599c017 100644
--- a/net-www/links/files/digest-links-2.1_pre2-r1
+++ b/net-www/links/files/digest-links-2.1_pre3
@@ -1,2 +1,2 @@
-MD5 e8db2be73ebc47d2096e7496a0ec16bd links-2.1pre2.tar.bz2 3509541
+MD5 6c6fb4d5ae15c626599adf69f31ad67f links-2.1pre3.tar.bz2 3510812
 MD5 d52a2167074dda20abbdc95853a5a4f1 links-2.1_pre2-patch.tar.bz2 2287
diff --git a/net-www/links/links-2.1_pre2-r2.ebuild b/net-www/links/links-2.1_pre2-r2.ebuild
index b4a73131000f..eead294a1c92 100644
--- a/net-www/links/links-2.1_pre2-r2.ebuild
+++ b/net-www/links/links-2.1_pre2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre2-r2.ebuild,v 1.1 2002/09/11 15:57:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre2-r2.ebuild,v 1.2 2002/10/01 03:45:00 seemant Exp $
 
 DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
@@ -92,9 +92,19 @@ src_install (){
 	# Only install links icon if X driver was compiled in ...
 	use X && { insinto /usr/share/pixmaps ;	doins graphics/links.xpm ; }
 	
-	# links needs to be setuid for it to work with svga
-	use svga && { fperms 4755 /usr/bin/links2 ; }
-	
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES TODO
 	dohtml doc/links_cal/*
 }
+
+
+pkg_postinst() {
+
+	if use svga
+	then
+		einfo "You had the svga USE flag enabled, but for security reasons"
+		einfo "the links2 binary is NOT setuid by default. In order to"
+		einfo "enable links2 to work in SVGA, please change the permissions"
+		einfo "of /usr/bin/links2 to enable suid."
+	fi
+}
+
diff --git a/net-www/links/links-2.1_pre2-r1.ebuild b/net-www/links/links-2.1_pre3.ebuild
index ff50782287c3..9be8be7fdcf1 100644
--- a/net-www/links/links-2.1_pre2-r1.ebuild
+++ b/net-www/links/links-2.1_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre2-r1.ebuild,v 1.6 2002/08/30 00:09:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre3.ebuild,v 1.1 2002/10/01 03:45:00 seemant Exp $
 
 DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
@@ -15,6 +15,10 @@ SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
 
+# Note: if X or fbcon usegflag are enabled, links will be built in graphic mode. 
+# libpng is required to compile links in graphic mode (not required in text mode),
+# so let's add libpng for X? and fbcon?
+
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	gpm? ( sys-libs/gpm )
 	java? ( >=sys-devel/flex-2.5.4a )
@@ -22,23 +26,23 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svga? ( >=media-libs/svgalib-1.4.3 )
-	X? ( virtual/x11 )"
+	X? ( virtual/x11 >=media-libs/libpng-1.2.1 )
+	fbcon? ( >=media-libs/libpng-1.2.1 )"
 
 PROVIDE="virtual/textbrowser"
 
-src_compile ()
-{
-	local myconf
+src_compile (){
 
+	local myconf
 	myconf="--program-suffix=2"
 
 	use X \
-		&& myconf="${myconf} --with-x" \
+		&& myconf="${myconf} --enable-graphics --with-x" \
 		|| myconf="${myconf} --without-x"
 
 	use png \
-		&& myconf="${myconf} --enable-graphics --with-libpng" \
-		|| myconf="${myconf} --without-graphics --without-libpng"
+		&& myconf="${myconf} --with-libpng" \
+		|| myconf="${myconf} --without-libpng"
 
 	use jpeg \
 		&& myconf="${myconf} --with-libjpeg" \
@@ -53,7 +57,7 @@ src_compile ()
 		|| myconf="${myconf} --without-svgalib"
 
 	use fbcon \
-		&& myconf="${myconf} --with-fb" \
+		&& myconf="${myconf} --enable-graphics --with-fb" \
 		|| myconf="${myconf} --without-fb"
 
 	use ssl \
@@ -64,19 +68,21 @@ src_compile ()
 		&& myconf="${myconf} --enable-javascript" \
 		|| myconf="${myconf} --disable-javascript"
 
-	# ./configure only support 'gpm' features auto-detection, so if
+	# Note: --enable-static breaks.
+
+	# Note: ./configure only support 'gpm' features auto-detection, so if
 	# 'sys-libs/gpm' is compiled on your system, you'll compile links
 	# with gpm support ...
+
 	# This patch adds support for various little fixes
-	patch -p1 < ${WORKDIR}/links.patch || die
+	patch -p1 < ${WORKDIR}/links.patch || die "Failed to apply the patch"
 
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die "make failed"
 }
 
-src_install ()
-{
-	einstall || die "make install failed"
+src_install (){
+	einstall
 
 	if [ ! -f /usr/bin/links ]
 	then
@@ -84,17 +90,20 @@ src_install ()
 	fi
 
 	# Only install links icon if X driver was compiled in ...
-	use X && ( \
-		insinto /usr/share/pixmaps
-		doins graphics/links.xpm
-	)
-	
-	
-	# links needs to be setuid for it to work with svga
-	use svga && ( \
-		fperms 4755 /usr/bin/links2
-	)
+	use X && { insinto /usr/share/pixmaps ;	doins graphics/links.xpm ; }
 	
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES TODO
 	dohtml doc/links_cal/*
 }
+
+
+pkg_postinst() {
+
+	if use svga
+	then
+		einfo "You had the svga USE flag enabled, but for security reasons"
+		einfo "the links2 binary is NOT setuid by default. In order to"
+		einfo "enable links2 to work in SVGA, please change the permissions"
+		einfo "of /usr/bin/links2 to enable suid."
+	fi
+}