Version bump for security bug 171428.

Package-Manager: portage-2.1.2.3

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 2a856db9f00c9d51aecc2d86e07e43d490b982a1..f3323cf0e6cab99d79e73766a9a21feee9b2811b 100644 (file)
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/nas
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.51 2007/03/09 03:08:07 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.52 2007/04/02 14:22:38 drac Exp $
+
+*nas-1.8b (02 Apr 2007)
+
+  02 Apr 2007; Samuli Suominen <drac@gentoo.org> -nas-1.8.ebuild,
+  -nas-1.8-r1.ebuild, +nas-1.8b.ebuild:
+  Version bump for security bug 171428.
 
 *nas-1.8-r1 (09 Mar 2007)
 *nas-1.7-r2 (09 Mar 2007)

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 88f9217dfeb4ae6cedcf8aa2e10f9b3807a1a0e5..6d54a851646d941d4c5d2019ae36882d72300c59 100644 (file)
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -15,7 +15,7 @@ MD5 e533db5e64a7cf585a37091b49735c64 files/nas.init.d 569
 RMD160 ea95bfb27f9d0bfbcec23756e040a9feb278ea6b files/nas.init.d 569
 SHA256 c18a0dbf7313e5035e174a7913c7d0fd2f246bdd30b59e12d4a0ab23e2f223a2 files/nas.init.d 569
 DIST nas-1.7.src.tar.gz 1288569 RMD160 227ddc4f5f9d264c97066dc461bad138776d1dfd SHA1 a41adef84d0bf4c8e02b14d77bec0d284e7c9317 SHA256 6f7cf0167d35aa1c04b0ea105b29df39638f0cea172890715ead9e419d693435
-DIST nas-1.8.src.tar.gz 1290578 RMD160 c7c99d7c3f66d8255bd5708325bd5c71c73b0a47 SHA1 6752861196f0b11db93572d935dc87bc6c0da348 SHA256 e9b1e17f469c5db04f693c233886b78fce92fb48fe967976257eebadb09eb98d
+DIST nas-1.8b.src.tar.gz 1465387 RMD160 b3a4ee72ddc2d9a2e72d239ea2500b717022197a SHA1 5602091fbac5c5b6ecc72b2536e519b9f7dc83eb SHA256 0030978ecf0f48722bed434b3bf538c7c5d6f6ce345ba63ec0b8aef4923723e6
 EBUILD nas-1.7-r1.ebuild 1902 RMD160 50eea7fdbb6da5beaa07db96336b653b04efd2fc SHA1 2e3b737085cdd76ad78db4638b910cea803d79b2 SHA256 3717ff82afb11c2f85a0a0d10fbb60826379ddd2d44d61c5f8c823d1f969cb16
 MD5 7dfca199051b64b508b2e6e975e34cd9 nas-1.7-r1.ebuild 1902
 RMD160 50eea7fdbb6da5beaa07db96336b653b04efd2fc nas-1.7-r1.ebuild 1902
@@ -24,18 +24,14 @@ EBUILD nas-1.7-r2.ebuild 1981 RMD160 461e05a3156e177f8a2e9444346a415f9bc5e737 SH
 MD5 daf2baba8a5e97c2b4c77b8fb78953b9 nas-1.7-r2.ebuild 1981
 RMD160 461e05a3156e177f8a2e9444346a415f9bc5e737 nas-1.7-r2.ebuild 1981
 SHA256 27e34214ebed2f0e08687c540a54daa4362810db3ca0eb96539c2304df83c7c8 nas-1.7-r2.ebuild 1981
