crux-commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
March 2006
- 1 participants
- 236 discussions
Author: jue
Date: 2006-03-26 13:33:10 +0200 (Sun, 26 Mar 2006)
New Revision: 1024
Added:
attic/asunder/
attic/graveman/
attic/libcddb/
attic/sox/
Removed:
crux-2.2/ports/attic/
Log:
moved crux-2.2/ports/attic/* to toplevel attic
Copied: attic/asunder (from rev 1022, crux-2.2/ports/attic/asunder)
Copied: attic/graveman (from rev 1022, crux-2.2/ports/attic/graveman)
Copied: attic/libcddb (from rev 1022, crux-2.2/ports/attic/libcddb)
Copied: attic/sox (from rev 1022, crux-2.2/ports/attic/sox)
1
0
Author: jue
Date: 2006-03-26 13:30:28 +0200 (Sun, 26 Mar 2006)
New Revision: 1023
Modified:
crux-2.2/ChangeLog
Log:
ChangeLog: devfsd
Modified: crux-2.2/ChangeLog
===================================================================
--- crux-2.2/ChangeLog 2006-03-26 11:15:47 UTC (rev 1022)
+++ crux-2.2/ChangeLog 2006-03-26 11:30:28 UTC (rev 1023)
@@ -89,6 +89,7 @@
- opt/mc 4.6.1-1
- opt/sharutils 4.6-1
- Removed packages:
+ - core/devfsd
- core/pkgconfig (renamed to core/pkg-config)
- opt/audiofile
- opt/bftpd
1
0
Author: jue
Date: 2006-03-26 13:15:47 +0200 (Sun, 26 Mar 2006)
New Revision: 1022
Modified:
crux-2.2/ports/core/filesystem/fstab
Log:
filesystem: fixed devfsd-style entries for cdrom/dvd
Modified: crux-2.2/ports/core/filesystem/fstab
===================================================================
--- crux-2.2/ports/core/filesystem/fstab 2006-03-26 05:13:50 UTC (rev 1021)
+++ crux-2.2/ports/core/filesystem/fstab 2006-03-26 11:15:47 UTC (rev 1022)
@@ -12,8 +12,8 @@
#/dev/#EXT3FS_HOME# /home ext3 defaults 0 2
#/dev/#JFS_HOME# /home jfs defaults 1 2
#/dev/#XFS_HOME# /home xfs defaults 0 0
-#/dev/cdroms/cdrom0 /cdrom iso9660 ro,user,noauto,unhide 0 0
-#/dev/cdroms/cdrom0 /dvd udf ro,user,noauto,unhide 0 0
+#/dev/cdrom /cdrom iso9660 ro,user,noauto,unhide 0 0
+#/dev/dvd /dvd udf ro,user,noauto,unhide 0 0
#/dev/floppy/0 /floppy vfat user,noauto,unhide 0 0
devpts /dev/pts devpts defaults 0 0
none /sys sysfs defaults 0 0
1
0
Author: sten
Date: 2006-03-26 07:13:50 +0200 (Sun, 26 Mar 2006)
New Revision: 1021
Modified:
crux-2.2/ports/opt/poppler/.md5sum
crux-2.2/ports/opt/poppler/Pkgfile
Log:
[security] poppler: update to 0.4.5
Modified: crux-2.2/ports/opt/poppler/.md5sum
===================================================================
--- crux-2.2/ports/opt/poppler/.md5sum 2006-03-26 02:41:56 UTC (rev 1020)
+++ crux-2.2/ports/opt/poppler/.md5sum 2006-03-26 05:13:50 UTC (rev 1021)
@@ -1 +1 @@
-e081bca749a3373b2d95e696b7dddb9b poppler-0.4.4.tar.gz
+2bb1c75aa3f9c42f0ba48b5492e6d32c poppler-0.4.5.tar.gz
Modified: crux-2.2/ports/opt/poppler/Pkgfile
===================================================================
--- crux-2.2/ports/opt/poppler/Pkgfile 2006-03-26 02:41:56 UTC (rev 1020)
+++ crux-2.2/ports/opt/poppler/Pkgfile 2006-03-26 05:13:50 UTC (rev 1021)
@@ -5,12 +5,11 @@
# Depends on: t1lib, gtk, qt3, ghostscript
name=poppler
-version=0.4.4
+version=0.4.5
release=1
source=(http://poppler.freedesktop.org/$name-$version.tar.gz)
-build()
-{
+build() {
cd $name-$version
./configure \
--prefix=/usr \
1
0
Author: sip
Date: 2006-03-26 04:41:56 +0200 (Sun, 26 Mar 2006)
New Revision: 1020
Modified:
crux-2.2/ports/opt/openoffice/.footprint
crux-2.2/ports/opt/openoffice/.md5sum
crux-2.2/ports/opt/openoffice/Pkgfile
Log:
openoffice: updated to 2.0.2
Modified: crux-2.2/ports/opt/openoffice/.footprint
===================================================================
--- crux-2.2/ports/opt/openoffice/.footprint 2006-03-26 01:51:53 UTC (rev 1019)
+++ crux-2.2/ports/opt/openoffice/.footprint 2006-03-26 02:41:56 UTC (rev 1020)
@@ -155,19 +155,14 @@
-rw-r--r-- root/root usr/lib/openoffice/presets/basic/dialog.xlc
-rw-r--r-- root/root usr/lib/openoffice/presets/basic/script.xlc
drwxr-xr-x root/root usr/lib/openoffice/presets/config/
--rw-r--r-- root/root usr/lib/openoffice/presets/config/arrowhd.soe
-rw-r--r-- root/root usr/lib/openoffice/presets/config/arrowhd_en-US.soe
-rw-r--r-- root/root usr/lib/openoffice/presets/config/autotbl.fmt
--rw-r--r-- root/root usr/lib/openoffice/presets/config/classic.sog
-rw-r--r-- root/root usr/lib/openoffice/presets/config/classic_en-US.sog
-rw-r--r-- root/root usr/lib/openoffice/presets/config/cmyk.soc
-rw-r--r-- root/root usr/lib/openoffice/presets/config/gallery.soc
--rw-r--r-- root/root usr/lib/openoffice/presets/config/hatching.soh
-rw-r--r-- root/root usr/lib/openoffice/presets/config/hatching_en-US.soh
-rw-r--r-- root/root usr/lib/openoffice/presets/config/html.soc
--rw-r--r-- root/root usr/lib/openoffice/presets/config/modern.sog
-rw-r--r-- root/root usr/lib/openoffice/presets/config/modern_en-US.sog
--rw-r--r-- root/root usr/lib/openoffice/presets/config/palette.soc
-rw-r--r-- root/root usr/lib/openoffice/presets/config/palette_en-US.soc
-rw-r--r-- root/root usr/lib/openoffice/presets/config/standard.sob
-rw-r--r-- root/root usr/lib/openoffice/presets/config/standard.soc
@@ -175,7 +170,6 @@
-rw-r--r-- root/root usr/lib/openoffice/presets/config/standard.soe
-rw-r--r-- root/root usr/lib/openoffice/presets/config/standard.sog
-rw-r--r-- root/root usr/lib/openoffice/presets/config/standard.soh
--rw-r--r-- root/root usr/lib/openoffice/presets/config/styles.sod
-rw-r--r-- root/root usr/lib/openoffice/presets/config/styles_en-US.sod
-rw-r--r-- root/root usr/lib/openoffice/presets/config/sun-color.soc
-rw-r--r-- root/root usr/lib/openoffice/presets/config/web.soc
@@ -228,8 +222,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/classes/XSLTFilter.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/XSLTValidate.jar -> XSLTValidate.jar.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/XSLTValidate.jar.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/agenda.jar -> agenda.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/agenda.jar.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/agenda.jar -> agenda.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/agenda.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/aportisdoc.jar
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/avmedia.jar -> avmedia.jar.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/avmedia.jar.1
@@ -237,12 +231,12 @@
-r--r--r-- root/root usr/lib/openoffice/program/classes/bsh.jar.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/classes.jar -> classes.jar.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/classes.jar.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/commonwizards.jar -> commonwizards.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/commonwizards.jar.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/fax.jar -> fax.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/fax.jar.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/form.jar -> form.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/form.jar.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/commonwizards.jar -> commonwizards.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/commonwizards.jar.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/fax.jar -> fax.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/fax.jar.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/form.jar -> form.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/form.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/hsqldb.jar -> hsqldb.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/hsqldb.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/java_uno.jar -> java_uno.jar.1.1
@@ -257,30 +251,30 @@
-r--r--r-- root/root usr/lib/openoffice/program/classes/jurt.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/jut.jar -> jut.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/jut.jar.1.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/letter.jar -> letter.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/letter.jar.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/letter.jar -> letter.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/letter.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/officebean.jar -> officebean.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/officebean.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/pexcel.jar
-r--r--r-- root/root usr/lib/openoffice/program/classes/pocketword.jar
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/query.jar -> query.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/query.jar.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/report.jar -> report.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/report.jar.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/query.jar -> query.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/query.jar.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/report.jar -> report.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/report.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/ridl.jar -> ridl.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/ridl.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/sandbox.jar -> sandbox.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/sandbox.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/sdbc_hsqldb.jar -> sdbc_hsqldb.jar.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/sdbc_hsqldb.jar.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/table.jar -> table.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/table.jar.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/table.jar -> table.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/table.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/unoil.jar -> unoil.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/unoil.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/unoloader.jar -> unoloader.jar.1.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/unoloader.jar.1.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/classes/web.jar -> web.jar.1
--r--r--r-- root/root usr/lib/openoffice/program/classes/web.jar.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/classes/web.jar -> web.jar.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/classes/web.jar.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/xalan.jar -> xalan.jar.1
-r--r--r-- root/root usr/lib/openoffice/program/classes/xalan.jar.1
lrwxrwxrwx root/root usr/lib/openoffice/program/classes/xercesImpl.jar -> xercesImpl.jar.1
@@ -364,8 +358,8 @@
drwxr-xr-x root/root usr/lib/openoffice/program/greprefs/
-r--r--r-- root/root usr/lib/openoffice/program/greprefs/all.js
-r--r--r-- root/root usr/lib/openoffice/program/greprefs/security-prefs.js
-lrwxrwxrwx root/root usr/lib/openoffice/program/hatchwindowfactory.uno.so -> hatchwindowfactory.uno.so.1
--r--r--r-- root/root usr/lib/openoffice/program/hatchwindowfactory.uno.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/hatchwindowfactory.uno.so -> hatchwindowfactory.uno.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/hatchwindowfactory.uno.so.1.1
-r-xr-xr-x root/root usr/lib/openoffice/program/hid.lst
lrwxrwxrwx root/root usr/lib/openoffice/program/i18npool.uno.so -> i18npool.uno.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/i18npool.uno.so.1.1
@@ -413,16 +407,16 @@
lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_ofa680li.so -> libbf_ofa680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libbf_ofa680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libbf_sc680li.so
-lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_sch680li.so -> libbf_sch680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libbf_sch680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_sch680li.so -> libbf_sch680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libbf_sch680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_sd680li.so -> libbf_sd680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libbf_sd680li.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_sm680li.so -> libbf_sm680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libbf_sm680li.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_svx680li.so -> libbf_svx680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libbf_svx680li.so.1.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_sw680li.so -> libbf_sw680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libbf_sw680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_sw680li.so -> libbf_sw680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libbf_sw680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_wrapper680li.so -> libbf_wrapper680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libbf_wrapper680li.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libbf_xo680li.so -> libbf_xo680li.so.1.1
@@ -436,6 +430,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libcalc680li.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libcanvastools680li.so -> libcanvastools680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libcanvastools680li.so.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libcollator_data.so -> libcollator_data.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libcollator_data.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libcommuni680li.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libcomphelp4gcc3.so -> libcomphelp4gcc3.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libcomphelp4gcc3.so.1.1
@@ -460,10 +456,10 @@
-r--r--r-- root/root usr/lib/openoffice/program/libdb_java-4.2.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libdba680li.so -> libdba680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libdba680li.so.1.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libdbacfg680li.so -> libdbacfg680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libdbacfg680li.so.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libdbase680li.so -> libdbase680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libdbase680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libdbacfg680li.so -> libdbacfg680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libdbacfg680li.so.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libdbase680li.so -> libdbase680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libdbase680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libdbaxml680li.so -> libdbaxml680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libdbaxml680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libdbp680li.so
@@ -537,6 +533,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libgo680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libhsqldb2.so -> libhsqldb2.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libhsqldb2.so.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libhunspell.so -> libhunspell.so.1
+-r--r--r-- root/root usr/lib/openoffice/program/libhunspell.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libhwp.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libhyphen680li.so -> libhyphen680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libhyphen680li.so.1
@@ -568,6 +566,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libidx680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libime680li.so -> libime680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libime680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libindex_data.so -> libindex_data.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libindex_data.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libipb680li.so -> libipb680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libipb680li.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libipd680li.so -> libipd680li.so.1
@@ -594,14 +594,18 @@
-r--r--r-- root/root usr/lib/openoffice/program/libjpipe.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libjuh.so -> libjuh.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libjuh.so.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libjuhx.so -> libjuhx.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libjuhx.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libjuhx.so -> libjuhx.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libjuhx.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libjvmaccessgcc3.so -> libjvmaccessgcc3.so.3
lrwxrwxrwx root/root usr/lib/openoffice/program/libjvmaccessgcc3.so.3 -> libjvmaccessgcc3.so.3.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libjvmaccessgcc3.so.3.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libjvmfwk.so -> libjvmfwk.so.3
lrwxrwxrwx root/root usr/lib/openoffice/program/libjvmfwk.so.3 -> libjvmfwk.so.3.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libjvmfwk.so.3.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libkab1.so -> libkab1.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libkab1.so.1.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libkabdrv1.so -> libkabdrv1.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libkabdrv1.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libldap50.so
lrwxrwxrwx root/root usr/lib/openoffice/program/liblegacy_binfilters680li.so -> liblegacy_binfilters680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/liblegacy_binfilters680li.so.1
@@ -625,8 +629,6 @@
-r--r--r-- root/root usr/lib/openoffice/program/libmozjs.so
-r--r--r-- root/root usr/lib/openoffice/program/libmozz.so
-r--r--r-- root/root usr/lib/openoffice/program/libmsgbaseutil.so
-lrwxrwxrwx root/root usr/lib/openoffice/program/libmyspell.so -> libmyspell.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libmyspell.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libmysql2.so -> libmysql2.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libmysql2.so.1
-r-xr-xr-x root/root usr/lib/openoffice/program/libnpsoplugin.so
@@ -634,8 +636,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libnss3.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libodbc2.so -> libodbc2.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libodbc2.so.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libodbcbase2.so -> libodbcbase2.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libodbcbase2.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libodbcbase2.so -> libodbcbase2.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libodbcbase2.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/liboffacc680li.so -> liboffacc680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/liboffacc680li.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libofficebean.so -> libofficebean.so.1.1
@@ -648,8 +650,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libpdffilter680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libpk680li.so -> libpk680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libpk680li.so.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libpl680li.so -> libpl680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libpl680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libpl680li.so -> libpl680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libpl680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libplacewareli.so
-r--r--r-- root/root usr/lib/openoffice/program/libplc4.so
-r--r--r-- root/root usr/lib/openoffice/program/libplds4.so
@@ -657,8 +659,8 @@
lrwxrwxrwx root/root usr/lib/openoffice/program/libportaudio.so.0 -> libportaudio.so.0.0.18
lrwxrwxrwx root/root usr/lib/openoffice/program/libportaudio.so.0.0.18 -> libportaudio.so.0.0.18.1
-r--r--r-- root/root usr/lib/openoffice/program/libportaudio.so.0.0.18.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libpreload680li.so -> libpreload680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libpreload680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libpreload680li.so -> libpreload680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libpreload680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libprldap50.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libprotocolhandler680li.so -> libprotocolhandler680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libprotocolhandler680li.so.1.1
@@ -687,8 +689,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libscd680li.so
lrwxrwxrwx root/root usr/lib/openoffice/program/libsch680li.so -> libsch680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libsch680li.so.1.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libschd680li.so -> libschd680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libschd680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libschd680li.so -> libschd680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libschd680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libscn680li.so -> libscn680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libscn680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libscriptframe.so -> libscriptframe.so.1
@@ -698,8 +700,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libsd680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libsdbc2.so -> libsdbc2.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libsdbc2.so.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libsdd680li.so -> libsdd680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libsdd680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libsdd680li.so -> libsdd680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libsdd680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libsdui680li.so -> libsdui680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libsdui680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libsfx680li.so -> libsfx680li.so.1.1
@@ -715,8 +717,8 @@
lrwxrwxrwx root/root usr/lib/openoffice/program/libso680li.so -> libso680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libso680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libsoftokn3.so
-lrwxrwxrwx root/root usr/lib/openoffice/program/libsot680li.so -> libsot680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libsot680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libsot680li.so -> libsot680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libsot680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libspa680li.so -> libspa680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libspa680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libspell680li.so -> libspell680li.so.1
@@ -746,6 +748,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libsw680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libswd680li.so
-r--r--r-- root/root usr/lib/openoffice/program/libswui680li.so
+lrwxrwxrwx root/root usr/lib/openoffice/program/libtextconv_dict.so -> libtextconv_dict.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libtextconv_dict.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libtextconversiondlgs680li.so -> libtextconversiondlgs680li.so.1
-r--r--r-- root/root usr/lib/openoffice/program/libtextconversiondlgs680li.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libtfu680li.so -> libtfu680li.so.1
@@ -835,8 +839,8 @@
-r--r--r-- root/root usr/lib/openoffice/program/libxsec_fw.so.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libxsec_xmlsec.so -> libxsec_xmlsec.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libxsec_xmlsec.so.1.1
-lrwxrwxrwx root/root usr/lib/openoffice/program/libxsltdlg680li.so -> libxsltdlg680li.so.1
--r--r--r-- root/root usr/lib/openoffice/program/libxsltdlg680li.so.1
+lrwxrwxrwx root/root usr/lib/openoffice/program/libxsltdlg680li.so -> libxsltdlg680li.so.1.1
+-r--r--r-- root/root usr/lib/openoffice/program/libxsltdlg680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libxsltfilter680li.so -> libxsltfilter680li.so.1.1
-r--r--r-- root/root usr/lib/openoffice/program/libxsltfilter680li.so.1.1
lrwxrwxrwx root/root usr/lib/openoffice/program/libxstor.so -> libxstor.so.1.1
@@ -1221,7 +1225,6 @@
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_socket.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_ssl.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_testcapi.so
--r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_tkinter.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_weakref.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/array.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/audioop.so
@@ -1251,7 +1254,6 @@
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/pcre.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/pwd.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/pyexpat.so
--r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/readline.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/regex.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/resource.so
-r--r--r-- root/root usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/rgbimg.so
@@ -2139,6 +2141,9 @@
-r--r--r-- root/root usr/lib/openoffice/share/basic/Tutorials/script.xlb
drwxr-xr-x root/root usr/lib/openoffice/share/config/
-r--r--r-- root/root usr/lib/openoffice/share/config/images.zip
+-r--r--r-- root/root usr/lib/openoffice/share/config/images_crystal.zip
+-r--r--r-- root/root usr/lib/openoffice/share/config/images_hicontrast.zip
+-r--r--r-- root/root usr/lib/openoffice/share/config/images_industrial.zip
-r--r--r-- root/root usr/lib/openoffice/share/config/javavendors.xml
-r--r--r-- root/root usr/lib/openoffice/share/config/psetup.xpm
-r--r--r-- root/root usr/lib/openoffice/share/config/psetupl.xpm
@@ -2725,24 +2730,44 @@
drwxr-xr-x root/root usr/lib/openoffice/share/dict/ooo/
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/DicOOo.sxw
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/FontOOo.sxw
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/INSTALL_de.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_de_AT.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_de_CH.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_de_DE.txt
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_en_GB.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_hu_HU.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_hyph_de_DE.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_hyph_hu_HU.txt
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_it_IT.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_nl_NL.txt
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_sw_TZ.txt
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/README_th_TH.txt
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/WordNet_license.txt
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/de_AT.aff
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/de_AT.dic
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/de_CH.aff
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/de_CH.dic
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/de_DE.aff
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/de_DE.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/dictionary.lst
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/en_GB.aff
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/en_GB.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/en_US.aff
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/en_US.dic
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hu_HU.aff
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hu_HU.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_da_DK.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_de_DE.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_en_GB.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_en_US.dic
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_hu_HU.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_it_IT.dic
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_nl_NL.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/hyph_ru_RU.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/it_IT.aff
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/it_IT.dic
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/nl_NL.aff
+-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/nl_NL.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/sw_TZ.aff
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/sw_TZ.dic
-r--r--r-- root/root usr/lib/openoffice/share/dict/ooo/th_TH.aff
@@ -3670,7 +3695,7 @@
drwxr-xr-x root/root usr/lib/openoffice/share/template/en-US/
drwxr-xr-x root/root usr/lib/openoffice/share/template/en-US/internal/
-r--r--r-- root/root usr/lib/openoffice/share/template/en-US/internal/html.stw
--r--r--r-- root/root usr/lib/openoffice/share/template/en-US/internal/idxexample.sxw
+-r--r--r-- root/root usr/lib/openoffice/share/template/en-US/internal/idxexample.odt
-r--r--r-- root/root usr/lib/openoffice/share/template/en-US/internal/url_transfer.htm
drwxr-xr-x root/root usr/lib/openoffice/share/template/en-US/layout/
-r--r--r-- root/root usr/lib/openoffice/share/template/en-US/layout/lyt-cool.otp
@@ -3986,6 +4011,17 @@
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/pt-BR/pri-mail_l.ott
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/pt-BR/pri-marine_l.ott
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/pt-BR/pri-redline_l.ott
+drwxr-xr-x root/root usr/lib/openoffice/share/template/wizard/letter/ru/
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/bus-elegant_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/bus-modern_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/bus-office_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/off-elegant_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/off-modern_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/off-office_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/pri-bottle_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/pri-mail_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/pri-marine_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/ru/pri-redline_l.ott
drwxr-xr-x root/root usr/lib/openoffice/share/template/wizard/letter/sk/
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/sk/bus-elegant_l.ott
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/sk/bus-modern_l.ott
@@ -4008,6 +4044,17 @@
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/sv/pri-mail_l.ott
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/sv/pri-marine_l.ott
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/sv/pri-redline_l.ott
+drwxr-xr-x root/root usr/lib/openoffice/share/template/wizard/letter/tr/
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/bus-elegant_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/bus-modern_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/bus-office_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/off-elegant_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/off-modern_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/off-office_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/pri-bottle_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/pri-mail_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/pri-marine_l.ott
+-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/tr/pri-redline_l.ott
drwxr-xr-x root/root usr/lib/openoffice/share/template/wizard/letter/zh-CN/
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/zh-CN/bus-elegant_l.ott
-r--r--r-- root/root usr/lib/openoffice/share/template/wizard/letter/zh-CN/bus-modern_l.ott
Modified: crux-2.2/ports/opt/openoffice/.md5sum
===================================================================
--- crux-2.2/ports/opt/openoffice/.md5sum 2006-03-26 01:51:53 UTC (rev 1019)
+++ crux-2.2/ports/opt/openoffice/.md5sum 2006-03-26 02:41:56 UTC (rev 1020)
@@ -1 +1 @@
-e0d123e5f316bef78bfdf5a008837577 OOo_2.0.1_LinuxIntel_install.tar.gz
+fe31fda77c5a5d3ba40f5b5709b81533 OOo_2.0.2_LinuxIntel_install.tar.gz
Modified: crux-2.2/ports/opt/openoffice/Pkgfile
===================================================================
--- crux-2.2/ports/opt/openoffice/Pkgfile 2006-03-26 01:51:53 UTC (rev 1019)
+++ crux-2.2/ports/opt/openoffice/Pkgfile 2006-03-26 02:41:56 UTC (rev 1020)
@@ -5,7 +5,7 @@
# Depends on: x11, rpm2targz
name=openoffice
-version=2.0.1
+version=2.0.2
release=1
source=(http://na.mirror.garr.it/mirrors/openoffice/stable/$version/OOo_${version}_LinuxIntel_install.tar.gz)
1
0
Author: sip
Date: 2006-03-26 03:51:53 +0200 (Sun, 26 Mar 2006)
New Revision: 1019
Added:
crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch
Modified:
crux-2.2/ports/opt/libsdl/.md5sum
crux-2.2/ports/opt/libsdl/Pkgfile
Log:
libsdl: added gcc4 patch
Modified: crux-2.2/ports/opt/libsdl/.md5sum
===================================================================
--- crux-2.2/ports/opt/libsdl/.md5sum 2006-03-26 01:30:40 UTC (rev 1018)
+++ crux-2.2/ports/opt/libsdl/.md5sum 2006-03-26 01:51:53 UTC (rev 1019)
@@ -1 +1,2 @@
80919ef556425ff82a8555ff40a579a0 SDL-1.2.9.tar.gz
+ba148e589d8577925883564356a25bbc libsdl-1.2.9-gcc4.patch
Modified: crux-2.2/ports/opt/libsdl/Pkgfile
===================================================================
--- crux-2.2/ports/opt/libsdl/Pkgfile 2006-03-26 01:30:40 UTC (rev 1018)
+++ crux-2.2/ports/opt/libsdl/Pkgfile 2006-03-26 01:51:53 UTC (rev 1019)
@@ -1,18 +1,20 @@
# Description: SDL, Simple DirectMedia Layer
+# Description: a multimedia library which provides fast access to both graphics framebuffers and audio devices
# URL: http://www.libsdl.org
-# Maintainer: Simone Rota, sip at varlock dot com
-# Packager: Daniel Mueller, daniel at danm dot de
+# Maintainer: Simone Rota, sip at crux dot nu
+# Packager: sten, nick dot steeves at shaw dot ca
# Depends on: alsa-lib
name=libsdl
version=1.2.9
-release=1
-source=(http://www.libsdl.org/release/SDL-$version.tar.gz)
+release=2
+source=(http://www.libsdl.org/release/SDL-$version.tar.gz $name-$version-gcc4.patch)
build () {
cd SDL-$version
+ patch -p1 -i $SRC/$name-$version-gcc4.patch
./configure --prefix=/usr \
- --enable-alsa
+ --enable-alsa
make
make DESTDIR=$PKG install
}
Added: crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch
===================================================================
--- crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch (rev 0)
+++ crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch 2006-03-26 01:51:53 UTC (rev 1019)
@@ -0,0 +1,467 @@
+# The origins of this patch are the following two URLs
+# http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/SDL/FC-5/SDL-1.2.9-yuv…
+# http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/SDL/FC-5/SDL-1.2.8-gcc…
+
+diff -ru SDL-1.2.9.orig/src/hermes/HeadMMX.h SDL-1.2.9/src/hermes/HeadMMX.h
+--- SDL-1.2.9.orig/src/hermes/HeadMMX.h 2006-03-21 16:34:57.000000000 -0700
++++ SDL-1.2.9/src/hermes/HeadMMX.h 2006-03-21 16:36:07.000000000 -0700
+@@ -50,21 +50,19 @@
+ extern "C" {
+ #endif
+
+- void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
+-#if 0
+- void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
+- void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24")));
+- void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16")));
+- void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8")));
+-
+- void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
+-#endif
+-
+- void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
+- void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
+- void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
+- void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
+- void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
++ extern void _ConvertMMX(HermesConverterInterface *);
++ extern void _ConvertMMXpII32_24RGB888();
++ extern void _ConvertMMXpII32_16RGB565();
++ extern void _ConvertMMXpII32_16BGR565();
++ extern void _ConvertMMXpII32_16RGB555();
++ extern void _ConvertMMXpII32_16BGR555();
++
++ #define ConvertMMX _ConvertMMX
++ #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
++ #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
++ #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
++ #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
++ #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
+
+ #ifdef __cplusplus
+ }
+diff -ru SDL-1.2.9.orig/src/hermes/HeadX86.h SDL-1.2.9/src/hermes/HeadX86.h
+--- SDL-1.2.9.orig/src/hermes/HeadX86.h 2006-03-21 16:34:57.000000000 -0700
++++ SDL-1.2.9/src/hermes/HeadX86.h 2006-03-21 16:36:07.000000000 -0700
+@@ -79,56 +79,47 @@
+ extern "C" {
+ #endif
+
+- int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
++ extern int _Hermes_X86_CPU();
+
+- void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
++ extern void _ConvertX86(HermesConverterInterface *);
++
++ extern void _ConvertX86p32_32BGR888();
++ extern void _ConvertX86p32_32RGBA888();
++ extern void _ConvertX86p32_32BGRA888();
++ extern void _ConvertX86p32_24RGB888();
++ extern void _ConvertX86p32_24BGR888();
++ extern void _ConvertX86p32_16RGB565();
++ extern void _ConvertX86p32_16BGR565();
++ extern void _ConvertX86p32_16RGB555();
++ extern void _ConvertX86p32_16BGR555();
++ extern void _ConvertX86p32_8RGB332();
++
++ extern void _ConvertX86p16_16BGR565();
++ extern void _ConvertX86p16_16RGB555();
++ extern void _ConvertX86p16_16BGR555();
++ extern void _ConvertX86p16_8RGB332();
++
++
++ #define Hermes_X86_CPU _Hermes_X86_CPU
++
++ #define ConvertX86 _ConvertX86
++
++ #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
++ #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
++ #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
++ #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
++ #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
++ #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
++ #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
++ #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
++ #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
++ #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
++
++ #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
++ #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
++ #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
++ #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
+
+-#if 0
+- void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
+- void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24")));
+- void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16")));
+- void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8")));
+-#endif
+-
+- void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
+- void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
+- void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
+- void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
+- void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
+- void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
+- void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
+- void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
+- void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
+- void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
+-
+-#if 0
+- void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
+- void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
+- void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
+- void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
+- void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
+- void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
+-#endif
+- void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
+- void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
+- void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
+- void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
+-
+-#if 0
+- void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
+- void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
+- void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
+- void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
+-
+- void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
+- void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
+- void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
+-
+- extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
+- extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
+- extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
+- extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
+-#endif
+
+ #ifdef __cplusplus
+ }
+diff -ru SDL-1.2.9.orig/src/video/SDL_yuv_mmx.c SDL-1.2.9/src/video/SDL_yuv_mmx.c
+--- SDL-1.2.9.orig/src/video/SDL_yuv_mmx.c 2006-03-21 16:34:57.000000000 -0700
++++ SDL-1.2.9/src/video/SDL_yuv_mmx.c 2006-03-21 16:36:37.000000000 -0700
+@@ -30,42 +30,31 @@
+
+ #include "SDL_types.h"
+
+-#if __GNUC__ > 2
+-# undef GCC2_HACK
+-#else
+-# define GCC2_HACK
+-#endif
+-
+-
+-#if defined(GCC2_HACK) && defined (__ELF__)
+-#define ASM_VAR(X) _##X
+-#else
+-#define ASM_VAR(X) X
+-#endif
++#define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used))
+
+-static volatile unsigned int ASM_VAR(MMX_0080w)[] = {0x00800080, 0x00800080};
+-static volatile unsigned int ASM_VAR(MMX_00FFw)[] = {0x00ff00ff, 0x00ff00ff};
+-static volatile unsigned int ASM_VAR(MMX_FF00w)[] = {0xff00ff00, 0xff00ff00};
+-
+-static volatile unsigned short ASM_VAR(MMX_Ycoeff)[] = {0x004a, 0x004a, 0x004a, 0x004a};
+-
+-static volatile unsigned short ASM_VAR(MMX_UbluRGB)[] = {0x0072, 0x0072, 0x0072, 0x0072};
+-static volatile unsigned short ASM_VAR(MMX_VredRGB)[] = {0x0059, 0x0059, 0x0059, 0x0059};
+-static volatile unsigned short ASM_VAR(MMX_UgrnRGB)[] = {0xffea, 0xffea, 0xffea, 0xffea};
+-static volatile unsigned short ASM_VAR(MMX_VgrnRGB)[] = {0xffd2, 0xffd2, 0xffd2, 0xffd2};
+-
+-static volatile unsigned short ASM_VAR(MMX_Ublu5x5)[] = {0x0081, 0x0081, 0x0081, 0x0081};
+-static volatile unsigned short ASM_VAR(MMX_Vred5x5)[] = {0x0066, 0x0066, 0x0066, 0x0066};
+-static volatile unsigned short ASM_VAR(MMX_Ugrn555)[] = {0xffe7, 0xffe7, 0xffe7, 0xffe7};
+-static volatile unsigned short ASM_VAR(MMX_Vgrn555)[] = {0xffcc, 0xffcc, 0xffcc, 0xffcc};
+-static volatile unsigned short ASM_VAR(MMX_Ugrn565)[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
+-static volatile unsigned short ASM_VAR(MMX_Vgrn565)[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
+-
+-static volatile unsigned short ASM_VAR(MMX_red555)[] = {0x7c00, 0x7c00, 0x7c00, 0x7c00};
+-static volatile unsigned short ASM_VAR(MMX_red565)[] = {0xf800, 0xf800, 0xf800, 0xf800};
+-static volatile unsigned short ASM_VAR(MMX_grn555)[] = {0x03e0, 0x03e0, 0x03e0, 0x03e0};
+-static volatile unsigned short ASM_VAR(MMX_grn565)[] = {0x07e0, 0x07e0, 0x07e0, 0x07e0};
+-static volatile unsigned short ASM_VAR(MMX_blu5x5)[] = {0x001f, 0x001f, 0x001f, 0x001f};
++static unsigned int ASM_ARRAY(MMX_0080w) = {0x00800080, 0x00800080};
++static unsigned int ASM_ARRAY(MMX_00FFw) = {0x00ff00ff, 0x00ff00ff};
++static unsigned int ASM_ARRAY(MMX_FF00w) = {0xff00ff00, 0xff00ff00};
++
++static unsigned short ASM_ARRAY(MMX_Ycoeff) = {0x004a, 0x004a, 0x004a, 0x004a};
++
++static unsigned short ASM_ARRAY(MMX_UbluRGB) = {0x0072, 0x0072, 0x0072, 0x0072};
++static unsigned short ASM_ARRAY(MMX_VredRGB) = {0x0059, 0x0059, 0x0059, 0x0059};
++static unsigned short ASM_ARRAY(MMX_UgrnRGB) = {0xffea, 0xffea, 0xffea, 0xffea};
++static unsigned short ASM_ARRAY(MMX_VgrnRGB) = {0xffd2, 0xffd2, 0xffd2, 0xffd2};
++
++static unsigned short ASM_ARRAY(MMX_Ublu5x5) = {0x0081, 0x0081, 0x0081, 0x0081};
++static unsigned short ASM_ARRAY(MMX_Vred5x5) = {0x0066, 0x0066, 0x0066, 0x0066};
++static unsigned short ASM_ARRAY(MMX_Ugrn555) = {0xffe7, 0xffe7, 0xffe7, 0xffe7};
++static unsigned short ASM_ARRAY(MMX_Vgrn555) = {0xffcc, 0xffcc, 0xffcc, 0xffcc};
++static unsigned short ASM_ARRAY(MMX_Ugrn565) = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
++static unsigned short ASM_ARRAY(MMX_Vgrn565) = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
++
++static unsigned short ASM_ARRAY(MMX_red555) = {0x7c00, 0x7c00, 0x7c00, 0x7c00};
++static unsigned short ASM_ARRAY(MMX_red565) = {0xf800, 0xf800, 0xf800, 0xf800};
++static unsigned short ASM_ARRAY(MMX_grn555) = {0x03e0, 0x03e0, 0x03e0, 0x03e0};
++static unsigned short ASM_ARRAY(MMX_grn565) = {0x07e0, 0x07e0, 0x07e0, 0x07e0};
++static unsigned short ASM_ARRAY(MMX_blu5x5) = {0x001f, 0x001f, 0x001f, 0x001f};
+
+ /**
+ This MMX assembler is my first assembler/MMX program ever.
+@@ -127,21 +116,12 @@
+ "movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0
+ "punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0
+ "punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0
+-#ifdef GCC2_HACK
+ "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
+-#else
+- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
+-#endif
+
+ // create Cr_g (result in mm0)
+ "movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0
+-#ifdef GCC2_HACK
+ "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64
+ "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64
+-#else
+- "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64
+- "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64
+-#endif
+ "psraw $6, %%mm0\n" // red=red/64
+ "psraw $6, %%mm1\n" // red=red/64
+
+@@ -150,13 +130,8 @@
+ "movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0
+ "punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0
+ "movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0
+-#ifdef GCC2_HACK
+ "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0
+ "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0
+-#else
+- "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0
+- "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0
+-#endif
+ "psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1
+
+ // create R (result in mm6)
+@@ -173,20 +148,11 @@
+ "movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0
+ "punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0
+ "punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0
+-#ifdef GCC2_HACK
+ "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
+-#else
+- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
+-#endif
+ // create Cb_g (result in mm5)
+ "movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0
+-#ifdef GCC2_HACK
+ "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64
+ "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64
+-#else
+- "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64
+- "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64
+-#endif
+ "psraw $6, %%mm5\n" // blue=red/64
+ "psraw $6, %%mm1\n" // blue=blue/64
+
+@@ -268,17 +234,7 @@
+ "popl %%ebx\n"
+ :
+ : "m" (cr), "r"(cb),"r"(lum),
+- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
+-#ifndef GCC2_HACK
+- ,[_MMX_0080w] "m" (*MMX_0080w),
+- [_MMX_00FFw] "m" (*MMX_00FFw),
+- [_MMX_FF00w] "m" (*MMX_FF00w),
+- [_MMX_VgrnRGB] "m" (*MMX_VgrnRGB),
+- [_MMX_VredRGB] "m" (*MMX_VredRGB),
+- [_MMX_UgrnRGB] "m" (*MMX_UgrnRGB),
+- [_MMX_UbluRGB] "m" (*MMX_UbluRGB)
+-#endif
+- );
++ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod));
+ }
+
+ void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix,
+@@ -307,48 +263,21 @@
+ "movd (%%ebx), %%mm1\n" // 4 Cr 0 0 0 0 v3 v2 v1 v0
+ "punpcklbw %%mm7, %%mm0\n" // 4 W cb 0 u3 0 u2 0 u1 0 u0
+ "punpcklbw %%mm7, %%mm1\n" // 4 W cr 0 v3 0 v2 0 v1 0 v0
+-#ifdef GCC2_HACK
+ "psubw _MMX_0080w, %%mm0\n"
+ "psubw _MMX_0080w, %%mm1\n"
+-#else
+- "psubw %[_MMX_0080w], %%mm0\n"
+- "psubw %[_MMX_0080w], %%mm1\n"
+-#endif
+ "movq %%mm0, %%mm2\n" // Cb 0 u3 0 u2 0 u1 0 u0
+ "movq %%mm1, %%mm3\n" // Cr
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Ugrn565, %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0
+-#else
+- "pmullw %[_MMX_Ugrn565], %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0
+-#endif
+ "movq (%2), %%mm6\n" // L1 l7 L6 L5 L4 L3 L2 L1 L0
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Ublu5x5, %%mm0\n" // Cb2blue
+ "pand _MMX_00FFw, %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0
+ "pmullw _MMX_Vgrn565, %%mm3\n" // Cr2green
+-#else
+- "pmullw %[_MMX_Ublu5x5], %%mm0\n" // Cb2blue
+- "pand %[_MMX_00FFw], %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0
+- "pmullw %[_MMX_Vgrn565], %%mm3\n" // Cr2green
+-#endif
+ "movq (%2), %%mm7\n" // L2
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Vred5x5, %%mm1\n" // Cr2red
+-#else
+- "pmullw %[_MMX_Vred5x5], %%mm1\n" // Cr2red
+-#endif
+ "psrlw $8, %%mm7\n" // L2 00 L7 00 L5 00 L3 00 L1
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Ycoeff, %%mm6\n" // lum1
+-#else
+- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum1
+-#endif
+ "paddw %%mm3, %%mm2\n" // Cb2green + Cr2green == green
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Ycoeff, %%mm7\n" // lum2
+-#else
+- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum2
+-#endif
+
+ "movq %%mm6, %%mm4\n" // lum1
+ "paddw %%mm0, %%mm6\n" // lum1 +blue 00 B6 00 B4 00 B2 00 B0
+@@ -366,20 +295,11 @@
+ "punpcklbw %%mm4, %%mm4\n"
+ "punpcklbw %%mm5, %%mm5\n"
+
+-#ifdef GCC2_HACK
+ "pand _MMX_red565, %%mm4\n"
+-#else
+- "pand %[_MMX_red565], %%mm4\n"
+-#endif
+ "psllw $3, %%mm5\n" // GREEN 1
+ "punpcklbw %%mm6, %%mm6\n"
+-#ifdef GCC2_HACK
+ "pand _MMX_grn565, %%mm5\n"
+ "pand _MMX_red565, %%mm6\n"
+-#else
+- "pand %[_MMX_grn565], %%mm5\n"
+- "pand %[_MMX_red565], %%mm6\n"
+-#endif
+ "por %%mm5, %%mm4\n" //
+ "psrlw $11, %%mm6\n" // BLUE 1
+ "movq %%mm3, %%mm5\n" // lum2
+@@ -393,44 +313,23 @@
+ "packuswb %%mm3, %%mm3\n"
+ "packuswb %%mm5, %%mm5\n"
+ "packuswb %%mm7, %%mm7\n"
+-#ifdef GCC2_HACK
+ "pand _MMX_00FFw, %%mm6\n" // L3
+-#else
+- "pand %[_MMX_00FFw], %%mm6\n" // L3
+-#endif
+ "punpcklbw %%mm3, %%mm3\n"
+ "punpcklbw %%mm5, %%mm5\n"
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Ycoeff, %%mm6\n" // lum3
+-#else
+- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum3
+-#endif
+ "punpcklbw %%mm7, %%mm7\n"
+ "psllw $3, %%mm5\n" // GREEN 2
+-#ifdef GCC2_HACK
+ "pand _MMX_red565, %%mm7\n"
+ "pand _MMX_red565, %%mm3\n"
+-#else
+- "pand %[_MMX_red565], %%mm7\n"
+- "pand %[_MMX_red565], %%mm3\n"
+-#endif
+ "psrlw $11, %%mm7\n" // BLUE 2
+-#ifdef GCC2_HACK
+ "pand _MMX_grn565, %%mm5\n"
+-#else
+- "pand %[_MMX_grn565], %%mm5\n"
+-#endif
+ "por %%mm7, %%mm3\n"
+ "movq (%2,%4), %%mm7\n" // L4 load lum2
+ "por %%mm5, %%mm3\n" //
+ "psrlw $8, %%mm7\n" // L4
+ "movq %%mm4, %%mm5\n"
+ "punpcklwd %%mm3, %%mm4\n"
+-#ifdef GCC2_HACK
+ "pmullw _MMX_Ycoeff, %%mm7\n" // lum4
+-#else
+- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum4
+-#endif
+ "punpckhwd %%mm3, %%mm5\n"
+
+ "movq %%mm4, (%3)\n" // write row1
+@@ -457,20 +356,11 @@
+ "punpcklbw %%mm5, %%mm5\n"
+ "punpcklbw %%mm6, %%mm6\n"
+ "psllw $3, %%mm5\n" // GREEN 3
+-#ifdef GCC2_HACK
+ "pand _MMX_red565, %%mm4\n"
+-#else
+- "pand %[_MMX_red565], %%mm4\n"
+-#endif
+ "psraw $6, %%mm3\n" // psr 6
+ "psraw $6, %%mm0\n"
+-#ifdef GCC2_HACK
+ "pand _MMX_red565, %%mm6\n" // BLUE
+ "pand _MMX_grn565, %%mm5\n"
+-#else
+- "pand %[_MMX_red565], %%mm6\n" // BLUE
+- "pand %[_MMX_grn565], %%mm5\n"
+-#endif
+ "psrlw $11, %%mm6\n" // BLUE 3
+ "por %%mm5, %%mm4\n"
+ "psraw $6, %%mm7\n"
+@@ -481,20 +371,11 @@
+ "punpcklbw %%mm3, %%mm3\n"
+ "punpcklbw %%mm0, %%mm0\n"
+ "punpcklbw %%mm7, %%mm7\n"
+-#ifdef GCC2_HACK
+ "pand _MMX_red565, %%mm3\n"
+ "pand _MMX_red565, %%mm7\n" // BLUE
+-#else
+- "pand %[_MMX_red565], %%mm3\n"
+- "pand %[_MMX_red565], %%mm7\n" // BLUE
+-#endif
+ "psllw $3, %%mm0\n" // GREEN 4
+ "psrlw $11, %%mm7\n"
+-#ifdef GCC2_HACK
+ "pand _MMX_grn565, %%mm0\n"
+-#else
+- "pand %[_MMX_grn565], %%mm0\n"
+-#endif
+ "por %%mm7, %%mm3\n"
+ "por %%mm0, %%mm3\n"
+
+@@ -526,21 +407,7 @@
+ "popl %%ebx\n"
+ :
+ :"m" (cr), "r"(cb),"r"(lum),
+- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
+-#ifndef GCC2_HACK
+- ,[_MMX_0080w] "m" (*MMX_0080w),
+- [_MMX_Ugrn565] "m" (*MMX_Ugrn565),
+- [_MMX_Ublu5x5] "m" (*MMX_Ublu5x5),
+- [_MMX_00FFw] "m" (*MMX_00FFw),
+- [_MMX_Vgrn565] "m" (*MMX_Vgrn565),
+- [_MMX_Vred5x5] "m" (*MMX_Vred5x5),
+- [_MMX_Ycoeff] "m" (*MMX_Ycoeff),
+- [_MMX_red565] "m" (*MMX_red565),
+- [_MMX_grn565] "m" (*MMX_grn565)
+-#endif
+- );
++ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod));
+ }
+
+-#undef GCC2_HACK
+-
+ #endif /* GCC i386 inline assembly */
1
0
Author: sip
Date: 2006-03-26 03:30:40 +0200 (Sun, 26 Mar 2006)
New Revision: 1018
Added:
crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch
Removed:
crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch
Modified:
crux-2.1/ports/opt/xpdf/.md5sum
crux-2.1/ports/opt/xpdf/Pkgfile
Log:
[security] xpdf: updated to 3.1pl2
Modified: crux-2.1/ports/opt/xpdf/.md5sum
===================================================================
--- crux-2.1/ports/opt/xpdf/.md5sum 2006-03-26 01:27:54 UTC (rev 1017)
+++ crux-2.1/ports/opt/xpdf/.md5sum 2006-03-26 01:30:40 UTC (rev 1018)
@@ -1,2 +1,2 @@
e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz
-4184783da2885ecde3c2256de5144555 xpdf-3.01pl1.patch
+8f1f5d37153c7e98f794f18d0b80fc25 xpdf-3.01pl2.patch
Modified: crux-2.1/ports/opt/xpdf/Pkgfile
===================================================================
--- crux-2.1/ports/opt/xpdf/Pkgfile 2006-03-26 01:27:54 UTC (rev 1017)
+++ crux-2.1/ports/opt/xpdf/Pkgfile 2006-03-26 01:30:40 UTC (rev 1018)
@@ -5,7 +5,7 @@
# Depends on: lesstif, t1lib
name=xpdf
-version=3.01pl1
+version=3.01pl2
release=1
source=(ftp://ftp.foolabs.com/pub/xpdf/$name-3.01.tar.gz \
$name-$version.patch)
Deleted: crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch
===================================================================
--- crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:27:54 UTC (rev 1017)
+++ crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:30:40 UTC (rev 1018)
@@ -1,168 +0,0 @@
-diff -c -r xpdf-3.01-orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
-*** xpdf-3.01-orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/JPXStream.cc Thu Nov 3 16:50:39 2005
-***************
-*** 783,789 ****
- int segType;
- GBool haveSIZ, haveCOD, haveQCD, haveSOT;
- Guint precinctSize, style;
-! Guint segLen, capabilities, comp, i, j, r;
-
- //----- main header
- haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
---- 783,789 ----
- int segType;
- GBool haveSIZ, haveCOD, haveQCD, haveSOT;
- Guint precinctSize, style;
-! Guint segLen, capabilities, nTiles, comp, i, j, r;
-
- //----- main header
- haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-***************
-*** 818,825 ****
- / img.xTileSize;
- img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- / img.yTileSize;
-! img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
-! sizeof(JPXTile));
- for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- sizeof(JPXTileComp));
---- 818,830 ----
- / img.xTileSize;
- img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- / img.yTileSize;
-! nTiles = img.nXTiles * img.nYTiles;
-! // check for overflow before allocating memory
-! if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) {
-! error(getPos(), "Bad tile count in JPX SIZ marker segment");
-! return gFalse;
-! }
-! img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
- for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- sizeof(JPXTileComp));
-diff -c -r xpdf-3.01-orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
-*** xpdf-3.01-orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/Stream.cc Thu Nov 3 16:50:39 2005
-***************
-*** 401,418 ****
-
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- int widthA, int nCompsA, int nBitsA) {
- str = strA;
- predictor = predictorA;
- width = widthA;
- nComps = nCompsA;
- nBits = nBitsA;
-
- nVals = width * nComps;
- pixBytes = (nComps * nBits + 7) >> 3;
-! rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
- predLine = (Guchar *)gmalloc(rowBytes);
- memset(predLine, 0, rowBytes);
- predIdx = rowBytes;
- }
-
- StreamPredictor::~StreamPredictor() {
---- 401,433 ----
-
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- int widthA, int nCompsA, int nBitsA) {
-+ int totalBits;
-+
- str = strA;
- predictor = predictorA;
- width = widthA;
- nComps = nCompsA;
- nBits = nBitsA;
-+ predLine = NULL;
-+ ok = gFalse;
-
- nVals = width * nComps;
-+ totalBits = nVals * nBits;
-+ if (totalBits == 0 ||
-+ (totalBits / nBits) / nComps != width ||
-+ totalBits + 7 < 0) {
-+ return;
-+ }
- pixBytes = (nComps * nBits + 7) >> 3;
-! rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-! if (rowBytes < 0) {
-! return;
-! }
- predLine = (Guchar *)gmalloc(rowBytes);
- memset(predLine, 0, rowBytes);
- predIdx = rowBytes;
-+
-+ ok = gTrue;
- }
-
- StreamPredictor::~StreamPredictor() {
-***************
-*** 1004,1009 ****
---- 1019,1028 ----
- FilterStream(strA) {
- if (predictor != 1) {
- pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+ if (!pred->isOk()) {
-+ delete pred;
-+ pred = NULL;
-+ }
- } else {
- pred = NULL;
- }
-***************
-*** 2899,2904 ****
---- 2918,2931 ----
- height = read16();
- width = read16();
- numComps = str->getChar();
-+ if (numComps <= 0 || numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream", prec);
-+ return gFalse;
-+ }
-+ if (numComps <= 0 || numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream", prec);
-+ return gFalse;
-+ }
- if (prec != 8) {
- error(getPos(), "Bad DCT precision %d", prec);
- return gFalse;
-***************
-*** 3827,3832 ****
---- 3854,3863 ----
- FilterStream(strA) {
- if (predictor != 1) {
- pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+ if (!pred->isOk()) {
-+ delete pred;
-+ pred = NULL;
-+ }
- } else {
- pred = NULL;
- }
-diff -c -r xpdf-3.01-orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
-*** xpdf-3.01-orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/Stream.h Thu Nov 3 16:50:39 2005
-***************
-*** 232,237 ****
---- 232,239 ----
-
- ~StreamPredictor();
-
-+ GBool isOk() { return ok; }
-+
- int lookChar();
- int getChar();
-
-***************
-*** 249,254 ****
---- 251,257 ----
- int rowBytes; // bytes per line
- Guchar *predLine; // line buffer
- int predIdx; // current index in predLine
-+ GBool ok;
- };
-
- //------------------------------------------------------------------------
Added: crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch
===================================================================
--- crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch (rev 0)
+++ crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch 2006-03-26 01:30:40 UTC (rev 1018)
@@ -0,0 +1,471 @@
+diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
+*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005
+--- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006
+***************
+*** 11,16 ****
+--- 11,17 ----
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++ #include <limits.h>
+ #include "gmem.h"
+
+ #ifdef DEBUG_MEM
+***************
+*** 63,69 ****
+ int lst;
+ unsigned long *trl, *p;
+
+! if (size == 0)
+ return NULL;
+ size1 = gMemDataSize(size);
+ if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
+--- 64,70 ----
+ int lst;
+ unsigned long *trl, *p;
+
+! if (size <= 0)
+ return NULL;
+ size1 = gMemDataSize(size);
+ if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
+***************
+*** 86,92 ****
+ #else
+ void *p;
+
+! if (size == 0)
+ return NULL;
+ if (!(p = malloc(size))) {
+ fprintf(stderr, "Out of memory\n");
+--- 87,93 ----
+ #else
+ void *p;
+
+! if (size <= 0)
+ return NULL;
+ if (!(p = malloc(size))) {
+ fprintf(stderr, "Out of memory\n");
+***************
+*** 102,108 ****
+ void *q;
+ int oldSize;
+
+! if (size == 0) {
+ if (p)
+ gfree(p);
+ return NULL;
+--- 103,109 ----
+ void *q;
+ int oldSize;
+
+! if (size <= 0) {
+ if (p)
+ gfree(p);
+ return NULL;
+***************
+*** 120,126 ****
+ #else
+ void *q;
+
+! if (size == 0) {
+ if (p)
+ free(p);
+ return NULL;
+--- 121,127 ----
+ #else
+ void *q;
+
+! if (size <= 0) {
+ if (p)
+ free(p);
+ return NULL;
+***************
+*** 140,147 ****
+ void *gmallocn(int nObjs, int objSize) {
+ int n;
+
+ n = nObjs * objSize;
+! if (objSize == 0 || n / objSize != nObjs) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+--- 141,151 ----
+ void *gmallocn(int nObjs, int objSize) {
+ int n;
+
++ if (nObjs == 0) {
++ return NULL;
++ }
+ n = nObjs * objSize;
+! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+***************
+*** 151,158 ****
+ void *greallocn(void *p, int nObjs, int objSize) {
+ int n;
+
+ n = nObjs * objSize;
+! if (objSize == 0 || n / objSize != nObjs) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+--- 155,168 ----
+ void *greallocn(void *p, int nObjs, int objSize) {
+ int n;
+
++ if (nObjs == 0) {
++ if (p) {
++ gfree(p);
++ }
++ return NULL;
++ }
+ n = nObjs * objSize;
+! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
+*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006
+***************
+*** 13,18 ****
+--- 13,19 ----
+ #endif
+
+ #include <stdlib.h>
++ #include <limits.h>
+ #include "GList.h"
+ #include "Error.h"
+ #include "JArithmeticDecoder.h"
+***************
+*** 681,686 ****
+--- 682,691 ----
+ w = wA;
+ h = hA;
+ line = (wA + 7) >> 3;
++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++ data = NULL;
++ return;
++ }
+ // need to allocate one extra guard byte for use in combine()
+ data = (Guchar *)gmalloc(h * line + 1);
+ data[h * line] = 0;
+***************
+*** 692,697 ****
+--- 697,706 ----
+ w = bitmap->w;
+ h = bitmap->h;
+ line = bitmap->line;
++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++ data = NULL;
++ return;
++ }
+ // need to allocate one extra guard byte for use in combine()
+ data = (Guchar *)gmalloc(h * line + 1);
+ memcpy(data, bitmap->data, h * line);
+***************
+*** 720,726 ****
+ }
+
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+! if (newH <= h) {
+ return;
+ }
+ // need to allocate one extra guard byte for use in combine()
+--- 729,735 ----
+ }
+
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
+ return;
+ }
+ // need to allocate one extra guard byte for use in combine()
+***************
+*** 2294,2299 ****
+--- 2303,2316 ----
+ !readUWord(&stepX) || !readUWord(&stepY)) {
+ goto eofError;
+ }
++ if (w == 0 || h == 0 || w >= INT_MAX / h) {
++ error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
++ return;
++ }
++ if (gridH == 0 || gridW >= INT_MAX / gridH) {
++ error(getPos(), "Bad grid size in JBIG2 halftone segment");
++ return;
++ }
+
+ // get pattern dictionary
+ if (nRefSegs != 1) {
+diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
+*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006
+***************
+*** 12,17 ****
+--- 12,18 ----
+ #pragma implementation
+ #endif
+
++ #include <limits.h>
+ #include "gmem.h"
+ #include "Error.h"
+ #include "JArithmeticDecoder.h"
+***************
+*** 818,823 ****
+--- 819,830 ----
+ / img.xTileSize;
+ img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
+ / img.yTileSize;
++ // check for overflow before allocating memory
++ if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
++ img.nXTiles >= INT_MAX / img.nYTiles) {
++ error(getPos(), "Bad tile count in JPX SIZ marker segment");
++ return gFalse;
++ }
+ img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
+ sizeof(JPXTile));
+ for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
+diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
+*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006
+***************
+*** 15,20 ****
+--- 15,21 ----
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++ #include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+***************
+*** 406,418 ****
+--- 407,432 ----
+ width = widthA;
+ nComps = nCompsA;
+ nBits = nBitsA;
++ predLine = NULL;
++ ok = gFalse;
+
+ nVals = width * nComps;
++ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++ nComps >= INT_MAX / nBits ||
++ width >= INT_MAX / nComps / nBits ||
++ nVals * nBits + 7 < 0) {
++ return;
++ }
+ pixBytes = (nComps * nBits + 7) >> 3;
+ rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++ if (rowBytes <= 0) {
++ return;
++ }
+ predLine = (Guchar *)gmalloc(rowBytes);
+ memset(predLine, 0, rowBytes);
+ predIdx = rowBytes;
++
++ ok = gTrue;
+ }
+
+ StreamPredictor::~StreamPredictor() {
+***************
+*** 1004,1009 ****
+--- 1018,1027 ----
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if (!pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+***************
+*** 1259,1264 ****
+--- 1277,1285 ----
+ if (columns < 1) {
+ columns = 1;
+ }
++ if (columns + 4 <= 0) {
++ columns = INT_MAX - 4;
++ }
+ rows = rowsA;
+ endOfBlock = endOfBlockA;
+ black = blackA;
+***************
+*** 2899,2904 ****
+--- 2920,2930 ----
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ numComps = 0;
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+***************
+*** 2925,2930 ****
+--- 2951,2961 ----
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ numComps = 0;
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+***************
+*** 2947,2952 ****
+--- 2978,2988 ----
+
+ length = read16() - 2;
+ scanInfo.numComps = str->getChar();
++ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ scanInfo.numComps = 0;
++ return gFalse;
++ }
+ --length;
+ if (length != 2 * scanInfo.numComps + 3) {
+ error(getPos(), "Bad DCT scan info block");
+***************
+*** 3041,3046 ****
+--- 3077,3083 ----
+ numACHuffTables = index+1;
+ tbl = &acHuffTables[index];
+ } else {
++ index &= 0x0f;
+ if (index >= numDCHuffTables)
+ numDCHuffTables = index+1;
+ tbl = &dcHuffTables[index];
+***************
+*** 3827,3832 ****
+--- 3864,3873 ----
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if (!pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
+*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006
+***************
+*** 232,237 ****
+--- 232,239 ----
+
+ ~StreamPredictor();
+
++ GBool isOk() { return ok; }
++
+ int lookChar();
+ int getChar();
+
+***************
+*** 249,254 ****
+--- 251,257 ----
+ int rowBytes; // bytes per line
+ Guchar *predLine; // line buffer
+ int predIdx; // current index in predLine
++ GBool ok;
+ };
+
+ //------------------------------------------------------------------------
+***************
+*** 527,533 ****
+ short getWhiteCode();
+ short getBlackCode();
+ short lookBits(int n);
+! void eatBits(int n) { inputBits -= n; }
+ };
+
+ //------------------------------------------------------------------------
+--- 530,536 ----
+ short getWhiteCode();
+ short getBlackCode();
+ short lookBits(int n);
+! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
+ };
+
+ //------------------------------------------------------------------------
+diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
+*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006
+***************
+*** 186,192 ****
+ }
+
+ void SplashXPathScanner::computeIntersections(int y) {
+! SplashCoord ySegMin, ySegMax, xx0, xx1;
+ SplashXPathSeg *seg;
+ int i, j;
+
+--- 186,192 ----
+ }
+
+ void SplashXPathScanner::computeIntersections(int y) {
+! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
+ SplashXPathSeg *seg;
+ int i, j;
+
+***************
+*** 236,254 ****
+ } else if (seg->flags & splashXPathVert) {
+ xx0 = xx1 = seg->x0;
+ } else {
+! if (ySegMin <= y) {
+! // intersection with top edge
+! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+ } else {
+! // x coord of segment endpoint with min y coord
+! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
+ }
+! if (ySegMax >= y + 1) {
+! // intersection with bottom edge
+! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
+! } else {
+! // x coord of segment endpoint with max y coord
+! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
+ }
+ }
+ if (xx0 < xx1) {
+--- 236,262 ----
+ } else if (seg->flags & splashXPathVert) {
+ xx0 = xx1 = seg->x0;
+ } else {
+! if (seg->x0 < seg->x1) {
+! xSegMin = seg->x0;
+! xSegMax = seg->x1;
+ } else {
+! xSegMin = seg->x1;
+! xSegMax = seg->x0;
+ }
+! // intersection with top edge
+! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+! // intersection with bottom edge
+! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
+! // the segment may not actually extend to the top and/or bottom edges
+! if (xx0 < xSegMin) {
+! xx0 = xSegMin;
+! } else if (xx0 > xSegMax) {
+! xx0 = xSegMax;
+! }
+! if (xx1 < xSegMin) {
+! xx1 = xSegMin;
+! } else if (xx1 > xSegMax) {
+! xx1 = xSegMax;
+ }
+ }
+ if (xx0 < xx1) {
1
0
Author: sip
Date: 2006-03-26 03:27:54 +0200 (Sun, 26 Mar 2006)
New Revision: 1017
Added:
crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch
Removed:
crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch
Modified:
crux-2.2/ports/opt/xpdf/.md5sum
crux-2.2/ports/opt/xpdf/Pkgfile
Log:
[security] xpdf: updated to 3.1pl2
Modified: crux-2.2/ports/opt/xpdf/.md5sum
===================================================================
--- crux-2.2/ports/opt/xpdf/.md5sum 2006-03-26 01:15:56 UTC (rev 1016)
+++ crux-2.2/ports/opt/xpdf/.md5sum 2006-03-26 01:27:54 UTC (rev 1017)
@@ -1,2 +1,2 @@
e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz
-4184783da2885ecde3c2256de5144555 xpdf-3.01pl1.patch
+8f1f5d37153c7e98f794f18d0b80fc25 xpdf-3.01pl2.patch
Modified: crux-2.2/ports/opt/xpdf/Pkgfile
===================================================================
--- crux-2.2/ports/opt/xpdf/Pkgfile 2006-03-26 01:15:56 UTC (rev 1016)
+++ crux-2.2/ports/opt/xpdf/Pkgfile 2006-03-26 01:27:54 UTC (rev 1017)
@@ -5,7 +5,7 @@
# Depends on: lesstif, t1lib
name=xpdf
-version=3.01pl1
+version=3.01pl2
release=1
source=(ftp://ftp.foolabs.com/pub/xpdf/$name-3.01.tar.gz \
$name-$version.patch)
Deleted: crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch
===================================================================
--- crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:15:56 UTC (rev 1016)
+++ crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:27:54 UTC (rev 1017)
@@ -1,168 +0,0 @@
-diff -c -r xpdf-3.01-orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
-*** xpdf-3.01-orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/JPXStream.cc Thu Nov 3 16:50:39 2005
-***************
-*** 783,789 ****
- int segType;
- GBool haveSIZ, haveCOD, haveQCD, haveSOT;
- Guint precinctSize, style;
-! Guint segLen, capabilities, comp, i, j, r;
-
- //----- main header
- haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
---- 783,789 ----
- int segType;
- GBool haveSIZ, haveCOD, haveQCD, haveSOT;
- Guint precinctSize, style;
-! Guint segLen, capabilities, nTiles, comp, i, j, r;
-
- //----- main header
- haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-***************
-*** 818,825 ****
- / img.xTileSize;
- img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- / img.yTileSize;
-! img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
-! sizeof(JPXTile));
- for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- sizeof(JPXTileComp));
---- 818,830 ----
- / img.xTileSize;
- img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- / img.yTileSize;
-! nTiles = img.nXTiles * img.nYTiles;
-! // check for overflow before allocating memory
-! if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) {
-! error(getPos(), "Bad tile count in JPX SIZ marker segment");
-! return gFalse;
-! }
-! img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
- for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- sizeof(JPXTileComp));
-diff -c -r xpdf-3.01-orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
-*** xpdf-3.01-orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/Stream.cc Thu Nov 3 16:50:39 2005
-***************
-*** 401,418 ****
-
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- int widthA, int nCompsA, int nBitsA) {
- str = strA;
- predictor = predictorA;
- width = widthA;
- nComps = nCompsA;
- nBits = nBitsA;
-
- nVals = width * nComps;
- pixBytes = (nComps * nBits + 7) >> 3;
-! rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
- predLine = (Guchar *)gmalloc(rowBytes);
- memset(predLine, 0, rowBytes);
- predIdx = rowBytes;
- }
-
- StreamPredictor::~StreamPredictor() {
---- 401,433 ----
-
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- int widthA, int nCompsA, int nBitsA) {
-+ int totalBits;
-+
- str = strA;
- predictor = predictorA;
- width = widthA;
- nComps = nCompsA;
- nBits = nBitsA;
-+ predLine = NULL;
-+ ok = gFalse;
-
- nVals = width * nComps;
-+ totalBits = nVals * nBits;
-+ if (totalBits == 0 ||
-+ (totalBits / nBits) / nComps != width ||
-+ totalBits + 7 < 0) {
-+ return;
-+ }
- pixBytes = (nComps * nBits + 7) >> 3;
-! rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-! if (rowBytes < 0) {
-! return;
-! }
- predLine = (Guchar *)gmalloc(rowBytes);
- memset(predLine, 0, rowBytes);
- predIdx = rowBytes;
-+
-+ ok = gTrue;
- }
-
- StreamPredictor::~StreamPredictor() {
-***************
-*** 1004,1009 ****
---- 1019,1028 ----
- FilterStream(strA) {
- if (predictor != 1) {
- pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+ if (!pred->isOk()) {
-+ delete pred;
-+ pred = NULL;
-+ }
- } else {
- pred = NULL;
- }
-***************
-*** 2899,2904 ****
---- 2918,2931 ----
- height = read16();
- width = read16();
- numComps = str->getChar();
-+ if (numComps <= 0 || numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream", prec);
-+ return gFalse;
-+ }
-+ if (numComps <= 0 || numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream", prec);
-+ return gFalse;
-+ }
- if (prec != 8) {
- error(getPos(), "Bad DCT precision %d", prec);
- return gFalse;
-***************
-*** 3827,3832 ****
---- 3854,3863 ----
- FilterStream(strA) {
- if (predictor != 1) {
- pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+ if (!pred->isOk()) {
-+ delete pred;
-+ pred = NULL;
-+ }
- } else {
- pred = NULL;
- }
-diff -c -r xpdf-3.01-orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
-*** xpdf-3.01-orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/Stream.h Thu Nov 3 16:50:39 2005
-***************
-*** 232,237 ****
---- 232,239 ----
-
- ~StreamPredictor();
-
-+ GBool isOk() { return ok; }
-+
- int lookChar();
- int getChar();
-
-***************
-*** 249,254 ****
---- 251,257 ----
- int rowBytes; // bytes per line
- Guchar *predLine; // line buffer
- int predIdx; // current index in predLine
-+ GBool ok;
- };
-
- //------------------------------------------------------------------------
Added: crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch
===================================================================
--- crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch (rev 0)
+++ crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch 2006-03-26 01:27:54 UTC (rev 1017)
@@ -0,0 +1,471 @@
+diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
+*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005
+--- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006
+***************
+*** 11,16 ****
+--- 11,17 ----
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++ #include <limits.h>
+ #include "gmem.h"
+
+ #ifdef DEBUG_MEM
+***************
+*** 63,69 ****
+ int lst;
+ unsigned long *trl, *p;
+
+! if (size == 0)
+ return NULL;
+ size1 = gMemDataSize(size);
+ if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
+--- 64,70 ----
+ int lst;
+ unsigned long *trl, *p;
+
+! if (size <= 0)
+ return NULL;
+ size1 = gMemDataSize(size);
+ if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
+***************
+*** 86,92 ****
+ #else
+ void *p;
+
+! if (size == 0)
+ return NULL;
+ if (!(p = malloc(size))) {
+ fprintf(stderr, "Out of memory\n");
+--- 87,93 ----
+ #else
+ void *p;
+
+! if (size <= 0)
+ return NULL;
+ if (!(p = malloc(size))) {
+ fprintf(stderr, "Out of memory\n");
+***************
+*** 102,108 ****
+ void *q;
+ int oldSize;
+
+! if (size == 0) {
+ if (p)
+ gfree(p);
+ return NULL;
+--- 103,109 ----
+ void *q;
+ int oldSize;
+
+! if (size <= 0) {
+ if (p)
+ gfree(p);
+ return NULL;
+***************
+*** 120,126 ****
+ #else
+ void *q;
+
+! if (size == 0) {
+ if (p)
+ free(p);
+ return NULL;
+--- 121,127 ----
+ #else
+ void *q;
+
+! if (size <= 0) {
+ if (p)
+ free(p);
+ return NULL;
+***************
+*** 140,147 ****
+ void *gmallocn(int nObjs, int objSize) {
+ int n;
+
+ n = nObjs * objSize;
+! if (objSize == 0 || n / objSize != nObjs) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+--- 141,151 ----
+ void *gmallocn(int nObjs, int objSize) {
+ int n;
+
++ if (nObjs == 0) {
++ return NULL;
++ }
+ n = nObjs * objSize;
+! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+***************
+*** 151,158 ****
+ void *greallocn(void *p, int nObjs, int objSize) {
+ int n;
+
+ n = nObjs * objSize;
+! if (objSize == 0 || n / objSize != nObjs) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+--- 155,168 ----
+ void *greallocn(void *p, int nObjs, int objSize) {
+ int n;
+
++ if (nObjs == 0) {
++ if (p) {
++ gfree(p);
++ }
++ return NULL;
++ }
+ n = nObjs * objSize;
+! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+ fprintf(stderr, "Bogus memory allocation size\n");
+ exit(1);
+ }
+diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
+*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006
+***************
+*** 13,18 ****
+--- 13,19 ----
+ #endif
+
+ #include <stdlib.h>
++ #include <limits.h>
+ #include "GList.h"
+ #include "Error.h"
+ #include "JArithmeticDecoder.h"
+***************
+*** 681,686 ****
+--- 682,691 ----
+ w = wA;
+ h = hA;
+ line = (wA + 7) >> 3;
++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++ data = NULL;
++ return;
++ }
+ // need to allocate one extra guard byte for use in combine()
+ data = (Guchar *)gmalloc(h * line + 1);
+ data[h * line] = 0;
+***************
+*** 692,697 ****
+--- 697,706 ----
+ w = bitmap->w;
+ h = bitmap->h;
+ line = bitmap->line;
++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++ data = NULL;
++ return;
++ }
+ // need to allocate one extra guard byte for use in combine()
+ data = (Guchar *)gmalloc(h * line + 1);
+ memcpy(data, bitmap->data, h * line);
+***************
+*** 720,726 ****
+ }
+
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+! if (newH <= h) {
+ return;
+ }
+ // need to allocate one extra guard byte for use in combine()
+--- 729,735 ----
+ }
+
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
+ return;
+ }
+ // need to allocate one extra guard byte for use in combine()
+***************
+*** 2294,2299 ****
+--- 2303,2316 ----
+ !readUWord(&stepX) || !readUWord(&stepY)) {
+ goto eofError;
+ }
++ if (w == 0 || h == 0 || w >= INT_MAX / h) {
++ error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
++ return;
++ }
++ if (gridH == 0 || gridW >= INT_MAX / gridH) {
++ error(getPos(), "Bad grid size in JBIG2 halftone segment");
++ return;
++ }
+
+ // get pattern dictionary
+ if (nRefSegs != 1) {
+diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
+*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006
+***************
+*** 12,17 ****
+--- 12,18 ----
+ #pragma implementation
+ #endif
+
++ #include <limits.h>
+ #include "gmem.h"
+ #include "Error.h"
+ #include "JArithmeticDecoder.h"
+***************
+*** 818,823 ****
+--- 819,830 ----
+ / img.xTileSize;
+ img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
+ / img.yTileSize;
++ // check for overflow before allocating memory
++ if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
++ img.nXTiles >= INT_MAX / img.nYTiles) {
++ error(getPos(), "Bad tile count in JPX SIZ marker segment");
++ return gFalse;
++ }
+ img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
+ sizeof(JPXTile));
+ for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
+diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
+*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006
+***************
+*** 15,20 ****
+--- 15,21 ----
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++ #include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+***************
+*** 406,418 ****
+--- 407,432 ----
+ width = widthA;
+ nComps = nCompsA;
+ nBits = nBitsA;
++ predLine = NULL;
++ ok = gFalse;
+
+ nVals = width * nComps;
++ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++ nComps >= INT_MAX / nBits ||
++ width >= INT_MAX / nComps / nBits ||
++ nVals * nBits + 7 < 0) {
++ return;
++ }
+ pixBytes = (nComps * nBits + 7) >> 3;
+ rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++ if (rowBytes <= 0) {
++ return;
++ }
+ predLine = (Guchar *)gmalloc(rowBytes);
+ memset(predLine, 0, rowBytes);
+ predIdx = rowBytes;
++
++ ok = gTrue;
+ }
+
+ StreamPredictor::~StreamPredictor() {
+***************
+*** 1004,1009 ****
+--- 1018,1027 ----
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if (!pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+***************
+*** 1259,1264 ****
+--- 1277,1285 ----
+ if (columns < 1) {
+ columns = 1;
+ }
++ if (columns + 4 <= 0) {
++ columns = INT_MAX - 4;
++ }
+ rows = rowsA;
+ endOfBlock = endOfBlockA;
+ black = blackA;
+***************
+*** 2899,2904 ****
+--- 2920,2930 ----
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ numComps = 0;
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+***************
+*** 2925,2930 ****
+--- 2951,2961 ----
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ numComps = 0;
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+***************
+*** 2947,2952 ****
+--- 2978,2988 ----
+
+ length = read16() - 2;
+ scanInfo.numComps = str->getChar();
++ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ scanInfo.numComps = 0;
++ return gFalse;
++ }
+ --length;
+ if (length != 2 * scanInfo.numComps + 3) {
+ error(getPos(), "Bad DCT scan info block");
+***************
+*** 3041,3046 ****
+--- 3077,3083 ----
+ numACHuffTables = index+1;
+ tbl = &acHuffTables[index];
+ } else {
++ index &= 0x0f;
+ if (index >= numDCHuffTables)
+ numDCHuffTables = index+1;
+ tbl = &dcHuffTables[index];
+***************
+*** 3827,3832 ****
+--- 3864,3873 ----
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if (!pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
+*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006
+***************
+*** 232,237 ****
+--- 232,239 ----
+
+ ~StreamPredictor();
+
++ GBool isOk() { return ok; }
++
+ int lookChar();
+ int getChar();
+
+***************
+*** 249,254 ****
+--- 251,257 ----
+ int rowBytes; // bytes per line
+ Guchar *predLine; // line buffer
+ int predIdx; // current index in predLine
++ GBool ok;
+ };
+
+ //------------------------------------------------------------------------
+***************
+*** 527,533 ****
+ short getWhiteCode();
+ short getBlackCode();
+ short lookBits(int n);
+! void eatBits(int n) { inputBits -= n; }
+ };
+
+ //------------------------------------------------------------------------
+--- 530,536 ----
+ short getWhiteCode();
+ short getBlackCode();
+ short lookBits(int n);
+! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
+ };
+
+ //------------------------------------------------------------------------
+diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
+*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005
+--- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006
+***************
+*** 186,192 ****
+ }
+
+ void SplashXPathScanner::computeIntersections(int y) {
+! SplashCoord ySegMin, ySegMax, xx0, xx1;
+ SplashXPathSeg *seg;
+ int i, j;
+
+--- 186,192 ----
+ }
+
+ void SplashXPathScanner::computeIntersections(int y) {
+! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
+ SplashXPathSeg *seg;
+ int i, j;
+
+***************
+*** 236,254 ****
+ } else if (seg->flags & splashXPathVert) {
+ xx0 = xx1 = seg->x0;
+ } else {
+! if (ySegMin <= y) {
+! // intersection with top edge
+! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+ } else {
+! // x coord of segment endpoint with min y coord
+! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
+ }
+! if (ySegMax >= y + 1) {
+! // intersection with bottom edge
+! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
+! } else {
+! // x coord of segment endpoint with max y coord
+! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
+ }
+ }
+ if (xx0 < xx1) {
+--- 236,262 ----
+ } else if (seg->flags & splashXPathVert) {
+ xx0 = xx1 = seg->x0;
+ } else {
+! if (seg->x0 < seg->x1) {
+! xSegMin = seg->x0;
+! xSegMax = seg->x1;
+ } else {
+! xSegMin = seg->x1;
+! xSegMax = seg->x0;
+ }
+! // intersection with top edge
+! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+! // intersection with bottom edge
+! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
+! // the segment may not actually extend to the top and/or bottom edges
+! if (xx0 < xSegMin) {
+! xx0 = xSegMin;
+! } else if (xx0 > xSegMax) {
+! xx0 = xSegMax;
+! }
+! if (xx1 < xSegMin) {
+! xx1 = xSegMin;
+! } else if (xx1 > xSegMax) {
+! xx1 = xSegMax;
+ }
+ }
+ if (xx0 < xx1) {
1
0
Author: sip
Date: 2006-03-26 03:15:56 +0200 (Sun, 26 Mar 2006)
New Revision: 1016
Modified:
crux-2.2/ports/opt/xlockmore/Pkgfile
Log:
xlockmore: trimmed dependencies
Modified: crux-2.2/ports/opt/xlockmore/Pkgfile
===================================================================
--- crux-2.2/ports/opt/xlockmore/Pkgfile 2006-03-26 01:06:11 UTC (rev 1015)
+++ crux-2.2/ports/opt/xlockmore/Pkgfile 2006-03-26 01:15:56 UTC (rev 1016)
@@ -2,7 +2,7 @@
# URL: http://www.tux.org/~bagleyd/xlockmore.html
# Maintainer: Simone Rota, sip at varlock dot com
# Packager: Daniel Mueller, daniel at danm dot de
-# Depends on: esound, gtk, fortune
+# Depends on: x11, fortune
name=xlockmore
version=5.20.1
1
0
Author: sip
Date: 2006-03-26 03:06:11 +0200 (Sun, 26 Mar 2006)
New Revision: 1015
Modified:
crux-2.2/ports/opt/lcms/.footprint
crux-2.2/ports/opt/lcms/.md5sum
crux-2.2/ports/opt/lcms/Pkgfile
Log:
lcms: updated to 1.15
Modified: crux-2.2/ports/opt/lcms/.footprint
===================================================================
--- crux-2.2/ports/opt/lcms/.footprint 2006-03-26 01:00:57 UTC (rev 1014)
+++ crux-2.2/ports/opt/lcms/.footprint 2006-03-26 01:06:11 UTC (rev 1015)
@@ -4,6 +4,7 @@
-rwxr-xr-x root/root usr/bin/icclink
-rwxr-xr-x root/root usr/bin/icctrans
-rwxr-xr-x root/root usr/bin/jpegicc
+-rwxr-xr-x root/root usr/bin/tiffdiff
-rwxr-xr-x root/root usr/bin/tifficc
-rwxr-xr-x root/root usr/bin/wtpt
drwxr-xr-x root/root usr/include/
@@ -12,9 +13,9 @@
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/liblcms.a
-rwxr-xr-x root/root usr/lib/liblcms.la
-lrwxrwxrwx root/root usr/lib/liblcms.so -> liblcms.so.1.0.14
-lrwxrwxrwx root/root usr/lib/liblcms.so.1 -> liblcms.so.1.0.14
--rwxr-xr-x root/root usr/lib/liblcms.so.1.0.14
+lrwxrwxrwx root/root usr/lib/liblcms.so -> liblcms.so.1.0.15
+lrwxrwxrwx root/root usr/lib/liblcms.so.1 -> liblcms.so.1.0.15
+-rwxr-xr-x root/root usr/lib/liblcms.so.1.0.15
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/lcms.pc
drwxr-xr-x root/root usr/man/
Modified: crux-2.2/ports/opt/lcms/.md5sum
===================================================================
--- crux-2.2/ports/opt/lcms/.md5sum 2006-03-26 01:00:57 UTC (rev 1014)
+++ crux-2.2/ports/opt/lcms/.md5sum 2006-03-26 01:06:11 UTC (rev 1015)
@@ -1 +1 @@
-5a803460aeb10e762d97e11a37462a69 lcms-1.14.tar.gz
+76c921973fdea4f880944a024197f924 lcms-1.15.tar.gz
Modified: crux-2.2/ports/opt/lcms/Pkgfile
===================================================================
--- crux-2.2/ports/opt/lcms/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014)
+++ crux-2.2/ports/opt/lcms/Pkgfile 2006-03-26 01:06:11 UTC (rev 1015)
@@ -1,11 +1,11 @@
# Description: Little CMS. A free color management engine.
# URL: http://www.littlecms.com/
-# Maintainer: Simone Rota, sip at varlock dot com
+# Maintainer: Simone Rota, sip at crux dot nu
# Packager: Daniel Mueller, daniel at danm dot de
# Depends on: zlib, libtiff, libjpeg
name=lcms
-version=1.14
+version=1.15
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
1
0