Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfed89fef24e239d6bce74250bfb2b6d4be75e86
commit bfed89fef24e239d6bce74250bfb2b6d4be75e86
Author: voroskoi <[EMAIL PROTECTED]>
Date: Tue Oct 16 12:01:39 2007 +0200
hplip-2.7.9-1-i686
version bump
added CVE-2007-5208.diff (based on ubuntu patch), closes #2496
removed empty-line-removal-bug.patch
diff --git a/source/apps-extra/hplip/CVE-2007-5208.diff
b/source/apps-extra/hplip/CVE-2007-5208.diff
new file mode 100644
index 0000000..457e372
--- /dev/null
+++ b/source/apps-extra/hplip/CVE-2007-5208.diff
@@ -0,0 +1,50 @@
+diff -aur hplip-2.7.9/hpssd.py fw_hplip-2.7.9/hpssd.py
+--- hplip-2.7.9/hpssd.py 2007-08-14 22:42:47.000000000 +0200
++++ fw_hplip-2.7.9/hpssd.py 2007-10-16 11:42:59.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ # Std Lib
+ import sys, socket, os, os.path, signal, getopt, time, select
+-import popen2, threading, tempfile
++import subprocess, popen2, threading, tempfile
+
+ from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
+ ENOTCONN, ESHUTDOWN, EINTR, EISCONN
+@@ -560,21 +560,23 @@
+
+ if sendmail:
+ sendmail = os.path.join(sendmail, 'sendmail')
+- sendmail += ' -t -r %s' % self.from_address
++ cmd = [sendmail,'-t','-r',self.from_address]
+
+- log.debug(sendmail)
+- std_out, std_in, std_err = popen2.popen3(sendmail)
+- log.debug(repr(self.message))
+- std_in.write(self.message)
+- std_in.close()
+-
+- r, w, e = select.select([std_err], [], [], 2.0)
+-
+- if r:
+- err = std_err.read()
+- if err:
+- log.error(repr(err))
+- self.result = ERROR_TEST_EMAIL_FAILED
++ log.debug(repr(cmd))
++ err = None
++ try:
++ sp = subprocess.Popen(cmd, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
++ std_out, std_err = sp.communicate(self.message)
++ log.debug(repr(self.message))
++ if std_err != '':
++ err = std_err
++
++ except OSError, e:
++ err = str(e)
++
++ if err:
++ log.error(repr(err))
++ self.result = ERROR_TEST_EMAIL_FAILED
+
+ else:
+ log.error("Mail send failed. sendmail not found.")
diff --git a/source/apps-extra/hplip/FrugalBuild
b/source/apps-extra/hplip/FrugalBuild
index 3442c26..ae14884 100644
--- a/source/apps-extra/hplip/FrugalBuild
+++ b/source/apps-extra/hplip/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi <[EMAIL PROTECTED]>
pkgname=hplip
-pkgver=2.7.7
+pkgver=2.7.9
pkgrel=1
pkgextraver=
_F_sourceforge_ext=$pkgextraver.tar.gz
@@ -17,7 +17,9 @@ provides=('hpijs')
groups=('apps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url |grep version |sed -e 's/.*ion \(.*\)/\1/' -e
s/$pkgextraver//"
-sha1sums=('5b80ba8a62035985cbc4a0ae656df8a1779dbbdb')
+source=($source CVE-2007-5208.diff)
+sha1sums=('1ac491fd2b49f8a5a658532fd44e2aa0b008e072' \
+ '424224999218d744c27621ea8202ea57762a8097')
build() {
Fbuild --enable-doc-build --enable-foomatic-ppd-install \
diff --git a/source/apps-extra/hplip/empty-line-removal-bug.patch
b/source/apps-extra/hplip/empty-line-removal-bug.patch
deleted file mode 100644
index 8f903d4..0000000
--- a/source/apps-extra/hplip/empty-line-removal-bug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur hplip-2.7.6.orig/prnt/hpijs/djgenericvip.h
hplip-2.7.6.new/prnt/hpijs/djgenericvip.h
---- hplip-2.7.6.orig/prnt/hpijs/djgenericvip.h 2007-07-06 17:44:26.000000000
+0200
-+++ hplip-2.7.6.new/prnt/hpijs/djgenericvip.h 2007-07-06 17:45:36.000000000
+0200
-@@ -52,7 +52,7 @@
- virtual PHOTOTRAY_STATE PhotoTrayEngaged (BOOL bQueryPrinter);
- //! Returns TRUE if a hagaki feed is present in printer.
- virtual BOOL HagakiFeedPresent(BOOL bQueryPrinter);
--
-+ virtual DATA_FORMAT GetDataFormat() { return RASTER_STRIP; }
- #ifdef APDK_AUTODUPLEX
- //!Returns TRUE if duplexer and hagaki feed (combined) unit is present in
printer.
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