-EBUILD nas-1.8-r1.ebuild 1861 RMD160 2b27c022bb6b2cf5c57dc6ae09a1d30e42347c5a SHA1 15693355eb5a6ad150aae2d6e19e7cb193a00e64 SHA256 f956656145a9ae129324c04f7d551fc3d86cb1fc2395b70e64fe3bbdcd1bc721
-MD5 adc03ec8bc6c167b4a014c2b9d58fbe3 nas-1.8-r1.ebuild 1861
-RMD160 2b27c022bb6b2cf5c57dc6ae09a1d30e42347c5a nas-1.8-r1.ebuild 1861
-SHA256 f956656145a9ae129324c04f7d551fc3d86cb1fc2395b70e64fe3bbdcd1bc721 nas-1.8-r1.ebuild 1861
-EBUILD nas-1.8.ebuild 1787 RMD160 ad80a2a4450c5a6e17f75faed8a4844b3b086a1d SHA1 8aaad255cf15c958ce220d671911b255c067c549 SHA256 e426a71ac3943e3e3eefa54d5975cd1da6d6c3d409513c17f84f72e0d9e2bfab
-MD5 ea47673365d3dcc04769dc780a7f8e42 nas-1.8.ebuild 1787
-RMD160 ad80a2a4450c5a6e17f75faed8a4844b3b086a1d nas-1.8.ebuild 1787
-SHA256 e426a71ac3943e3e3eefa54d5975cd1da6d6c3d409513c17f84f72e0d9e2bfab nas-1.8.ebuild 1787
-MISC ChangeLog 6660 RMD160 3bac17b8539099e19ef20c3fdd9199055b9b830f SHA1 33917b1bb334f1cc1b2a8bfb0e33a743ae5f5d2a SHA256 b269fda9665d3d2a2b9818db6551cf4c879df8a185ab709d3e5f48ae1b081480
-MD5 790ce956c1e0289b1f4c5b1c538e4120 ChangeLog 6660
-RMD160 3bac17b8539099e19ef20c3fdd9199055b9b830f ChangeLog 6660
-SHA256 b269fda9665d3d2a2b9818db6551cf4c879df8a185ab709d3e5f48ae1b081480 ChangeLog 6660
+EBUILD nas-1.8b.ebuild 1801 RMD160 20c8fb6c744ca8595b75501143489eaa436cabaf SHA1 9d199b01c6b0010e06bde642bf5d9efb7fd82c27 SHA256 4ef81d20991d7cc3eedd0d0193310b163647675b37d0ebce39093a3c9c061a0b
+MD5 ce80fa388039111b9c1be3df914abb07 nas-1.8b.ebuild 1801
+RMD160 20c8fb6c744ca8595b75501143489eaa436cabaf nas-1.8b.ebuild 1801
+SHA256 4ef81d20991d7cc3eedd0d0193310b163647675b37d0ebce39093a3c9c061a0b nas-1.8b.ebuild 1801
+MISC ChangeLog 6829 RMD160 cbfb83fc392d094cc06e0b62ee810f21882d18c4 SHA1 20a41f1492e0508f139eb267a1c5cf78f426bd8e SHA256 060fd2b971ef62a14b74f050cdd1e27cbac51d8d39ee36819b15a3bf8c2d5474
+MD5 16418579ce98ae7c13387312e7d584c9 ChangeLog 6829
+RMD160 cbfb83fc392d094cc06e0b62ee810f21882d18c4 ChangeLog 6829
+SHA256 060fd2b971ef62a14b74f050cdd1e27cbac51d8d39ee36819b15a3bf8c2d5474 ChangeLog 6829
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -46,9 +42,6 @@ SHA256 07d5d2dec9c7efdc704a236eed234956e4c72b82733e4b7b63620dad17870495 files/di
 MD5 3f0f954c114436734c0525b1f499eaf5 files/digest-nas-1.7-r2 238
 RMD160 df9f7452a589a511ea39db78831736f32431c329 files/digest-nas-1.7-r2 238
 SHA256 07d5d2dec9c7efdc704a236eed234956e4c72b82733e4b7b63620dad17870495 files/digest-nas-1.7-r2 238
-MD5 32e9dfb48dc2e58f326fa1e8b5f751bd files/digest-nas-1.8 238
-RMD160 470cc3606f81dbeb2a3f135cb7c37108397ec133 files/digest-nas-1.8 238
-SHA256 d5afbbbd3bd3026d605285f61887cf9f580e24ce508177f2fb89e9d9d59fc6dc files/digest-nas-1.8 238
-MD5 32e9dfb48dc2e58f326fa1e8b5f751bd files/digest-nas-1.8-r1 238
-RMD160 470cc3606f81dbeb2a3f135cb7c37108397ec133 files/digest-nas-1.8-r1 238
-SHA256 d5afbbbd3bd3026d605285f61887cf9f580e24ce508177f2fb89e9d9d59fc6dc files/digest-nas-1.8-r1 238
+MD5 b0f6d27b69f0c72f51d4854abede36fb files/digest-nas-1.8b 241
+RMD160 50e7ad7cfc95dddbf51f6380f29d022b7636e921 files/digest-nas-1.8b 241
+SHA256 2bee54f0999bb6c897f1a089d5c64e8beef95d55bf64c67a86be19fb9bc1a9a8 files/digest-nas-1.8b 241

