Pullup ticket 1350 - requested by wiz

acroread7 (possibly security) update

Revisions pulled up:
- pkgsrc/print/acroread7/Makefile			1.10
- pkgsrc/print/acroread7/PLIST				1.3
- pkgsrc/print/acroread7/distinfo			1.4
- pkgsrc/print/acroread7/files/acroread.diff		1.3
- pkgsrc/print/acroread7/patches/patch-aa		1.3

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Sun Apr  9 09:53:59 UTC 2006

   Modified Files:
   	pkgsrc/print/acroread7: Makefile PLIST distinfo
   	pkgsrc/print/acroread7/files: acroread.diff
   	pkgsrc/print/acroread7/patches: patch-aa

   Log Message:
   Update to 7.0.5, changes unknown.

5 files changed, 160 insertions, 72 deletions

diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index b9b966cf5a1..bdfd2b9cfa0 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/03/13 20:36:51 joerg Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2006/04/09 19:38:28 salo Exp $
 
 DISTNAME=	acroread7	# Overridden below
-PKGNAME=	acroread7-7.0.1
-PKGREVISION=	3
+PKGNAME=	acroread7-7.0.5
 CATEGORIES=	print
-MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/
+MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/enu/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/prodindex/acrobat/readstep.html
@@ -15,7 +14,7 @@ CONFLICTS+=	acroread-5.*
 # maybe should do ALTERNATIVES?
 CONFLICTS+=	acroread5-5.*
 
-RESTRICTED=	"Original installer required to redistribute."
+RESTRICTED=	Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
@@ -38,11 +37,11 @@ PLATFORM=	unknown
 . if (${MACHINE_ARCH} == "i386")
 DEPENDS+=	suse_gtk2>=9.1:../../emulators/${SUSE_DIR_PREFIX}_gtk2
 DEPENDS+=	suse_locale>=9.1:../../emulators/${SUSE_DIR_PREFIX}_locale
-DISTNAME=	AdbeRdr701_linux_enu
+DISTNAME=	AdobeReader_enu-7.0.5-1.i386
 PLATFORM=	intellinux
 .endif
 .elif ${OPSYS} == "Linux"
-DISTNAME=	AdbeRdr701_linux_enu
+DISTNAME=	AdobeReader_enu-7.0.5-1.i386
 PLATFORM=	intellinux
 .endif
 
@@ -58,7 +57,7 @@ INSTALLATION_DIRS=	bin
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat7
-	@( ${ECHO} accept ) | PAGER=${CAT} InstallDir=${PREFIX}/Acrobat7 ${WRKSRC}/INSTALL
+	@( ${ECHO} n; ${ECHO} n ) | InstallDir=${PREFIX}/Acrobat7 ${WRKSRC}/INSTALL
 
 post-install:
 	@cd ${PREFIX}/Acrobat7/bin && \
diff --git a/print/acroread7/PLIST b/print/acroread7/PLIST
index 98cfaed6295..7d974b9afda 100644
--- a/print/acroread7/PLIST
+++ b/print/acroread7/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/13 20:36:51 joerg Exp $
-Acrobat7/Browser/Browser_Plugin_HowTo.txt
+@comment $NetBSD: PLIST,v 1.2.2.1 2006/04/09 19:38:28 salo Exp $
+Acrobat7/Browser/HowTo/ENU/Browser_Plugin_HowTo.txt
 Acrobat7/Browser/install_browser_plugin
 Acrobat7/Browser/${PLATFORM}/nppdf.so
 Acrobat7/Reader/AcroVersion
 Acrobat7/Reader/Cert/curl-ca-bundle.crt
-Acrobat7/Reader/GlobalPrefs/AttachmentPerms
-Acrobat7/Reader/GlobalPrefs/URLPerms
+Acrobat7/Reader/GlobalPrefs/reader_prefs
 Acrobat7/Reader/HowTo/ENU/Forms.html
 Acrobat7/Reader/HowTo/ENU/Forms01.html
 Acrobat7/Reader/HowTo/ENU/Forms02.html
