From 0f760187e9ea9167d03e78d7e496062bbfdacd4b Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 25 Nov 2011 00:34:29 +0000 Subject: [PATCH] Convert postinst message to REQUIRED_USE Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- www-client/links/ChangeLog | 4 ++-- www-client/links/Manifest | 18 +++++++++--------- www-client/links/links-2.4-r1.ebuild | 17 ++++++----------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog index b85ac561bd87..d8bc7c222493 100644 --- a/www-client/links/ChangeLog +++ b/www-client/links/ChangeLog @@ -1,9 +1,9 @@ # ChangeLog for www-client/links # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.141 2011/11/25 00:28:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.142 2011/11/25 00:34:29 ssuominen Exp $ 25 Nov 2011; Samuli Suominen links-2.4-r1.ebuild: - The binary name is links, not links2. Fix postinst message. + Convert postinst message to REQUIRED_USE: USE="svga" depend on USE="suid" 25 Nov 2011; Samuli Suominen -links-2.4.ebuild: old diff --git a/www-client/links/Manifest b/www-client/links/Manifest index 67f45f2f099d..13261301c3cd 100644 --- a/www-client/links/Manifest +++ b/www-client/links/Manifest @@ -6,17 +6,17 @@ AUX links-2.3_pre1-verify-ssl-certs.patch 1840 RMD160 7f38e7ddb1af06fc55cd23a749 DIST links-2.3pre1.tar.bz2 3832651 RMD160 f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de SHA1 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d SHA256 21ab49f2f24359ef2d0e634a7926f76419084bd792af28746323b2f16c229bde DIST links-2.4.tar.bz2 3843247 RMD160 9ede914cba25925356e3f69a3f40794821326235 SHA1 c09fcb03874b1d0586f582f73833bb2f4c9ed7ac SHA256 bebb6ccafaaabf1d251ccd79ff5cda07078a11bf7d15e775d6f3a0a89d4dd125 EBUILD links-2.3_pre1-r1.ebuild 3475 RMD160 8352313b0b496d876ebc3cea692c295b0fca1ada SHA1 12af946a7668405bd1f5e0de751c99d1d39d8622 SHA256 80f53c0db696f15084013fd9f6db351f77fcf4d5609fba77def9b84ce0ebd8dc -EBUILD links-2.4-r1.ebuild 3243 RMD160 0969cb8e19e7db80db189277a3bcd4310e3fa0e5 SHA1 7b576bda58231a8862e5a135928f3c80b2f6743f SHA256 d9bdd0fc7ae32ebb15621de8602507e9b4e9924d0076ec48a85815be99458d8b -MISC ChangeLog 29488 RMD160 15a5f6ffe0fcc8a4ca001bffc569775fab3c9b94 SHA1 f0560850d2ed8b523ccf799083cbb38af0b663ea SHA256 0e82bf1ff95601eb1c443d751f6e525f9b8fdae74b0f581b9e082f1e018f6a1f +EBUILD links-2.4-r1.ebuild 3032 RMD160 1f372a936c9f78428ba0c87c7d3dfb5f0cb71fb3 SHA1 dcebb62bc7f9a1590c32ee051a10ec7177815970 SHA256 8a6b4150115cc0784d7a0b4fd1a7bcc58e0a4d5fc62b37aaa0ef13771e94eb23 +MISC ChangeLog 29502 RMD160 e3064a4a8ccf9df9a2bcbb58b8c382870a0fdf54 SHA1 a7f25dc817ea584b5b0d24b071c468fcc6de005a SHA256 e6b72186fac84a7f0110bd24d2afa50ce94dcd80e598580f978456732ca2fb02 MISC metadata.xml 250 RMD160 7a90e29ad84aff28c2c6afa3bca41ddbe7f9aa75 SHA1 433036bcd0cfbbf1645c890e6211dc150b33be1c SHA256 353d603624c10b4af32b44438a7f53a6d166daa5cfce1fc90f8089b78e49a0f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOzuCTAAoJEEdUh39IaPFNsm0IAJXinr87GUZl7t1JEaN0ZWwM -qS76zWEh5SLSooX/2mmgYHeVI7nLA66+lwk13Ii1ce1upbbKpFy+URrUdYjOnB1G -+vRkVqW2CO+zE6oH0zM/5A8Dc07ieUX21je3FJDANqn/1V4MIrsQsQqutfxD01YC -b28vn63n8OMRdMh2R5MYJ1wGFhFFoltrgNkbanH8IS+NOfmNEVolk1Xf3nETGiI8 -B5byaG6xOHZ920Ck4/UPR1rPHV1F26tNgJ7Msc7QXZRuabQDrrPqxSssj3rI4Wtu -nVZqSU08TDTYVq9nxGfLHPQC4W+dJtJD+AeIlVln/b7W8VHlXN5z7/fwpsbJ9Ws= -=JL/J +iQEcBAEBAgAGBQJOzuIYAAoJEEdUh39IaPFNvnkH/3m62sRMggjDUOKouJp4zGxX +EcsLT8OK1TpHH6c/3RG4uNDM6rO4FYlrCNrJ5b8NuNt+K4C7lFZ2FRr5zVcmcQgD +3f9+C7/pDPgDdk/nrwA6R96hPoVJoGhvU1s2jHaL2QLEBqlK4ROH6OJnw29qnDt5 +dSl/DRDKwD03m1yho/BnUyx0VHmhS0rfLW1dYOTMaJiMv5uj1LhmCr6ujZOp7Nft +B452Ir5ER5GnzEedbxogjHPF4heAVYaP9vQ89TpwUtnZNzlhXln/hHJnPg5T1gxU +MmGeggZ8y16gKWk6WUl6mqbOwJ7dsw3oaR26iBU5+gu3NJRMCIiOupW0Pdx/eKY= +=4Zs/ -----END PGP SIGNATURE----- diff --git a/www-client/links/links-2.4-r1.ebuild b/www-client/links/links-2.4-r1.ebuild index 55491b4071da..7f815cd135ba 100644 --- a/www-client/links/links-2.4-r1.ebuild +++ b/www-client/links/links-2.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.4-r1.ebuild,v 1.2 2011/11/25 00:28:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.4-r1.ebuild,v 1.3 2011/11/25 00:34:29 ssuominen Exp $ EAPI=4 inherit autotools eutils @@ -12,7 +12,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2" LICENSE="GPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 directfb fbcon gpm jpeg livecd ssl svga tiff unicode X zlib" +IUSE="bzip2 directfb fbcon gpm jpeg livecd ssl suid svga tiff unicode X zlib" # Note: if X or fbcon usegflag are enabled, links will be built in graphic # mode. libpng is required to compile links in graphic mode @@ -48,6 +48,8 @@ RDEPEND="ssl? ( dev-libs/openssl:0 ) DEPEND="${RDEPEND} dev-util/pkgconfig" +REQUIRED_USE="svga? ( suid )" + DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO ) src_prepare() { @@ -87,7 +89,7 @@ src_configure() { myconf="${myconf} --with-libjpeg" fi - # $(use_with sdl) + # $(use_with sdl) econf \ $(use_with X x) \ $(use_with jpeg libjpeg) \ @@ -111,13 +113,6 @@ src_install() { dohtml doc/links_cal/* dosym links /usr/bin/links2 -} -pkg_postinst() { - if use svga; then - elog "You had the svga USE flag enabled, but for security reasons" - elog "the links binary is NOT setuid by default. In order to" - elog "enable links to work in SVGA, please change the permissions" - elog "of /usr/bin/links to enable suid." - fi + use suid && fperms 4755 /usr/bin/links } -- 2.26.2