diff options
author | Heinrich Wendel <lanius@gentoo.org> | 2005-01-28 18:26:28 +0000 |
---|---|---|
committer | Heinrich Wendel <lanius@gentoo.org> | 2005-01-28 18:26:28 +0000 |
commit | dd6ce940f0b9b7ab2c4d44191c5daa21aa06f624 (patch) | |
tree | edbaa4f559d75cc74b5cbea0ffd34edbb1e4e5da /net-print | |
parent | Keyworded ~sparc (diff) | |
download | gentoo-2-dd6ce940f0b9b7ab2c4d44191c5daa21aa06f624.tar.gz gentoo-2-dd6ce940f0b9b7ab2c4d44191c5daa21aa06f624.tar.bz2 gentoo-2-dd6ce940f0b9b7ab2c4d44191c5daa21aa06f624.zip |
security bump, bug #75484
(Portage version: 2.0.51-r15)
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/lprng/ChangeLog | 10 | ||||
-rw-r--r-- | net-print/lprng/Manifest | 11 | ||||
-rw-r--r-- | net-print/lprng/files/digest-lprng-3.8.22 | 1 | ||||
-rw-r--r-- | net-print/lprng/files/digest-lprng-3.8.26 | 1 | ||||
-rw-r--r-- | net-print/lprng/files/digest-lprng-3.8.27-r1 | 1 | ||||
-rw-r--r-- | net-print/lprng/files/lprng-3.8.27-certs.diff | 38 | ||||
-rw-r--r-- | net-print/lprng/lprng-3.8.26.ebuild | 79 | ||||
-rw-r--r-- | net-print/lprng/lprng-3.8.27-r1.ebuild (renamed from net-print/lprng/lprng-3.8.22.ebuild) | 13 | ||||
-rw-r--r-- | net-print/lprng/lprng-3.8.27.ebuild | 4 |
9 files changed, 66 insertions, 92 deletions
diff --git a/net-print/lprng/ChangeLog b/net-print/lprng/ChangeLog index 86166fdc0c48..429f681e0b3d 100644 --- a/net-print/lprng/ChangeLog +++ b/net-print/lprng/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-print/lprng -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/ChangeLog,v 1.31 2004/12/29 21:03:27 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/ChangeLog,v 1.32 2005/01/28 18:26:28 lanius Exp $ + +*lprng-3.8.27-r1 (28 Jan 2005) + + 28 Jan 2005; lanius@gentoo.org -lprng-3.8.22.ebuild, -lprng-3.8.26.ebuild, + +lprng-3.8.27-r1.ebuild: + security bump, bug #75484 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest index a729fe616be6..95e16f4f3009 100644 --- a/net-print/lprng/Manifest +++ b/net-print/lprng/Manifest @@ -1,10 +1,13 @@ -MD5 bcab488ba84ea198f8afb1639717137b ChangeLog 3833 +MD5 b528f119db035d291af5a88fd171f2c3 lprng-3.8.27.ebuild 1807 MD5 3cc0d1ed494967635b0984d03b3f4d16 lprng-3.8.22.ebuild 1800 +MD5 03ba5770f3a1485d667c8b4cd3f5b05d lprng-3.8.27-r1.ebuild 1927 MD5 ab06de858568eb58573224f76c22a170 lprng-3.8.26.ebuild 1800 -MD5 b528f119db035d291af5a88fd171f2c3 lprng-3.8.27.ebuild 1807 +MD5 bcab488ba84ea198f8afb1639717137b ChangeLog 3833 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 MD5 f7abb2ab05992f3730ba5177a60f67fc files/digest-lprng-3.8.22 63 -MD5 12c153fc04ca287e8fb301045a5b10ca files/digest-lprng-3.8.27 63 MD5 dfa3c66fd99b0bb9ed02f64ac334fa68 files/digest-lprng-3.8.26 63 -MD5 765668889fe2508c644ecee836c56730 files/lprng-init 994 +MD5 12c153fc04ca287e8fb301045a5b10ca files/digest-lprng-3.8.27 63 MD5 424d8420ea629d52426c661f6b2bcf58 files/printcap 661 +MD5 765668889fe2508c644ecee836c56730 files/lprng-init 994 +MD5 ab332fe22ea25ab080aae7fd36262a5a files/lprng-3.8.27-certs.diff 1120 +MD5 12c153fc04ca287e8fb301045a5b10ca files/digest-lprng-3.8.27-r1 63 diff --git a/net-print/lprng/files/digest-lprng-3.8.22 b/net-print/lprng/files/digest-lprng-3.8.22 deleted file mode 100644 index a0c27436cc3c..000000000000 --- a/net-print/lprng/files/digest-lprng-3.8.22 +++ /dev/null @@ -1 +0,0 @@ -MD5 ac7742d87433ea6908517ddb3b8a648a LPRng-3.8.22.tgz 15792576 diff --git a/net-print/lprng/files/digest-lprng-3.8.26 b/net-print/lprng/files/digest-lprng-3.8.26 deleted file mode 100644 index af3f884bc63e..000000000000 --- a/net-print/lprng/files/digest-lprng-3.8.26 +++ /dev/null @@ -1 +0,0 @@ -MD5 654a4a05a9b43b7592060a57c743c940 LPRng-3.8.26.tgz 10557934 diff --git a/net-print/lprng/files/digest-lprng-3.8.27-r1 b/net-print/lprng/files/digest-lprng-3.8.27-r1 new file mode 100644 index 000000000000..e1c02e7a75ac --- /dev/null +++ b/net-print/lprng/files/digest-lprng-3.8.27-r1 @@ -0,0 +1 @@ +MD5 987006ed2bcb48b50772bdff4dfc3327 LPRng-3.8.27.tgz 10574042 diff --git a/net-print/lprng/files/lprng-3.8.27-certs.diff b/net-print/lprng/files/lprng-3.8.27-certs.diff new file mode 100644 index 000000000000..13b9051aea0c --- /dev/null +++ b/net-print/lprng/files/lprng-3.8.27-certs.diff @@ -0,0 +1,38 @@ +--- LPRng-3.8.27/src/lprng_certs.orig 2004-12-20 00:29:21.000000000 +0100 ++++ LPRng-3.8.27/src/lprng_certs.sh 2004-12-20 00:33:49.000000000 +0100 +@@ -320,7 +320,9 @@ + # set default values + + +-CFG=/tmp/$$.sslcfg ++TMPDIR=`mktemp -d -t lprng.XXXXXX` || { echo "$0: Cannot create temporary directory!" >&2 ; exit 1; } ++trap "/bin/rm -rf ${TMPDIR}" 0 1 2 3 13 15 ++CFG=$TMPDIR/sslcfg + + OPENSSL=/usr/bin/openssl + CA_KEY=//etc/lprng/ssl.ca/ca.key +@@ -508,14 +510,14 @@ + shift + if [ "$1" = "" ] ; then usage; fi; + if [ ! -f "$1" ] ; then useage; fi; +- sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >/tmp/$$.key +- sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >/tmp/$$.crt +- STEP="" encrypt /tmp/$$.key ++ sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >$TMPDIR/key ++ sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >$TMPDIR/crt ++ STEP="" encrypt $TMPDIR/key + status=$? + echo STATUS $status + if [ $status = 0 ] ; then + mv $1 $1.orig +- cat /tmp/$$.crt /tmp/$$.key >$1 ++ cat $TMPDIR/crt $TMPDIR/key >$1 + fi + ;; + +@@ -845,5 +847,4 @@ + exit 1 + ;; + esac +-rm -f ${CFG} + exit $RET diff --git a/net-print/lprng/lprng-3.8.26.ebuild b/net-print/lprng/lprng-3.8.26.ebuild deleted file mode 100644 index 7bb175f2f1eb..000000000000 --- a/net-print/lprng/lprng-3.8.26.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.26.ebuild,v 1.9 2004/11/09 21:28:09 mr_bones_ Exp $ - -inherit eutils flag-o-matic - -IUSE="nls" - -MY_PN=LPRng - -S=${WORKDIR}/${MY_PN}-${PV} -DESCRIPTION="Extended implementation of the Berkeley LPR print spooler" -HOMEPAGE="http://www.lprng.com/" -KEYWORDS="x86 ppc sparc alpha hppa ~amd64" -SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz" - -PROVIDE="virtual/lpr" - -DEPEND="virtual/libc - sys-apps/procps - nls? ( sys-devel/gettext )" - -RDEPEND="virtual/libc - sys-apps/procps - !virtual/lpr" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" - -src_compile() { - local myconf - use nls && myconf="--enable-nls" - - # wont compile with -O3, needs -O2 - replace-flags -O[3-9] -O2 - - ./configure \ - --prefix=/usr \ - --disable-setuid \ - --with-userid=lp \ - --with-groupid=lp \ - --with-lpd_conf_path=/etc/lprng/lpd.conf \ - --with-lpd_perms_path=/etc/lprng/lpd.perms \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc/lprng \ - --mandir=/usr/share/man \ - --host=${CHOST} ${myconf} || die - - make || die "printer on fire!" -} - -src_install() { - dodir /var/spool/lpd - diropts -m 700 -o lp -g lp - dodir /var/spool/lpd/lp - - make install \ - DESTDIR=${D} \ - POSTINSTALL="NO" \ - gnulocaledir=${D}/usr/share/locale || die - - # now included in foomatic 3.0 - #exeinto /usr/bin - #doexe ${FILESDIR}/lpdomatic - - dodoc CHANGES COPYRIGHT LICENSE README VERSION \ - HOWTO/LPRng-HOWTO.pdf ${FILESDIR}/printcap \ - lpd.conf lpd.perms - dohtml HOWTO/* - - insinto /etc/lprng - doins ${FILESDIR}/printcap lpd.conf lpd.perms - exeinto /etc/init.d - newexe ${FILESDIR}/lprng-init lprng -} - -pkg_postinst() { - einfo "If printing does not work, try 'checkpc'/'checkpc -f'" -} diff --git a/net-print/lprng/lprng-3.8.22.ebuild b/net-print/lprng/lprng-3.8.27-r1.ebuild index b891ac120af9..4c5b526d400a 100644 --- a/net-print/lprng/lprng-3.8.22.ebuild +++ b/net-print/lprng/lprng-3.8.27-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.22.ebuild,v 1.12 2004/11/09 21:28:09 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.27-r1.ebuild,v 1.1 2005/01/28 18:26:28 lanius Exp $ inherit eutils flag-o-matic @@ -11,7 +11,7 @@ MY_PN=LPRng S=${WORKDIR}/${MY_PN}-${PV} DESCRIPTION="Extended implementation of the Berkeley LPR print spooler" HOMEPAGE="http://www.lprng.com/" -KEYWORDS="x86 ppc sparc alpha hppa amd64" +KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa amd64 ~mips" SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz" PROVIDE="virtual/lpr" @@ -27,6 +27,12 @@ RDEPEND="virtual/libc LICENSE="|| ( GPL-2 Artistic )" SLOT="0" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-certs.diff +} + src_compile() { local myconf use nls && myconf="--enable-nls" @@ -70,6 +76,7 @@ src_install() { insinto /etc/lprng doins ${FILESDIR}/printcap lpd.conf lpd.perms + dosym /etc/lprng/printcap /etc/printcap exeinto /etc/init.d newexe ${FILESDIR}/lprng-init lprng } diff --git a/net-print/lprng/lprng-3.8.27.ebuild b/net-print/lprng/lprng-3.8.27.ebuild index a6fa62b62caa..1d81d4afcb0f 100644 --- a/net-print/lprng/lprng-3.8.27.ebuild +++ b/net-print/lprng/lprng-3.8.27.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.27.ebuild,v 1.10 2004/11/09 21:28:09 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.27.ebuild,v 1.11 2005/01/28 18:26:28 lanius Exp $ inherit eutils flag-o-matic |