@@ -110,12 +109,14 @@ Acrobat7/Reader/HowTo/ENU/Sign13.html
 Acrobat7/Reader/HowTo/ENU/images
 Acrobat7/Reader/JavaScripts/JSByteCodeLin.bin
 Acrobat7/Reader/JavaScripts/WebSearch.js
+Acrobat7/Reader/Legal/ENU/LGPL.html
 Acrobat7/Reader/Legal/ENU/License.html
 Acrobat7/Reader/Legal/ENU/license_ENU_uc.txt
 Acrobat7/Reader/Messages/ENU/RdrMsgENU.pdf
 Acrobat7/Reader/Messages/RdrMsgSplash.pdf
+Acrobat7/Reader/Patch/selinux_patch
 Acrobat7/Reader/WebSearch/WebSearchENU.pdf
-Acrobat7/Reader/help/ENU/README
+Acrobat7/Reader/help/ENU/ReadMe.htm
 Acrobat7/Reader/help/ENU/Reader.pdf
 Acrobat7/Reader/${PLATFORM}/SPPlugins/ADMPlugin.apl
 Acrobat7/Reader/${PLATFORM}/bin/acroread
@@ -202,6 +203,56 @@ Acrobat7/Resource/Font/PFM/zy______.pfm
 Acrobat7/Resource/Font/SY______.PFB
 Acrobat7/Resource/Font/ZX______.PFB
 Acrobat7/Resource/Font/ZY______.PFB
+Acrobat7/Resource/Icons/128x128/AdobeReader.png
+Acrobat7/Resource/Icons/128x128/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/128x128/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/128x128/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/128x128/vnd.fdf.png
+Acrobat7/Resource/Icons/16x16/AdobeReader.png
+Acrobat7/Resource/Icons/16x16/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/16x16/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/16x16/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/16x16/vnd.fdf.png
+Acrobat7/Resource/Icons/192x192/AdobeReader.png
+Acrobat7/Resource/Icons/192x192/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/192x192/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/192x192/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/192x192/vnd.fdf.png
+Acrobat7/Resource/Icons/20x20/AdobeReader.png
+Acrobat7/Resource/Icons/20x20/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/20x20/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/20x20/vnd.fdf.png
+Acrobat7/Resource/Icons/20x20/xdp.png
+Acrobat7/Resource/Icons/24x24/AdobeReader.png
+Acrobat7/Resource/Icons/24x24/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/24x24/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/24x24/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/24x24/vnd.fdf.png
+Acrobat7/Resource/Icons/32x32/AdobeReader.png
+Acrobat7/Resource/Icons/32x32/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/32x32/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/32x32/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/32x32/vnd.fdf.png
+Acrobat7/Resource/Icons/36x36/AdobeReader.png
+Acrobat7/Resource/Icons/36x36/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/36x36/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/36x36/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/36x36/vnd.fdf.png
+Acrobat7/Resource/Icons/48x48/AdobeReader.png
+Acrobat7/Resource/Icons/48x48/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/48x48/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/48x48/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/48x48/vnd.fdf.png
+Acrobat7/Resource/Icons/64x64/AdobeReader.png
+Acrobat7/Resource/Icons/64x64/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/64x64/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/64x64/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/64x64/vnd.fdf.png
+Acrobat7/Resource/Icons/96x96/AdobeReader.png
+Acrobat7/Resource/Icons/96x96/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/96x96/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/96x96/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/96x96/vnd.fdf.png
 Acrobat7/Resource/Icons/AdobeReader.png
 Acrobat7/Resource/Linguistics/LanguageNames/DisplayLanguageNames.en_US.txt
 Acrobat7/Resource/Linguistics/Providers/Proximity/brt04.lex
@@ -219,49 +270,63 @@ Acrobat7/Resource/Linguistics/Providers/Proximity/usa8601.lex
 Acrobat7/Resource/Linguistics/Providers/Proximity/usa8602.lex
 Acrobat7/Resource/Linguistics/Providers/Proximity/usa8603.lex
 Acrobat7/Resource/Linguistics/Providers/Proximity/usa8604.lex
