Avoid sandbox violations thanks to Jason Bucata <jbucata@tulsaconnect.com> in bug...

Package-Manager: portage-2.1.2-r9

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 46b0b170d4300118c463fee7d909bfce388cc9e7..6066e7cf58e1d48f8cc16ceb7f893d4706c3f2ef 100644 (file)
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.21 2007/02/19 20:58:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.22 2007/02/19 22:34:49 genstef Exp $
+
+  19 Feb 2007; <genstef@gentoo.org> files/foo2zjs-Makefile-20070204.diff:
+  Avoid sandbox violations thanks to Jason Bucata <jbucata@tulsaconnect.com>
+  in bug 164105
 
   19 Feb 2007; <genstef@gentoo.org> foo2zjs-20070204.ebuild:
   make sure udev rules are reloaded

diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index bda581c65e3f92a15c5a51d11f73da7d5fd1c8d6..a0f035ea04a51e04a5515179ccec912c4ec5c39a 100644 (file)
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,7 +1,7 @@
-AUX foo2zjs-Makefile-20070204.diff 4565 RMD160 28e71949dbc2e48737e97df796cd3d9ec090547c SHA1 b1ed72affe89128608455ff30dfb8ca2cfcf66b8 SHA256 ebebb69e5ec20410d596b37ac326c0986a3bcbccf60a1975690bc442917a41fa
-MD5 7ccf22de82716d6b94c343d08931208a files/foo2zjs-Makefile-20070204.diff 4565
-RMD160 28e71949dbc2e48737e97df796cd3d9ec090547c files/foo2zjs-Makefile-20070204.diff 4565
-SHA256 ebebb69e5ec20410d596b37ac326c0986a3bcbccf60a1975690bc442917a41fa files/foo2zjs-Makefile-20070204.diff 4565
+AUX foo2zjs-Makefile-20070204.diff 4934 RMD160 2b320f76c6b1625f01040bc03bb4e5784d02e353 SHA1 524cb9e4398a120f7755952ec5c099778a362a52 SHA256 6a14093f5ee6f4a2d39bdbbc44a5d44ae2a1033df6dad15a0236b7b7ada3c85d
+MD5 46bb57d642637a31389577cb3780af92 files/foo2zjs-Makefile-20070204.diff 4934
+RMD160 2b320f76c6b1625f01040bc03bb4e5784d02e353 files/foo2zjs-Makefile-20070204.diff 4934
+SHA256 6a14093f5ee6f4a2d39bdbbc44a5d44ae2a1033df6dad15a0236b7b7ada3c85d files/foo2zjs-Makefile-20070204.diff 4934
 AUX foo2zjs-udevfwld-20070204.diff 6322 RMD160 ef0cdef133664fd191dab5efbe60e0a63c90ccd6 SHA1 6473adb9c22e29b19218185e51ea042af233925c SHA256 d8518ed1c0ee9e90adedd7f1cde11429c989c8b0420648bcb50a1a4f267df527
 MD5 a127931b51f376647ce0b58e9323e440 files/foo2zjs-udevfwld-20070204.diff 6322
 RMD160 ef0cdef133664fd191dab5efbe60e0a63c90ccd6 files/foo2zjs-udevfwld-20070204.diff 6322
@@ -20,10 +20,10 @@ EBUILD foo2zjs-20070204.ebuild 4096 RMD160 e41d450654e26401421e579fdd579cb6100c3
 MD5 2aa1a4b0f99e3b183417cf3b0f2e1469 foo2zjs-20070204.ebuild 4096
 RMD160 e41d450654e26401421e579fdd579cb6100c3953 foo2zjs-20070204.ebuild 4096
 SHA256 258bb8ba74b13a91a07e66bf957252c795483f90663b7f36c28f5d7986ec3066 foo2zjs-20070204.ebuild 4096