diff --git a/media-libs/nas/files/digest-nas-1.8 b/media-libs/nas/files/digest-nas-1.8
deleted file mode 100644 (file)
index f4e08f1..0000000
--- a/media-libs/nas/files/digest-nas-1.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e5ecab75a48c75b0c6305fcced34a97 nas-1.8.src.tar.gz 1290578
-RMD160 c7c99d7c3f66d8255bd5708325bd5c71c73b0a47 nas-1.8.src.tar.gz 1290578
-SHA256 e9b1e17f469c5db04f693c233886b78fce92fb48fe967976257eebadb09eb98d nas-1.8.src.tar.gz 1290578

diff --git a/media-libs/nas/files/digest-nas-1.8-r1 b/media-libs/nas/files/digest-nas-1.8-r1
deleted file mode 100644 (file)
index f4e08f1..0000000
--- a/media-libs/nas/files/digest-nas-1.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e5ecab75a48c75b0c6305fcced34a97 nas-1.8.src.tar.gz 1290578
-RMD160 c7c99d7c3f66d8255bd5708325bd5c71c73b0a47 nas-1.8.src.tar.gz 1290578
-SHA256 e9b1e17f469c5db04f693c233886b78fce92fb48fe967976257eebadb09eb98d nas-1.8.src.tar.gz 1290578

diff --git a/media-libs/nas/files/digest-nas-1.8b b/media-libs/nas/files/digest-nas-1.8b
new file mode 100644 (file)
index 0000000..bb32f19
--- /dev/null
+++ b/media-libs/nas/files/digest-nas-1.8b
@@ -0,0 +1,3 @@
+MD5 fcb9a74f4bf08f422a3d12c7e3698307 nas-1.8b.src.tar.gz 1465387
+RMD160 b3a4ee72ddc2d9a2e72d239ea2500b717022197a nas-1.8b.src.tar.gz 1465387
+SHA256 0030978ecf0f48722bed434b3bf538c7c5d6f6ce345ba63ec0b8aef4923723e6 nas-1.8b.src.tar.gz 1465387