+Acrobat7/Resource/Support/AdobeReader.xml
 Acrobat7/Resource/Support/AdobeReader_GNOME.desktop
 Acrobat7/Resource/Support/AdobeReader_KDE.desktop
+Acrobat7/Resource/Support/vnd.adobe.pdx.desktop
+Acrobat7/Resource/Support/vnd.adobe.xdp+xml.desktop
+Acrobat7/Resource/Support/vnd.adobe.xfdf.desktop
+Acrobat7/Resource/Support/vnd.fdf.desktop
 Acrobat7/bin/acroread
 bin/acroread
 bin/acroread7
-@dirrm Acrobat7/Browser/${PLATFORM}
-@dirrm Acrobat7/Browser
-@dirrm Acrobat7/Reader/Cert
-@dirrm Acrobat7/Reader/GlobalPrefs
-@exec ln -sf Images %D/Acrobat7/Reader/HowTo/ENU/images
-@unexec ${RM} -f %D/Acrobat7/Reader/HowTo/ENU/images
-@dirrm Acrobat7/Reader/HowTo/ENU/Images
-@dirrm Acrobat7/Reader/HowTo/ENU
-@dirrm Acrobat7/Reader/HowTo
-@dirrm Acrobat7/Reader/JavaScripts
-@dirrm Acrobat7/Reader/Legal/ENU
-@dirrm Acrobat7/Reader/Legal
-@dirrm Acrobat7/Reader/Messages/ENU
-@dirrm Acrobat7/Reader/Messages
-@dirrm Acrobat7/Reader/WebSearch
-@dirrm Acrobat7/Reader/help/ENU
-@dirrm Acrobat7/Reader/help
-@exec ln -sf ../../Resource %D/Acrobat7/Reader/${PLATFORM}/res
-@unexec ${RM} -f %D/Acrobat7/Reader/${PLATFORM}/res
-@dirrm Acrobat7/Reader/${PLATFORM}/SPPlugins
-@dirrm Acrobat7/Reader/${PLATFORM}/bin
-@dirrm Acrobat7/Reader/${PLATFORM}/lib
-@dirrm Acrobat7/Reader/${PLATFORM}/plug_ins/AcroForm
+@dirrm Acrobat7/bin
+@dirrm Acrobat7/Resource/Support
+@dirrm Acrobat7/Resource/Linguistics/Providers/Proximity
+@dirrm Acrobat7/Resource/Linguistics/Providers
+@dirrm Acrobat7/Resource/Linguistics/LanguageNames
+@dirrm Acrobat7/Resource/Linguistics
+@dirrm Acrobat7/Resource/Icons/96x96
+@dirrm Acrobat7/Resource/Icons/64x64
+@dirrm Acrobat7/Resource/Icons/48x48
+@dirrm Acrobat7/Resource/Icons/36x36
+@dirrm Acrobat7/Resource/Icons/32x32
+@dirrm Acrobat7/Resource/Icons/24x24
+@dirrm Acrobat7/Resource/Icons/20x20
+@dirrm Acrobat7/Resource/Icons/192x192
+@dirrm Acrobat7/Resource/Icons/16x16
+@dirrm Acrobat7/Resource/Icons/128x128
+@dirrm Acrobat7/Resource/Icons
+@dirrm Acrobat7/Resource/Font/PFM
+@dirrm Acrobat7/Resource/Font
+@dirrm Acrobat7/Resource/CMap
+@dirrm Acrobat7/Resource
 @dirrm Acrobat7/Reader/${PLATFORM}/plug_ins/Annotations/Stamps/ENU
 @dirrm Acrobat7/Reader/${PLATFORM}/plug_ins/Annotations/Stamps
 @dirrm Acrobat7/Reader/${PLATFORM}/plug_ins/Annotations
+@dirrm Acrobat7/Reader/${PLATFORM}/plug_ins/AcroForm
 @dirrm Acrobat7/Reader/${PLATFORM}/plug_ins
+@dirrm Acrobat7/Reader/${PLATFORM}/lib
+@dirrm Acrobat7/Reader/${PLATFORM}/bin
+@dirrm Acrobat7/Reader/${PLATFORM}/SPPlugins
 @dirrm Acrobat7/Reader/${PLATFORM}