-MISC ChangeLog 5609 RMD160 8d6e29f7b35d2d0ab2d00b1dbea8a5a58fef62ca SHA1 73856f94b2061e418e35928271c4d13b4ae0a957 SHA256 fb04967770ddb1908ad8a3011d11fcc7368751f0a078a02e333775d56ee3dfa4
-MD5 8a8bd5c85df0e4e4668b856b670a7fae ChangeLog 5609
-RMD160 8d6e29f7b35d2d0ab2d00b1dbea8a5a58fef62ca ChangeLog 5609
-SHA256 fb04967770ddb1908ad8a3011d11fcc7368751f0a078a02e333775d56ee3dfa4 ChangeLog 5609
+MISC ChangeLog 5777 RMD160 0a60f078df798a878a8fb6245d3390efec196cad SHA1 1d64eaefe8b28e98863fd0838195fdcdd0ddc877 SHA256 5ecc4645166ddfa171428079ec0b12cc0e9bc7bc2a163612420e82a5b24c1354
+MD5 cdf80444a704a10ae90b5d3dcecdc4bd ChangeLog 5777
+RMD160 0a60f078df798a878a8fb6245d3390efec196cad ChangeLog 5777
+SHA256 5ecc4645166ddfa171428079ec0b12cc0e9bc7bc2a163612420e82a5b24c1354 ChangeLog 5777
 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7
 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266
 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266

diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
index c58ac17e740f6acbe065ba5cc344235017853510..0770d1c9e84472ab49637f593427be5eb9a37a0b 100644 (file)
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
+++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
@@ -1,6 +1,6 @@
 diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile      2007-02-11 11:08:24.000000000 +0100
-+++ foo2zjs/Makefile   2007-02-11 11:07:08.000000000 +0100
+--- foo2zjs.orig/Makefile      2007-02-19 23:27:10.000000000 +0100
++++ foo2zjs/Makefile   2007-02-19 23:26:56.000000000 +0100
 @@ -7,7 +7,7 @@
  
  # Installation prefix...
@@ -67,7 +67,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
            foomatic-combo-xml -O >overview.xml; \
        fi
  
-@@ -492,8 +495,8 @@
+@@ -492,18 +495,12 @@
            fi; \
        done
  
@@ -78,7 +78,17 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  install-ppd:
        #
        # Install PPD files for CUPS
-@@ -516,10 +519,8 @@
+       #
+-      if [ -d /usr/share/ppd/ ]; then \
+-          find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \
+-          find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \
+-          find /usr/share/ppd/ -name '*foo2xqx*' | xargs rm -f; \
+-          find /usr/share/ppd/ -name '*foo2lava*' | xargs rm -f; \
+-      fi
+       if [ -d $(MODEL) ]; then \
+           cd PPD; \
+           for ppd in *.ppd; do \
+@@ -516,10 +513,8 @@
            done; \
        fi
  
@@ -91,7 +101,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  
  install-hotplug-test:
        #
-@@ -537,18 +538,18 @@
+@@ -537,18 +532,18 @@
        #
  
  install-hotplug-prog:
@@ -117,7 +127,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  
  cups: FRC
        if [ -x /etc/init.d/cups ]; then \
-@@ -862,7 +863,6 @@
+@@ -862,7 +857,6 @@
        install -c -m 644 README $(DOCDIR)
        install -c -m 644 ChangeLog $(DOCDIR)
  
@@ -127,15 +137,15 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
        -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
 diff -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
 --- foo2zjs.orig/hplj.usermap  1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap       2007-02-11 11:03:10.000000000 +0100
++++ foo2zjs/hplj.usermap       2007-02-19 23:26:08.000000000 +0100
 @@ -0,0 +1,4 @@
 +hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
 +hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
 +hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
 +hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
 diff -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile       2007-02-11 11:08:24.000000000 +0100
-+++ foo2zjs/icc2ps/Makefile    2007-02-11 11:03:10.000000000 +0100
+--- foo2zjs.orig/icc2ps/Makefile       2007-02-19 23:27:10.000000000 +0100
++++ foo2zjs/icc2ps/Makefile    2007-02-19 23:26:08.000000000 +0100
 @@ -1,10 +1,10 @@
 -PREFIX=       /usr
 +PREFIX=       $(DESTDIR)/usr