diff --git a/media-libs/nas/nas-1.8-r1.ebuild b/media-libs/nas/nas-1.8-r1.ebuild
deleted file mode 100644 (file)
index 2bda4e6..0000000
--- a/media-libs/nas/nas-1.8-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.8-r1.ebuild,v 1.1 2007/03/09 03:08:07 beandog Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
-LICENSE="X11"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-RDEPEND="|| (
-               (
-                       x11-libs/libXt
-                       x11-libs/libXau
-                       x11-libs/libXaw
-                       x11-libs/libX11
-                       x11-libs/libXres
-                       x11-libs/libXTrap
-                       x11-libs/libXp
-               )
-               virtual/x11
-       )"
-DEPEND="${RDEPEND}
-       || (
-               ( x11-misc/gccmakedep x11-misc/imake app-text/rman x11-proto/xproto )
-               virtual/x11
-       )"
-
-src_compile() {
-       xmkmf || die
-       touch doc/man/lib/tmp.{_man,man}
-       emake \
-               MAKE="${MAKE:-gmake}" CDEBUGFLAGS="${CFLAGS}" CXXDEBUFLAGS="${CXXFLAGS}" \
-               CC="$(tc-getCC)" CXX="$(tc-getCXX)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-               RANLIB="$(tc-getRANLIB)" World || die
-}
-
-src_install () {
-       make DESTDIR=${D} install || die
-       make DESTDIR=${D} install.man || die
-
-       dodoc BUGS BUILDNOTES FAQ HISTORY README RELEASE TODO
-       mv ${D}/usr/lib/X11/doc/html ${D}/usr/share/doc/${P}/
-       rmdir ${D}/usr/lib/X11/doc
-       use doc && dodoc doc/*.ps doc/protocol.txt doc/pdf/*.pdf doc/actions
-
-       # rename example nasd.conf.eg to nasd.conf and change it so that NAS
-       # doesn't change mixer's settings (inspired by Debian package):
-       mv ${D}/etc/nas/nasd.conf{.eg,}
-       sed -i -e 's,\(MixerInit.*\)"\(.*\)",\1"no",' ${D}/etc/nas/nasd.conf
-
-       newconfd "${FILESDIR}"/nas.conf.d nas
-       newinitd "${FILESDIR}"/nas.init.d nas
-}
-
-pkg_postinst() {
-       elog "To enable NAS on boot you will have to add it to the"
-       elog "default profile, issue the following command as root to do so."
-       elog ""
-       elog "rc-update add nas default"
-}

diff --git a/media-libs/nas/nas-1.8.ebuild b/media-libs/nas/nas-1.8b.ebuild
similarity index 60%
rename from media-libs/nas/nas-1.8.ebuild
rename to media-libs/nas/nas-1.8b.ebuild
index f0d4044525da30a0b36c3e703d011c06a6828f3a..770f60d9704347d38855f028858b3d8bc370325a 100644 (file)
--- a/media-libs/nas/nas-1.8.ebuild
+++ b/media-libs/nas/nas-1.8b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.8.ebuild,v 1.1 2007/01/31 14:46:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.8b.ebuild,v 1.1 2007/04/02 14:22:38 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,47 +11,41 @@ SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 LICENSE="X11"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="|| (
-               (
-                       x11-libs/libXt
-                       x11-libs/libXau
-                       x11-libs/libXaw
-                       x11-libs/libX11
-                       x11-libs/libXres
-                       x11-libs/libXTrap
-                       x11-libs/libXp
-               )
-               virtual/x11
-       )"
+IUSE="doc"
+
+RDEPEND="x11-libs/libXt
+       x11-libs/libXau
+       x11-libs/libXaw
+       x11-libs/libX11
+       x11-libs/libXres
+       x11-libs/libXTrap
+       x11-libs/libXp"
 DEPEND="${RDEPEND}
-       || (
-               ( x11-misc/gccmakedep x11-misc/imake app-text/rman x11-proto/xproto )
-               virtual/x11
-       )"
+       x11-misc/gccmakedep
+       x11-misc/imake
+       app-text/rman
+       x11-proto/xproto"
 
 src_compile() {
-       xmkmf || die
+       xmkmf || die "xmkmf failed."
        touch doc/man/lib/tmp.{_man,man}
        emake \
                MAKE="${MAKE:-gmake}" CDEBUGFLAGS="${CFLAGS}" CXXDEBUFLAGS="${CXXFLAGS}" \
                CC="$(tc-getCC)" CXX="$(tc-getCXX)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-               RANLIB="$(tc-getRANLIB)" World || die
+               RANLIB="$(tc-getRANLIB)" World || die "emake failed."
 }
 
 src_install () {
-       make DESTDIR=${D} install || die
-       make DESTDIR=${D} install.man || die
+       emake DESTDIR="${D}" install || die "emake install failed."
+       emake DESTDIR="${D}" install.man || die "emake install.man failed."
 
        dodoc BUGS BUILDNOTES FAQ HISTORY README RELEASE TODO
-       mv ${D}/usr/lib/X11/doc/html ${D}/usr/share/doc/${P}/
-       rmdir ${D}/usr/lib/X11/doc
+       use doc && dodoc doc/*.ps doc/{actions,README} doc/pdf/*.pdf doc/*.txt
 
        # rename example nasd.conf.eg to nasd.conf and change it so that NAS
        # doesn't change mixer's settings (inspired by Debian package):
-       mv ${D}/etc/nas/nasd.conf{.eg,}
-       sed -i -e 's,\(MixerInit.*\)"\(.*\)",\1"no",' ${D}/etc/nas/nasd.conf
+       mv "${D}"/etc/nas/nasd.conf{.eg,}
+       sed -i -e 's,\(MixerInit.*\)"\(.*\)",\1"no",' "${D}"/etc/nas/nasd.conf
 
        newconfd "${FILESDIR}"/nas.conf.d nas
        newinitd "${FILESDIR}"/nas.init.d nas