+@dirrm Acrobat7/Reader/help/ENU
+@dirrm Acrobat7/Reader/help
+@dirrm Acrobat7/Reader/WebSearch
+@dirrm Acrobat7/Reader/Patch
+@dirrm Acrobat7/Reader/Messages/ENU
+@dirrm Acrobat7/Reader/Messages
+@dirrm Acrobat7/Reader/Legal/ENU
+@dirrm Acrobat7/Reader/Legal
+@dirrm Acrobat7/Reader/JavaScripts
+@dirrm Acrobat7/Reader/HowTo/ENU/Images
+@dirrm Acrobat7/Reader/HowTo/ENU
+@dirrm Acrobat7/Reader/HowTo
+@dirrm Acrobat7/Reader/GlobalPrefs
+@dirrm Acrobat7/Reader/Cert
 @dirrm Acrobat7/Reader
-@dirrm Acrobat7/Resource/CMap
-@dirrm Acrobat7/Resource/Font/PFM
-@dirrm Acrobat7/Resource/Font
-@dirrm Acrobat7/Resource/Icons
-@dirrm Acrobat7/Resource/Linguistics/LanguageNames
-@dirrm Acrobat7/Resource/Linguistics/Providers/Proximity
-@dirrm Acrobat7/Resource/Linguistics/Providers
-@dirrm Acrobat7/Resource/Linguistics
-@dirrm Acrobat7/Resource/Support
-@dirrm Acrobat7/Resource
-@dirrm Acrobat7/bin
+@dirrm Acrobat7/Browser/${PLATFORM}
+@dirrm Acrobat7/Browser/HowTo/ENU
+@dirrm Acrobat7/Browser/HowTo
+@dirrm Acrobat7/Browser
 @dirrm Acrobat7
diff --git a/print/acroread7/distinfo b/print/acroread7/distinfo
index 37de4851349..ac58fe41d5e 100644
--- a/print/acroread7/distinfo
+++ b/print/acroread7/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/03/13 20:36:51 joerg Exp $
+$NetBSD: distinfo,v 1.3.2.1 2006/04/09 19:38:28 salo Exp $
 
-SHA1 (AdbeRdr701_linux_enu.tar.gz) = ab2c83ff58f1e71d29051c95ce745c0bafb77dea
-RMD160 (AdbeRdr701_linux_enu.tar.gz) = 809bd29984e3d67bac51ce93cf2ce22f43c1b331
-Size (AdbeRdr701_linux_enu.tar.gz) = 39476166 bytes
-SHA1 (patch-aa) = bc3fdad4e82c81f04038c66905d95248d9c072c9
+SHA1 (AdobeReader_enu-7.0.5-1.i386.tar.gz) = 8558b34ff721e98f37c2261a5bb3efc4fbd2022c
+RMD160 (AdobeReader_enu-7.0.5-1.i386.tar.gz) = e9ab95a2eddf6760c161faa9028f6e65a6d3dabc
+Size (AdobeReader_enu-7.0.5-1.i386.tar.gz) = 38966159 bytes
+SHA1 (patch-aa) = 8c204cb4240ded22258b56c008007ee22edcf5af
diff --git a/print/acroread7/files/acroread.diff b/print/acroread7/files/acroread.diff
index 66189db1f81..eda2b10d84c 100644
--- a/print/acroread7/files/acroread.diff
+++ b/print/acroread7/files/acroread.diff
@@ -1,7 +1,9 @@
---- acroread.orig	2005-03-12 14:50:00.000000000 +1300
-+++ acroread	2005-03-16 23:59:20.000000000 +1300
-@@ -14,7 +14,7 @@
-  ScriptDirectory="`pwd 2> /dev/null`"
+$NetBSD: acroread.diff,v 1.2.2.1 2006/04/09 19:38:28 salo Exp $
+
+--- acroread.orig	2005-11-07 12:05:17.000000000 +0000
++++ acroread
+@@ -214,7 +214,7 @@ else
+  ScriptDirectory="`/bin/pwd 2> /dev/null`"
   cd "$cwd"
  fi
 -install_dir=`dirname "$ScriptDirectory"`/Reader
@@ -9,7 +11,38 @@
  
  
  #
-@@ -172,6 +172,19 @@
+@@ -439,18 +439,18 @@ check_gtk_ver_and_set_lib_path()
+     OLD_IFS=""
+ 
+     # This checks for libs in cache /etc/ld.so.cache
+-    for ifile in `/sbin/ldconfig -p|grep "libgtk-x11-2.0.so$"|sed 's/.*[ \t]*=>[ \t]*\(.*\)/\1/g' 2>/dev/null`; do
+-        version=`get_gtk_file_ver "$ifile"`
+-
+-    	while [ ${#version} -gt ${#base_version} ]; do
+-	   		base_version="${base_version}0"
+-	    done
+-
+-        if [ $version -ge $base_version ]; then
+-            export LD_LIBRARY_PATH="`dirname "$ifile"`":"$LD_LIBRARY_PATH"
+-            return 0
+-        fi
+-    done
++#    for ifile in `/sbin/ldconfig -p|grep "libgtk-x11-2.0.so$"|sed 's/.*[ \t]*=>[ \t]*\(.*\)/\1/g' 2>/dev/null`; do
++#        version=`get_gtk_file_ver "$ifile"`
++#
++#    	while [ ${#version} -gt ${#base_version} ]; do
++#	   		base_version="${base_version}0"
++#	    done
++#
++#        if [ $version -ge $base_version ]; then
++#            export LD_LIBRARY_PATH="`dirname "$ifile"`":"$LD_LIBRARY_PATH"
++#            return 0
++#        fi
++#    done
+ 
+     return 1
+ }
+@@ -577,6 +577,19 @@ case "$os_name" in
      ACRO_CONFIG=intellinux
      export ACRO_CONFIG
      ;;
@@ -29,7 +62,7 @@
  esac
  
  if [ -z "$ACRO_CONFIG" ] ; then
-@@ -202,7 +215,7 @@
+@@ -611,7 +624,7 @@ case "$ACRO_CONFIG" in
      ;;
  esac
  
diff --git a/print/acroread7/patches/patch-aa b/print/acroread7/patches/patch-aa
index 095816fee62..a349c8f5fbd 100644
--- a/print/acroread7/patches/patch-aa
+++ b/print/acroread7/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2006/03/13 20:36:51 joerg Exp $
+$NetBSD: patch-aa,v 1.2.2.1 2006/04/09 19:38:28 salo Exp $
 
---- INSTALL.orig	2005-03-12 14:50:00.000000000 +1300
+--- INSTALL.orig	2005-11-07 12:05:16.000000000 +0000
 +++ INSTALL
-@@ -82,7 +82,7 @@ OutputLicense ()
-   fi
- 
-  TypeCheck $PAGER 
--  if  [ $? -ne 0 ] || [ -z "$PAGER" ] ; then
-+  if  [ $? -eq 0 ] || [ -z "$PAGER" ] ; then
-     command=cat
-     TypeCheck pg
-     if [ $? -eq 0 ] ; then 
-@@ -143,6 +143,8 @@ PrintRequiredFree()
+@@ -284,6 +284,8 @@ PrintRequiredFree()
  
          if [ `uname -s` = "Linux" ] ; then
            size=`ls -lLn "$i" | ( read perm links owner group size date ; echo $size )`
@@ -20,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2006/03/13 20:36:51 joerg Exp $
          else
            size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
          fi
-@@ -223,6 +225,8 @@ GetInstallDirectory ()
+@@ -390,6 +392,8 @@ GetInstallDirectory ()
      AIX)
        defdir="/usr/lpp/Adobe/Acrobat7.0"
        ;;
@@ -29,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2006/03/13 20:36:51 joerg Exp $
    esac
  
    while [ -z "$InstallDir" ] ; do
-@@ -560,6 +564,20 @@ case "$OSname" in
+@@ -1061,6 +1065,20 @@ case "$OSname" in
      ReadDefaultNum="$ReadIntelLinuxNum"
      DefaultName="Intel/Linux"
      ;;